From 60af0dbd432d13781229074f43001e233742679c Mon Sep 17 00:00:00 2001
From: Davoud Eshtehari <v-deshtehari@microsoft.com>
Date: Thu, 15 Dec 2022 14:30:52 -0800
Subject: [PATCH 1/3] Update test sdk version

---
 tools/props/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index b36aa6386a..58f7921eed 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -64,7 +64,7 @@
   <PropertyGroup>
     <MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>5.2.9</MicrosoftIdentityModelClientsActiveDirectoryVersion>
-    <MicrosoftNETTestSdkVersion>17.3.2</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.4.0</MicrosoftNETTestSdkVersion>
     <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
     <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
     <SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>

From 4280de72d1f097e3c8f497988ec0fec76b11f7e0 Mon Sep 17 00:00:00 2001
From: Davoud Eshtehari <v-deshtehari@microsoft.com>
Date: Tue, 17 Jan 2023 12:38:21 -0800
Subject: [PATCH 2/3] skip unsupported x86 platform

---
 .../SQL/TransactionTest/DistributedTransactionTest.cs        | 5 ++++-
 .../Extensions/PlatformDetection.cs                          | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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;
     }
 }

From e89c5cfe83c46a49bd19f897f44f7bb93238feaf Mon Sep 17 00:00:00 2001
From: Davoud Eshtehari <v-deshtehari@microsoft.com>
Date: Tue, 17 Jan 2023 14:56:24 -0800
Subject: [PATCH 3/3] update test SDK version

---
 tools/props/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 923c5da6b2..b9a5cb84d7 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -60,7 +60,7 @@
   <PropertyGroup>
     <MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryVersion>5.2.9</MicrosoftIdentityModelClientsActiveDirectoryVersion>
-    <MicrosoftNETTestSdkVersion>17.4.0</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.4.1</MicrosoftNETTestSdkVersion>
     <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
     <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
     <SystemDataOdbcVersion>6.0.1</SystemDataOdbcVersion>