From 72efc8aa3617749335f734c3601a5f24dd354cc1 Mon Sep 17 00:00:00 2001
From: Arthur Vickers <ajcvickers@hotmail.com>
Date: Wed, 10 Jan 2024 10:21:31 +0000
Subject: [PATCH 1/2] [release/6.0] Test only/disable broken test (#32761)

See #32700
---
 All.sln.DotSettings                                           | 1 +
 test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/All.sln.DotSettings b/All.sln.DotSettings
index a745adea557..c2fa6d0876c 100644
--- a/All.sln.DotSettings
+++ b/All.sln.DotSettings
@@ -262,6 +262,7 @@ The .NET Foundation licenses this file to you under the MIT license.&#xD;
 	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileEF4F00E20178B341995BD2EFE53739B5/@KeyIndexDefined">True</s:Boolean>
 	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileEF4F00E20178B341995BD2EFE53739B5/RelativePriority/@EntryValue">2</s:Double>
 	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=VsBulb/@EntryIndexedValue">DO_NOTHING</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
diff --git a/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs b/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs
index c9302508aab..bc1aa2119f8 100644
--- a/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs
@@ -1310,7 +1310,7 @@ public void Double_dispose_concurrency_test(bool useInterface)
                 });
         }
 
-        [ConditionalTheory]
+        [ConditionalTheory (Skip = "Issue #32700")]
         [InlineData(false, false)]
         [InlineData(true, false)]
         [InlineData(false, true)]

From 849a2fc5315282e45a35f2a3ccc3c43720b4596c Mon Sep 17 00:00:00 2001
From: Arthur Vickers <ajcvickers@hotmail.com>
Date: Wed, 10 Jan 2024 10:45:31 +0000
Subject: [PATCH 2/2] Fix merge.

---
 test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs b/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs
index 9b63c7d22e4..336910457fc 100644
--- a/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs
+++ b/test/EFCore.SqlServer.FunctionalTests/DbContextPoolingTest.cs
@@ -1880,7 +1880,7 @@ public async Task Handle_open_connection_when_returning_to_pool_for_external_con
         await Dispose(context2, async);
     }
 
-    [ConditionalTheory (Skip = "Issue #32700")]
+    [ConditionalTheory]
     [InlineData(true)]
     [InlineData(false)]
     public void Double_dispose_concurrency_test(bool useInterface)
@@ -1905,7 +1905,7 @@ public void Double_dispose_concurrency_test(bool useInterface)
             });
     }
 
-    [ConditionalTheory]
+    [ConditionalTheory (Skip = "Issue #32700")]
     [InlineData(false, false)]
     [InlineData(true, false)]
     [InlineData(false, true)]