Skip to content

[release/7.0-rc2] Try re-enabling System.Transactions.Local tests on Arm64 #75703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 1 commit into from
Sep 20, 2022
Merged

[release/7.0-rc2] Try re-enabling System.Transactions.Local tests on Arm64 #75703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/libraries/System.Transactions.Local/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 0 additions & 4 deletions ...ies/System.Transactions.Local/src/System/Transactions/DtcProxyShim/DtcProxyShimFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ public void ConnectToProxy(
{
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);
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/System.Transactions.Local/tests/OleTxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,7 @@ public void GetDtcTransaction()
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;
}
Expand Down