.

MichelZ · MichelZ · commit c4cba7b6712d · 2024-11-17T19:50:13.000+01:00
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/SqlCommand/SqlCommandCancelTest.cs
@@ -180,7 +180,7 @@ public static void CancelAndDisposePreparedCommandNP()
         }
 
         //[ActiveIssue("5541")]
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotNamedInstance))]
         public static void TimeOutDuringRead()
         {
             TimeOutDuringRead(tcp_connStr);
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/TransactionTest/TransactionEnlistmentTest.cs
@@ -50,7 +50,6 @@ public static void TestManualEnlistment_Enlist_TxScopeComplete()
         [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSupportingDistributedTransactions))]
         public static void TestEnlistmentPrepare_TxScopeComplete()
         {
-            TransactionManager.ImplicitDistributedTransactions = true;
             Assert.Throws<TransactionAbortedException>( () =>
             {
                 using TransactionScope txScope = new(TransactionScopeOption.RequiresNew, new TransactionOptions()

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public static void CancelAndDisposePreparedCommandNP()`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`//[ActiveIssue("5541")]`
`183`		`- [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer), nameof(DataTestUtility.IsNotNamedInstance))]`
	`183`	`+ [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotNamedInstance))]`
`184`	`184`	`public static void TimeOutDuringRead()`
`185`	`185`	`{`
`186`	`186`	`TimeOutDuringRead(tcp_connStr);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ public static void TestManualEnlistment_Enlist_TxScopeComplete()`
`50`	`50`	`[ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsSupportingDistributedTransactions))]`
`51`	`51`	`public static void TestEnlistmentPrepare_TxScopeComplete()`
`52`	`52`	`{`
`53`		`- TransactionManager.ImplicitDistributedTransactions = true;`
`54`	`53`	`Assert.Throws<TransactionAbortedException>( () =>`
`55`	`54`	`{`
`56`	`55`	`using TransactionScope txScope = new(TransactionScopeOption.RequiresNew, new TransactionOptions()`