diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs index a85f64e42d..93f57957ec 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/DistributedTransactionTest.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Threading.Tasks; using System.Transactions; using Xunit; @@ -13,7 +14,9 @@ namespace Microsoft.Data.SqlClient.ManualTesting.Tests [PlatformSpecific(TestPlatforms.Windows)] public class DistributedTransactionTest { - [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), Timeout = 10000)] + private static bool s_DelegatedTransactionCondition => DataTestUtility.AreConnStringsSetup() && DataTestUtility.IsNotAzureServer() && PlatformDetection.IsNotX86Process; + + [ConditionalFact(nameof(s_DelegatedTransactionCondition), Timeout = 10000)] public async Task Delegated_transaction_deadlock_in_SinglePhaseCommit() { TransactionManager.ImplicitDistributedTransactions = true; diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/Extensions/PlatformDetection.cs b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/Extensions/PlatformDetection.cs index 1d089151aa..24b9e24b4f 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/Extensions/PlatformDetection.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.DotNet.XUnitExtensions/Extensions/PlatformDetection.cs @@ -10,5 +10,7 @@ public static partial class PlatformDetection { public static bool IsArmProcess => RuntimeInformation.ProcessArchitecture == Architecture.Arm; public static bool IsNotArmProcess => !IsArmProcess; + public static bool IsX86Process => RuntimeInformation.ProcessArchitecture == Architecture.X86; + public static bool IsNotX86Process => !IsX86Process; } } diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 8732774055..b9a5cb84d7 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -60,7 +60,7 @@ 3.1.6 5.2.9 - 17.3.2 + 17.4.1 13.0.1 4.3.0 6.0.1