Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2022-09-14 17:59:15 +0300
committergithub-actions <github-actions@github.com>2022-09-15 21:21:46 +0300
commitd0b2d832999b13cd80785f0110dfcffb8fd7c26a (patch)
tree1ec71ee3b9a91543844cc3a2029dd80eeccc40a8
parent04d61ca139d82b1a9bb8d19a0c6aa9bf5135a5a4 (diff)
Try re-enabling System.Transactions.Local tests on Arm64backport/pr-75610-to-release/7.0-rc2
-rw-r--r--src/libraries/System.Transactions.Local/src/Resources/Strings.resx3
-rw-r--r--src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs4
-rw-r--r--src/libraries/System.Transactions.Local/tests/OleTxTests.cs3
3 files changed, 1 insertions, 9 deletions
diff --git a/src/libraries/System.Transactions.Local/src/Resources/Strings.resx b/src/libraries/System.Transactions.Local/src/Resources/Strings.resx
index 0548f788a01..7e75fee595f 100644
--- a/src/libraries/System.Transactions.Local/src/Resources/Strings.resx
+++ b/src/libraries/System.Transactions.Local/src/Resources/Strings.resx
@@ -423,7 +423,4 @@
<data name="DistributedNotSupportedOn32Bits" xml:space="preserve">
<value>Distributed transactions are currently unsupported in 32-bit processes.</value>
</data>
- <data name="DistributedNotSupportedOnArm" xml:space="preserve">
- <value>Distributed transactions are currently unsupported on ARM.</value>
- </data>
</root>
diff --git a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
index b1658bfa9f3..0a65a8a72a1 100644
--- a/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
+++ b/src/libraries/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
@@ -63,10 +63,6 @@ internal sealed class DtcProxyShimFactory
{
case Architecture.X86:
throw new PlatformNotSupportedException(SR.DistributedNotSupportedOn32Bits);
-
- case Architecture.Armv6: // #74170
- case Architecture.Arm64:
- throw new PlatformNotSupportedException(SR.DistributedNotSupportedOnArm);
}
ConnectToProxyCore(nodeName, resourceManagerIdentifier, managedIdentifier, out nodeNameMatches, out whereabouts, out resourceManagerShim);
diff --git a/src/libraries/System.Transactions.Local/tests/OleTxTests.cs b/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
index eaf2d1b972b..71893a29f98 100644
--- a/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
+++ b/src/libraries/System.Transactions.Local/tests/OleTxTests.cs
@@ -464,8 +464,7 @@ public class OleTxTests : IClassFixture<OleTxTests.OleTxFixture>
private static void Test(Action action)
{
// Temporarily skip on 32-bit where we have an issue.
- // ARM64 issue: https://github.com/dotnet/runtime/issues/74170
- if (!Environment.Is64BitProcess || PlatformDetection.IsArm64Process)
+ if (!Environment.Is64BitProcess)
{
return;
}