From 8b79d3dfc12611b79b6fd8cc0864f5b1c5a8b64c Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:47:07 +0100
Subject: [PATCH 01/12] Upgrade / align packages in test projects /

---
 tools/props/Versions.props            | 21 +++++++++------------
 tools/props/VersionsNet8OrLater.props |  3 ---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 8b4bd80bbe..9d4a9585e8 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -39,7 +39,7 @@
   <!-- NetCore project dependencies -->
   <PropertyGroup>
     <MicrosoftDataSqlClientSNIRuntimeVersion>6.0.0-preview1.24226.4</MicrosoftDataSqlClientSNIRuntimeVersion>
-    <SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
+    <SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
     <MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
   </PropertyGroup>
   <!-- AKV Provider project dependencies -->
@@ -50,25 +50,22 @@
   <!-- Test Project Dependencies -->
   <PropertyGroup>
     <BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
-    <MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24157.1</MicrosoftDotNetRemoteExecutorVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24123.1</MicrosoftDotNetXUnitExtensionsVersion>
-    <MicrosoftExtensionsHosting>6.0.1</MicrosoftExtensionsHosting>
-    <MicrosoftNETCoreRuntimeCoreCLRVersion>2.0.8</MicrosoftNETCoreRuntimeCoreCLRVersion>
+    <MicrosoftExtensionsHosting>8.0.1</MicrosoftExtensionsHosting>
     <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
-    <MicrosoftNETTestSdkVersion>17.8.0</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
     <MicrosoftSqlServerSqlManagementObjectsVersion>170.8.0</MicrosoftSqlServerSqlManagementObjectsVersion>
     <MicrosoftSqlServerTypesVersion>10.50.1600.1</MicrosoftSqlServerTypesVersion>
     <MicrosoftSqlServerTypesVersionNet>160.1000.6</MicrosoftSqlServerTypesVersionNet>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
-    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
-    <SystemDataOdbcVersion>6.0.1</SystemDataOdbcVersion>
+    <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
+    <SystemDataOdbcVersion>8.0.1</SystemDataOdbcVersion>
     <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
-    <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
-    <SystemTextEncodingCodePagesVersion>6.0.0</SystemTextEncodingCodePagesVersion>
-    <XunitVersion>2.4.2</XunitVersion>
-    <XunitrunnervisualstudioVersion>2.5.5</XunitrunnervisualstudioVersion>
+    <SystemServiceProcessServiceControllerVersion>8.0.1</SystemServiceProcessServiceControllerVersion>
+    <XunitVersion>2.9.2</XunitVersion>
+    <XunitrunnervisualstudioVersion>2.8.2</XunitrunnervisualstudioVersion>
   </PropertyGroup>
   <PropertyGroup>
     <TestAKVProviderVersion>$(NugetPackageVersion)</TestAKVProviderVersion>
diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props
index 03653c9241..a2d300d106 100644
--- a/tools/props/VersionsNet8OrLater.props
+++ b/tools/props/VersionsNet8OrLater.props
@@ -2,9 +2,6 @@
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Net8 project dependencies -->
   <PropertyGroup>
-    <SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
     <MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24157.1</MicrosoftDotNetRemoteExecutorVersion>
-    <XunitVersion>2.6.3</XunitVersion>
   </PropertyGroup>
 </Project>

From a1c4245c9a8e76256ce87de88b875aa4c136f19a Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:42:28 +0100
Subject: [PATCH 02/12] Update DotNetRemoteExecutor 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 9d4a9585e8..c4a8135ae7 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -50,7 +50,7 @@
   <!-- Test Project Dependencies -->
   <PropertyGroup>
     <BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24157.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24517.1</MicrosoftDotNetRemoteExecutorVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24123.1</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftExtensionsHosting>8.0.1</MicrosoftExtensionsHosting>
     <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>

From 6fb8ec237c9d405417b2b1b4ace3bbd66fccdfb2 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:53:09 +0100
Subject: [PATCH 03/12] Reference System.ServiceProcess on netfx

---
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index 4ae4cba91c..3e84f2217d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -265,6 +265,7 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx' AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ServiceProcess" />
     <Compile Include="SQL\ConnectionPoolTest\TransactionPoolTest.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(Configuration.Contains('Debug')) AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">

From 3c33170907fe4111a6c843548764d767263ed686 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:53:09 +0100
Subject: [PATCH 04/12] Reference System.ServiceProcess on netfx

---
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index 4ae4cba91c..181e2abdf9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -263,6 +263,9 @@
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
     <Compile Include="SQL\Batch\BatchTests.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
+    <Reference Include="System.ServiceProcess" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx' AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
     <Reference Include="System.Transactions" />
     <Compile Include="SQL\ConnectionPoolTest\TransactionPoolTest.cs" />

From 7d646f26f07884b2bf7fe0350b5f8ae8e9d1dd73 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:25:41 +0100
Subject: [PATCH 05/12] Always include System.Transactions as well

---
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index 821042d273..b907fd817e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -264,11 +264,10 @@
     <Compile Include="SQL\Batch\BatchTests.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
+    <Reference Include="System.Transactions" />
     <Reference Include="System.ServiceProcess" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx' AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.ServiceProcess" />
     <Compile Include="SQL\ConnectionPoolTest\TransactionPoolTest.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(Configuration.Contains('Debug')) AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">

From 8dd0c11192e7d86e32f5a4620002a1c9397c3ab1 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:13:09 +0100
Subject: [PATCH 06/12] Remove references to xunit.runner.console and
 xunit.runner.utility to enable discovery of netfx tests again. See
 https://github.com/dotnet/runtime/issues/94183

---
 NuGet.config                                                 | 1 +
 .../FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj    | 5 -----
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj      | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3233e60161..719ab4dbc5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,5 +3,6 @@
   <packageSources>
     <clear />
     <add key="sqlclient" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
index 1186c3ebdd..917ab824a7 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -82,11 +82,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.console" Version="$(XunitVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index b907fd817e..2a446bd485 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -340,11 +340,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="xunit.runner.console" Version="$(XunitVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
   </ItemGroup>
   <ItemGroup>

From 18383c59ccc46b1d2b30fbceb49a7d2faf777d4a Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Tue, 19 Nov 2024 06:54:49 +0100
Subject: [PATCH 07/12] Revert nuget.org addition

---
 NuGet.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index 719ab4dbc5..3233e60161 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,6 +3,5 @@
   <packageSources>
     <clear />
     <add key="sqlclient" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

From bd3debc2f8171e924d98e6121241e2a22a3391af Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Tue, 19 Nov 2024 06:56:10 +0100
Subject: [PATCH 08/12] Upgrade Versions Remove VersionsNet8OrLater, not needed
 anymore

---
 src/Directory.Build.props             | 1 -
 tools/props/Versions.props            | 6 +++---
 tools/props/VersionsNet8OrLater.props | 7 -------
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 tools/props/VersionsNet8OrLater.props

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 246b651f13..de150401a2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -85,7 +85,6 @@
 
   <!-- Provides Version properties -->
   <Import Project="$(ToolsDir)props\Versions.props" />
-  <Import Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" Project="$(ToolsDir)props\VersionsNet8OrLater.props" />
   <!-- Provides Tool properties -->
   <Import Project="$(ToolsDir)props\Tools.props" />
   <!-- Provides Build properties -->
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index c4a8135ae7..d6d58b1088 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -31,7 +31,7 @@
   <!-- NetFx and NetCore project dependencies -->
   <PropertyGroup>
     <AzureIdentityVersion>1.11.4</AzureIdentityVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
     <MicrosoftIdentityModelJsonWebTokensVersion>7.5.0</MicrosoftIdentityModelJsonWebTokensVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectVersion>7.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
     <SystemTextJsonVersion>6.0.10</SystemTextJsonVersion>
@@ -50,8 +50,8 @@
   <!-- Test Project Dependencies -->
   <PropertyGroup>
     <BenchmarkDotNetVersion>0.13.2</BenchmarkDotNetVersion>
-    <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24517.1</MicrosoftDotNetRemoteExecutorVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24123.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24564.1</MicrosoftDotNetRemoteExecutorVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24564.1</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftExtensionsHosting>8.0.1</MicrosoftExtensionsHosting>
     <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
     <MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
diff --git a/tools/props/VersionsNet8OrLater.props b/tools/props/VersionsNet8OrLater.props
deleted file mode 100644
index a2d300d106..0000000000
--- a/tools/props/VersionsNet8OrLater.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!-- Net8 project dependencies -->
-  <PropertyGroup>
-    <MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
-  </PropertyGroup>
-</Project>

From 30749a3e0529d8ff6e58e30812c2c0cdf6922e59 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Thu, 21 Nov 2024 09:02:23 +0100
Subject: [PATCH 09/12] Force build

---
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index 2a446bd485..ef5860e8d0 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+  <!--dummy for build-->
     <ProjectGuid>{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}</ProjectGuid>
     <AssemblyName>ManualTests</AssemblyName>
     <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>

From 8ab96c023c17791ed616a2d710423aae4c8c7ba9 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:14:59 +0100
Subject: [PATCH 10/12] Remove dummy

---
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index ef5860e8d0..2a446bd485 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-  <!--dummy for build-->
     <ProjectGuid>{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}</ProjectGuid>
     <AssemblyName>ManualTests</AssemblyName>
     <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>

From 9dcc94da8e9062a2c1ee4203cbfdd580b50ebeb1 Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Mon, 25 Nov 2024 20:33:47 +0100
Subject: [PATCH 11/12] Add back console runners

---
 .../FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj     | 4 ++++
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
index fcf25cda68..ef81a8d238 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -82,6 +82,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="xunit.runner.console" Version="$(XunitVersion)">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index dbbb116858..fe0473a611 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -339,6 +339,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="xunit.runner.console" Version="$(XunitVersion)">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
   </ItemGroup>
   <ItemGroup>

From e28a9818491e2e35c1deec6615a85edafa4cd50c Mon Sep 17 00:00:00 2001
From: Michel Zehnder <MichelZ@users.noreply.github.com>
Date: Mon, 25 Nov 2024 20:48:50 +0100
Subject: [PATCH 12/12] Remove System.ServiceProcess, should not be needed

---
 .../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index fe0473a611..061ca09654 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -263,7 +263,6 @@
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ServiceProcess" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netfx' AND ('$(TestSet)' == '' OR '$(TestSet)' == '3')">
     <Compile Include="SQL\ConnectionPoolTest\TransactionPoolTest.cs" />