diff --git a/build.proj b/build.proj
index 33ff1aff31..f6954667c4 100644
--- a/build.proj
+++ b/build.proj
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="BuildAllConfigurations" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <Import Project="src/Directory.Build.props" />
-  <Import Project="$(ToolsDir)targets\GenerateMdsPackage.targets" />
   <Import Project="$(ToolsDir)targets\CompareMdsRefAssemblies.targets" />
 
   <PropertyGroup>
@@ -10,26 +9,7 @@
     <DisableSourceLink>false</DisableSourceLink>
 
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
-    <!-- Flag to control whether or not to build Microsoft.DotNet.GenAPI project in tools -->
-    <BuildTools Condition="'$(BuildTools)' == ''">true</BuildTools>
-    <!-- Flag to control if Windows drivers should be built or not -->
-    <IsEnabledWindows Condition="'$(IsEnabledWindows)' == '' AND '$(TargetsWindows)' == 'true'">true</IsEnabledWindows>
-    <IsEnabledWindows Condition="'$(TargetsUnix)' == 'true'">false</IsEnabledWindows>
-    <TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsWindows)' == 'true'">Windows</TestOS>
-    <TestOS Condition="'$(TestTargetOS)' == '' AND '$(TargetsUnix)' == 'true'">Unix</TestOS>
-    <TF Condition="$(TF) == ''">net9.0</TF> <!-- Default Target Framework -->
-    <TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETFramework'">netfx</TFGroup>
-    <TFGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TF)))' == '.NETCoreApp'">netcore</TFGroup>
-    <TargetGroup Condition="'$(TFGroup)' == 'netfx'">netfx</TargetGroup>
-    <TargetGroup Condition="'$(TFGroup)' == 'netcore'">netcoreapp</TargetGroup>
-    <TargetNetCoreVersion Condition="$(TargetGroup) == 'netcoreapp' AND $(TargetNetCoreVersion) == ''">$(TF)</TargetNetCoreVersion>
-    <TargetNetFxVersion Condition="$(TargetGroup) == 'netfx' AND $(TargetNetFxVersion) == ''">$(TF)</TargetNetFxVersion>
-    <GenerateNuget Condition="'$(GenerateNuget)' == '' AND '$(IsEnabledWindows)' == 'true'">true</GenerateNuget>
-
-    <CommonProperties>Configuration=$(Configuration);ReferenceType=$(ReferenceType);</CommonProperties>
-    <ProjectProperties>$(CommonProperties);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix);</ProjectProperties>
-    <TestProjectProperties>$(ProjectProperties);BuildForRelease=false;TargetNetCoreVersion=$(TargetNetCoreVersion);TargetNetFxVersion=$(TargetNetFxVersion)</TestProjectProperties>
+
     <ResultsDirectory Condition="$(ResultsDirectory) == ''">TestResults</ResultsDirectory>
     <!--
       Path to a `dotnet` version like a x86 or any especific versions in addition to a default installed version.
@@ -37,30 +17,6 @@
       The provided path should be ended to a `\` character without white spaces: Ex. C:\x86\
     -->
     <DotnetPath></DotnetPath>
-    <!-- Using these properties to compile and pack netfx dll fixes nuget package explorer error "Compiler flags: missing" -->
-    <NugetPackProperties>DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;Deterministic=true;</NugetPackProperties>
-    <!-- TF_BUILD is enabled only within AzureDevOps pipeline to support continuous integation build. -->
-    <NugetPackProperties Condition="'$(TF_BUILD)' == 'true'">$(NugetPackProperties);ContinuousIntegrationBuild=true;</NugetPackProperties>
-  </PropertyGroup>
-
-  <!-- Test configuration properties -->
-  <PropertyGroup>
-    <!-- Set up default filters for tests to exclude failing and flaky tests -->
-    <Filter Condition="'$(Filter)' == ''">category!=failing&amp;category!=flaky&amp;category!=interactive</Filter>
-    <FilterArgument>--filter "$(Filter)"</FilterArgument>
-
-    <!-- Collect code coverage unless explicitly disabled -->
-    <CollectCodeCoverage Condition="'$(CollectCodeCoverage)' == ''">true</CollectCodeCoverage>
-    <CodeCoverageRunSettings>$(TestsPath)/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings</CodeCoverageRunSettings>
-    <CollectArgument Condition="'$(CollectCodeCoverage)' == 'true'">--collect "Code coverage" --settings "$(CodeCoverageRunSettings)"</CollectArgument>
-
-    <!-- Set up tests to fail after hangs and report via blame -->
-    <BlameArgument>$(Blame)</BlameArgument>
-    <BlameArgument Condition="'$(BlameArgument)' == ''">
-      --blame-hang
-      --blame-hang-dump-type full
-      --blame-hang-timeout 10m
-    </BlameArgument>
   </PropertyGroup>
 
   <!-- Release Build properties must be turned on for Release purposes, and turned off for Code Coverage calculations -->
@@ -76,39 +32,19 @@
     <Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
     <Azure Include="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
     <Logging Include="src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-    <NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
-    <NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />
-    <!-- Used to build .NET Standard DLL for lib folder from this project. -->
-    <NetStandardDriver Include="**/netcore/ref/Microsoft.Data.SqlClient*.csproj" />
-    <AKVProvider Include="**/add-ons/**/AzureKeyVaultProvider/*.csproj" />
 
-    <UnitTests Include="**/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" />
-    <UnitTestsProj Include="**/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" />
-
-    <FunctionalTests Include="**/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" />
-    <FunctionalTestsProj Include="**/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" />
-
-    <ManualTests Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
-    <ManualTestsProj Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
+    <AKVProvider Include="**/add-ons/**/AzureKeyVaultProvider/*.csproj" />
   </ItemGroup>
 
-  <!-- Top Level Build targets -->
-  <Target Name="Restore" DependsOnTargets="RestoreNetCore;RestoreNetFx" />
-  <Target Name="BuildSqlClient" DependsOnTargets="BuildSqlServer;BuildLogging;BuildAbstractions;BuildNetFx;BuildNetCore;BuildNetStandard" />
-  <!-- TODO: This doesn't really build everything; just the SqlClient driver and its NuGet package. -->
-  <Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServer;BuildLogging;BuildAbstractions;BuildNetFx;BuildNetCoreAllOS;BuildNetStandard;GenerateMdsPackage" />
-
   <!-- SqlServer Targets -->
   <PropertyGroup>
     <SqlServerProperties>$(CommonProperties)</SqlServerProperties>
 
-    <SqlServerProperties
-      Condition="'$(SqlServerPackageVersion)' != ''">
+    <SqlServerProperties Condition="'$(SqlServerPackageVersion)' != ''">
       $(SqlServerProperties);SqlServerPackageVersion=$(SqlServerPackageVersion)
     </SqlServerProperties>
 
-    <SqlServerProperties
-      Condition="'$(SqlServerAssemblyFileVersion)' != ''">
+    <SqlServerProperties Condition="'$(SqlServerAssemblyFileVersion)' != ''">
       $(SqlServerProperties);SqlServerAssemblyFileVersion=$(SqlServerAssemblyFileVersion)
     </SqlServerProperties>
   </PropertyGroup>
@@ -148,14 +84,12 @@
       That results in $(AbstractionsPackageVersion) being defined as empty,
       and cannot be overridden by the project.
     -->
-    <AbstractionsProperties
-      Condition="'$(AbstractionsPackageVersion)' != ''">
+    <AbstractionsProperties Condition="'$(AbstractionsPackageVersion)' != ''">
       $(AbstractionsProperties);AbstractionsPackageVersion=$(AbstractionsPackageVersion)
     </AbstractionsProperties>
 
     <!-- Do the same for the AbstractionsAssemblyFileVersion property. -->
-    <AbstractionsProperties
-      Condition="'$(AbstractionsAssemblyFileVersion)' != ''">
+    <AbstractionsProperties Condition="'$(AbstractionsAssemblyFileVersion)' != ''">
       $(AbstractionsProperties);AbstractionsAssemblyFileVersion=$(AbstractionsAssemblyFileVersion)
     </AbstractionsProperties>
   </PropertyGroup>
@@ -191,14 +125,12 @@
       to avoid it expanding as empty here and thus overriding the default
       behaviour in the Logging project.
     -->
-    <LoggingProperties
-      Condition="'$(LoggingPackageVersion)' != ''">
+    <LoggingProperties Condition="'$(LoggingPackageVersion)' != ''">
       $(LoggingProperties);LoggingPackageVersion=$(LoggingPackageVersion)
     </LoggingProperties>
 
     <!-- Do the same for the LoggingAssemblyFileVersion property. -->
-    <LoggingProperties
-      Condition="'$(LoggingAssemblyFileVersion)' != ''">
+    <LoggingProperties Condition="'$(LoggingAssemblyFileVersion)' != ''">
       $(LoggingProperties);LoggingAssemblyFileVersion=$(LoggingAssemblyFileVersion)
     </LoggingProperties>
   </PropertyGroup>
@@ -240,14 +172,12 @@
       That results in $(AzurePackageVersion) being defined as empty, and cannot
       be overridden by the project.
     -->
-    <AzureProperties
-      Condition="'$(AzurePackageVersion)' != ''">
+    <AzureProperties Condition="'$(AzurePackageVersion)' != ''">
       $(AzureProperties);AzurePackageVersion=$(AzurePackageVersion)
     </AzureProperties>
 
     <!-- Do the same for the AzureAssemblyFileVersion property. -->
-    <AzureProperties
-      Condition="'$(AzureAssemblyFileVersion)' != ''">
+    <AzureProperties Condition="'$(AzureAssemblyFileVersion)' != ''">
       $(AzureProperties);AzureAssemblyFileVersion=$(AzureAssemblyFileVersion)
     </AzureProperties>
   </PropertyGroup>
@@ -273,210 +203,6 @@
       Properties="$(AzureProperties);NoBuild=true" />
   </Target>
 
-  <!-- Other Targets -->
-  <Target Name="RestoreNetCore" DependsOnTargets="RestoreSqlServer;RestoreAbstractions;RestoreLogging">
-    <MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="$(ProjectProperties)" />
-  </Target>
-
-  <Target Name="RestoreNetFx" DependsOnTargets="RestoreSqlServer;RestoreAbstractions;RestoreLogging" Condition="'$(IsEnabledWindows)' == 'true'">
-    <MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="$(ProjectProperties)" />
-  </Target>
-
-  <Target Name="RestoreTools" Condition="'$(BuildTools)' == 'true'">
-    <MSBuild Projects="@(Tools)" Targets="restore" Properties="$(CommonProperties)" />
-  </Target>
-
-  <Target Name="BuildTools" DependsOnTargets="RestoreTools" Condition="'$(BuildTools)' == 'true'">
-    <MSBuild Projects="@(Tools)" Properties="$(CommonProperties)" />
-  </Target>
-
-  <Target Name="BuildNetFx" DependsOnTargets="RestoreNetFx;BuildSqlServer;BuildAbstractions;BuildLogging" Condition="'$(IsEnabledWindows)' == 'true'">
-    <MSBuild Projects="@(NetFxDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties);$(NugetPackProperties);" />
-  </Target>
-
-  <Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore;BuildSqlServer;BuildAbstractions;BuildLogging">
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties)" />
-  </Target>
-
-  <Target Name="BuildNetCoreAllOS" DependsOnTargets="RestoreNetCore;BuildSqlServer;BuildAbstractions;BuildLogging">
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;" RemoveProperties="TargetsWindows;TargetsUnix;" />
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="'$(IsEnabledWindows)' == 'true'" />
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;" RemoveProperties="TargetsWindows;TargetsUnix;" />
-  </Target>
-
-  <Target Name="BuildNetCoreUnix" DependsOnTargets="RestoreNetCore">
-    <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;"   RemoveProperties="TargetsWindows;TargetsUnix;" />
-   </Target>
-
-  <!-- Build .NET Standard target DLLs for Lib folder from here.
-   This target enables BuildForLib for the NetCore ref project. -->
-  <Target Name="BuildNetStandard">
-    <MSBuild Projects="@(NetStandardDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;BuildForLib=True" RemoveProperties="TargetsWindows;TargetsUnix;" />
-  </Target>
-
-  <!-- Tests -->
-
-  <!-- Run all tests applicable to the host OS. -->
-  <Target Name="RunTests" DependsOnTargets="RunUnitTests;RunFunctionalTests;RunManualTests"/>
-
-  <!-- Run all unit tests applicable to the host OS. -->
-  <Target Name="RunUnitTests" DependsOnTargets="RunUnitTestsWindows;RunUnitTestsUnix" Condition="$(ReferenceType.Contains('Project'))"/>
-
-  <!-- Run all unit tests applicable to Windows. -->
-  <Target Name="RunUnitTestsWindows" Condition="'$(IsEnabledWindows)' == 'true' AND $(ReferenceType.Contains('Project'))">
-    <PropertyGroup>
-      <!--
-        The UnitTests project exclusively uses Project references, which is the default applied by
-        src/Directory.Build.props, so no need to specify the ReferenceType property here.
-      -->
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(UnitTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Unit-Windows$(TargetGroup)-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running unit tests for Windows via command: $(TestCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)"/>
-  </Target>
-
-  <!-- Run all unit tests applicable to Unix. -->
-  <Target Name="RunUnitTestsUnix" Condition="'$(IsEnabledWindows)' != 'true' AND $(ReferenceType.Contains('Project'))">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(UnitTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Unit-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running unit tests for Unix via command: $(TestCommand)"/>
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)"/>
-  </Target>
-
-  <!-- Run all Functional tests applicable to the host OS. -->
-  <Target Name="RunFunctionalTests" DependsOnTargets="RunFunctionalTestsWindows;RunFunctionalTestsUnix" />
-
-  <!-- Run all Functional tests applicable to Windows. -->
-  <Target Name="RunFunctionalTestsWindows" Condition="'$(IsEnabledWindows)' == 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(FunctionalTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Functional-Windows$(TargetGroup)-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Functional test for Windows via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
-  <!-- Run all Functional tests applicable to Unix. -->
-  <Target Name="RunFunctionalTestsUnix" Condition="'$(IsEnabledWindows)' != 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(FunctionalTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Functional-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Functional test for Unix via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
-  <!-- Run all Manual tests applicable to the host OS. -->
-  <Target Name="RunManualTests" DependsOnTargets="RunManualTestsWindows;RunManualTestsUnix" />
-
-  <!-- Run all Manual tests applicable to Windows. -->
-  <Target Name="RunManualTestsWindows" Condition="'$(IsEnabledWindows)' == 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(ManualTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)"
-      </TestCommand>
-      <!-- Add test set only if it was provided - otherwise it will be permanently set to '' -->
-      <TestCommand Condition="'$(TestSet)' != ''">
-        $(TestCommand)
-        -p:TestSet=$(TestSet)
-      </TestCommand>
-
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Manual test for Windows via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
-  <!-- Run all Manual tests applicable to Unix. -->
-  <Target Name="RunManualTestsUnix" Condition="'$(IsEnabledWindows)' != 'true'">
-    <PropertyGroup>
-      <TestCommand>
-        $(DotnetPath)dotnet test "@(ManualTestsProj)"
-        -f $(TF)
-        -p:Configuration=$(Configuration)
-        -p:ReferenceType=$(ReferenceType)
-        -p:AbstractionsPackageVersion=$(AbstractionsPackageVersion)
-        -p:MdsPackageVersion=$(MdsPackageVersion)
-        $(FilterArgument)
-        $(BlameArgument)
-        $(CollectArgument)
-        --results-directory $(ResultsDirectory)
-        --logger:"trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
-
-      <!-- Add test set only if it was provided - otherwise it will be permanently set to '' -->
-      <TestCommand Condition="'$(TestSet)' != ''">
-        $(TestCommand)
-        -p:TestSet=$(TestSet)
-      </TestCommand>
-
-      <!-- Convert more than one whitespace character into one space -->
-      <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
-    </PropertyGroup>
-    <Message Text=">>> Running Manual test for Unix via command: $(TestCommand)" />
-    <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
-  </Target>
-
   <!-- Clean all build outputs. -->
   <Target Name="Clean">
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "artifacts", SearchOption.AllDirectories))' />
diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
index 8810bed838..53b17d4bb9 100644
--- a/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
+++ b/eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml
@@ -10,10 +10,9 @@
 # via the msBuildArguments parameter.
 # It uses the RoslynAnalyzers@3 task from the Secure Development Team's SDL
 # extension:
-#
 # https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
 #
-# GOTCHA: This step will clobber any existing build output.  It should be run
+# GOTCHA: This step will clobber any existing build output. It should be run
 # _before_ any build steps that perform versioning or signing.
 
 parameters:
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5152ce6065..6dcd4bbbd9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetsWindows Condition="'$(OS)' == 'Windows_NT' AND '$(OSGroup)' == ''">true</TargetsWindows>
-    <TargetsWindows Condition="'$(OS)' != 'Windows_NT' AND '$(OSGroup)' == ''">false</TargetsWindows>
-    <TargetsWindows Condition="'$(OSGroup)' == 'Windows_NT'">true</TargetsWindows>
-    <TargetsUnix Condition="'$(OS)' == 'Unix' AND '$(OSGroup)' == ''">true</TargetsUnix>
-    <TargetsUnix Condition="'$(OS)' != 'Unix' AND '$(OSGroup)' == ''">false</TargetsUnix>
-    <TargetsUnix Condition="'$(OSGroup)' == 'Unix'">true</TargetsUnix>
-    <TargetsAnyOS Condition="'$(OSGroup)' == 'AnyOS'">true</TargetsAnyOS>
-    <IsSourceProject Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))">true</IsSourceProject>
     <!--
       "ReferenceType" property supports below options:
 
@@ -19,13 +11,17 @@
     -->
     <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
   </PropertyGroup>
+
+  <!-- @TODO: What is this? -->
   <PropertyGroup Condition="$(BuildForRelease) == 'true'">
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
   </PropertyGroup>
+
   <ItemGroup Condition="$(BuildForRelease) == 'true'">
     <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
   </ItemGroup>
+
   <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
   </PropertyGroup>
@@ -33,40 +29,14 @@
     <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
     <RepoRoot>$(ProjectDir)..\</RepoRoot>
     <Artifacts>$(RepoRoot)artifacts\$(ReferenceType)\</Artifacts>
-    <ToolsArtifactsDir Condition="'$(ToolsArtifactsDir)'==''">$(Artifacts)tools\</ToolsArtifactsDir>
-    <ManagedSourceCode>$(ProjectDir)Microsoft.Data.SqlClient\</ManagedSourceCode>
-    <SqlServerSourceCode>$(ProjectDir)Microsoft.SqlServer.Server\</SqlServerSourceCode>
-    <NetCoreSource>$(ManagedSourceCode)netcore\</NetCoreSource>
-    <NetCoreResources>$(ManagedSourceCode)src\Resources\</NetCoreResources>
-    <ResxFileName>Strings</ResxFileName>
-    <ResourceFileName>SqlClient.Resources.$(ResxFileName)</ResourceFileName>
-    <GeneratedSourceFileName>$(ResxFileName).ResourceNames.cs</GeneratedSourceFileName>
-    <NetFxSource>$(ManagedSourceCode)netfx\</NetFxSource>
-    <NetFxResources>$(ManagedSourceCode)src\Resources\</NetFxResources>
-    <AddOnsPath>$(ManagedSourceCode)add-ons\</AddOnsPath>
-    <SqlServerSource>$(RepoRoot)src\Microsoft.SqlServer.Server\</SqlServerSource>
-    <CommonsourceRoot>$(RepoRoot)src\Microsoft.Data.SqlClient\src\</CommonsourceRoot>
-    <ObjFolder>$(Artifacts)obj\</ObjFolder>
-    <CommonPath>$(NetCoreSource)src\Common\src</CommonPath>
-    <CommonTestPath>$(NetCoreSource)src\Common\tests</CommonTestPath>
-    <TestsPath>$(ProjectDir)Microsoft.Data.SqlClient/tests/</TestsPath>
-    <BinFolder Condition="'$(TargetsWindows)' == 'true'">$(Artifacts)bin\Windows_NT\</BinFolder>
-    <BinFolder Condition="'$(TargetsAnyOS)' == 'true'">$(Artifacts)bin\AnyOS\</BinFolder>
-    <BinFolder Condition="'$(TargetsUnix)' == 'true'">$(Artifacts)bin\Unix\</BinFolder>
+
     <ToolsDir Condition="'$(ToolsDir)'==''">$(RepoRoot)tools\</ToolsDir>
-    <GenAPISrcDir Condition="'$(GenAPISrcDir)'==''">$(ToolsDir)GenAPI\</GenAPISrcDir>
     <PackagesDir Condition="'$(PackagesDir)'==''">$(RepoRoot)packages\</PackagesDir>
-    <NuGetRoot Condition="'$(NuGetRoot)' == ''">$(RepoRoot).nuget\</NuGetRoot>
-    <NuGetCmd>$(NuGetRoot)nuget.exe</NuGetCmd>
     <!-- Respect environment variable for the .NET install directory if set; otherwise, use the current default location -->
     <BuildSimulator Condition="'$(BuildSimulator)' != 'true'">false</BuildSimulator>
   </PropertyGroup>
 
-  <!-- Add user-supplied define constants. -->
-  <PropertyGroup Condition="'$(UserDefinedConstants)' != ''">
-    <DefineConstants>$(DefineConstants);$(UserDefinedConstants)</DefineConstants>
-  </PropertyGroup>
-
+  <!-- @TODO: This isn't being set anywhere -->
   <PropertyGroup Condition="'$(BuildSimulator)' == 'true'">
     <DefineConstants>$(DefineConstants);ENCLAVE_SIMULATOR</DefineConstants>
   </PropertyGroup>
@@ -98,18 +68,15 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 
     <!--
-      There may be a few specific warnings that should _not_ be considered an
-      error.  This list should be used sparingly to avoid important warnings
-      being ignored.
+      There may be a few specific warnings that should _not_ be considered an error. This list
+      should be used sparingly to avoid important warnings being ignored.
     -->
-    <WarningsNotAsErrors></WarningsNotAsErrors>
+    <WarningsNotAsErrors />
 
     <!--
-      If a build is failing due to vulnerable dependencies, you may temporarily
-      uncomment the following line to treat the audit warnings as non-errors.
-      This should only be done as a temporary measure while addressing the
-      vulnerable dependencies.  See:
-
+      If a build is failing due to vulnerable dependencies, you may temporarily uncomment the
+      following line to treat the audit warnings as non-errors. This should only be done as a
+      temporary measure while addressing the vulnerable dependencies. See:
       https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904
     -->
     <!-- <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> -->
@@ -126,7 +93,7 @@
     <DefineConstants>$(DefineConstants);STRONG_NAME_SIGNING</DefineConstants>
   </PropertyGroup>
 
-  <!-- Packaging  for source link-->
+  <!-- Packaging for source link-->
   <PropertyGroup>
     <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
@@ -135,14 +102,10 @@
     <EmbedUnTrackedSources>true</EmbedUnTrackedSources>
     <DisableSourceLinkTranslation Condition="'$(DisableSourceLinkTranslation)' == ''">false</DisableSourceLinkTranslation>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
 
   <!-- Provides Version properties -->
   <Import Project="$(ToolsDir)props\Versions.props" />
-  <!-- Provides Tool properties -->
-  <Import Project="$(ToolsDir)props\Tools.props" />
+
   <!-- Provides Build properties -->
   <Import Project="$(ToolsDir)props\AssemblyInfo.props" />
   <Import Project="$(ToolsDir)props\AssemblyRef.props" />
@@ -154,20 +117,15 @@
   </PropertyGroup>
 
   <!--
-    We want to use the latest C# language regardless of target framework,
-    so we explicitly set LangVersion for all targets.
-
-    We will roll this version forward as new C# language versions are released
-    and associated with the newest .NET SDK we support.
+    We want to use the latest C# language regardless of target framework, so we explicitly set
+    LangVersion for all targets. We will roll this version forward as new C# language versions are
+    released and associated with the newest .NET SDK we support.
 
     Details here:
-
     https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-versioning
-
     https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version
   -->
   <PropertyGroup>
-    <!-- The newest .NET SDK we support is .NET 10.0, which uses C# 14 -->
     <LangVersion>14</LangVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.slnx b/src/Microsoft.Data.SqlClient.slnx
index 46eb7fc748..e08e693479 100644
--- a/src/Microsoft.Data.SqlClient.slnx
+++ b/src/Microsoft.Data.SqlClient.slnx
@@ -10,6 +10,9 @@
       <Platform Solution="*|x86" Project="x86" />
     </Project>
   </Folder>
+  <Folder Name="/doc/apps/">
+    <Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
+  </Folder>
   <Folder Name="/doc/snippets/" />
   <Folder Name="/doc/snippets/Microsoft.Data.Sql/">
     <File Path="../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml" />
@@ -130,30 +133,27 @@
       <Build Project="false" />
     </Project>
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/src/">
-    <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
+  <Folder Name="/src/">
+    <File Path="Directory.Build.props" />
+  </Folder>
+  <Folder Name="/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/">
+    <Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/test/">
+  <Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Abstractions/">
+    <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
     <Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/src/">
+  <Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Azure/">
     <Project Path="Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
-  </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/test/">
     <Project Path="Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient.Internal/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/" />
-  <Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/src/">
+  <Folder Name="/src/Microsoft.Data.SqlClient.Internal.Logging/">
     <Project Path="Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/">
     <File Path="Microsoft.Data.SqlClient/MdsVersions.props" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/notsupported/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/notsupported/">
     <Project Path="../tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj">
       <Build Project="false" />
     </Project>
@@ -164,41 +164,22 @@
       <Build Project="false" />
     </Project>
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/ref/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/ref/">
     <Project Path="Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/src/">
+  <Folder Name="/src/Microsoft.Data.SqlClient/src/">
     <Project Path="Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
   </Folder>
-  <Folder Name="/Microsoft.Data.SqlClient/tests/" />
-  <Folder Name="/src/">
-    <File Path="Directory.Build.props" />
-    <Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-      <BuildDependency Project="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
-    </Project>
+  <Folder Name="/src/Microsoft.Data.SqlClient/tests/" />
+  <Folder Name="/src/Microsoft.SqlServer.Server/">
     <Project Path="Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
   </Folder>
-  <Folder Name="/src/netcore/">
-    <Project Path="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
-  <Folder Name="/src/netcore/ref/">
-    <Project Path="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
-  <Folder Name="/src/netfx/">
-    <Project Path="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
-  <Folder Name="/src/netfx/ref/">
-    <Project Path="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
-  </Folder>
   <Folder Name="/test/">
     <Project Path="Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj">
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
     <Project Path="Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
@@ -206,9 +187,7 @@
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
     <Project Path="Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj">
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
@@ -231,19 +210,9 @@
     <Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
   </Folder>
   <Folder Name="/test/TestClr/">
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-      <BuildDependency Project="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
-    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj">
-      <BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
-    </Project>
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
+    <Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
   </Folder>
-  <Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
 </Solution>
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index 3215e42068..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
-    <TargetGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">netcoreapp</TargetGroup>
-    <OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
-    <!-- When building for library distribution (BuildForLib=true), set the output path to a netstandard-specific directory.
-     This condition also ensures that netcoreapp builds are excluded from this path adjustment. -->
-    <OutputPath Condition="'$(BuildForLib)' == 'true' AND '$(TargetGroup)' != 'netcoreapp'">$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)\netstandard\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-    <Product>Core $(BaseProduct)</Product>
-    <Configurations>Debug;Release;</Configurations>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-  </PropertyGroup>
-
-  <!-- CLS Compliance attribute -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Files -->
-  <ItemGroup>
-    <Compile Include="../../ref/Microsoft.Data.cs" />
-    <Compile Include="../../ref/Microsoft.Data.Sql.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.DataClassification.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Diagnostics.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Server.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlTypes.cs" />
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- References -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-  </ItemGroup>
-
-  <!-- .NET Standard 2.0 dependencies -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Threading.Channels" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />
-  <Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />
-  <!-- Trim docs for intellisense for ref folder (netcore/netstandard) but not when building for lib folder (only netstandard is built for lib from here) -->
-  <Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" Condition="'$(BuildForLib)' != 'true' OR '$(TargetGroup)' == 'netcoreapp'" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index c2fdb27f3f..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,1105 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-    <OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS'">Microsoft.Data.SqlClient is not supported on this platform.</GeneratePlatformNotSupportedAssemblyMessage>
-    <!-- Allow explicit addition of the Compile files instead of all project files to be included by Default -->
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))'=='.NETCoreApp'">netcoreapp</TargetGroup>
-    <Configurations>Debug;Release;</Configurations>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)\netcore\</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)\netcore\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml</DocumentationFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Product>Core $(BaseProduct)</Product>
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-    <NoWarn>$(NoWarn);IL2026;IL2057;IL2072;IL2075</NoWarn>
-    <RootNamespace />
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <InternalsVisibleTo Include="UnitTests" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFramework)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
-    <EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
-  </ItemGroup>
-
-  <!-- OS Constants ==================================================== -->
-  <PropertyGroup>
-    <DefineConstants Condition="'$(OSGroup.ToUpper())'=='UNIX'">$(DefineConstants),_UNIX</DefineConstants>
-    <DefineConstants Condition="'$(OSGroup.ToUpper())'=='WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
-  </PropertyGroup>
-
-  <!-- Compiled Files ================================================== -->
-  <ItemGroup Condition="'$(OSGroup)' != 'AnyOS'">
-    <Compile Include="$(CommonSourceRoot)Interop\Common\Sni\SniErrors.cs">
-      <Link>Interop\Common\Sni\SniErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Handles\SafeLibraryHandle.netcore.cs">
-      <Link>Interop\Windows\Handles\SafeLibraryHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\FileTypes.cs">
-      <Link>Interop\Windows\Kernel32\FileTypes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlCodeAccess.cs">
-      <Link>Interop\Windows\Kernel32\IoControlCodeAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlTransferType.cs">
-      <Link>Interop\Windows\Kernel32\IoControlTransferType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\Kernel32.cs">
-      <Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateDisposition.cs">
-      <Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateOptions.cs">
-      <Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\DesiredAccess.cs">
-      <Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\FileFullEaInformation.cs">
-      <Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ImpersonationLevel.cs">
-      <Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\IoStatusBlock.cs">
-      <Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\NtDll.cs">
-      <Link>Interop\Windows\NtDll\NtDll.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributeFlags.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributes.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\SecurityQualityOfService.cs">
-      <Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\AuthProviderInfo.cs">
-      <Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\ConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerNumber.cs">
-      <Link>Interop\Windows\Sni\ConsumerNumber.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Delegates.cs">
-      <Link>Interop\Windows\Sni\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\IoType.cs">
-      <Link>Interop\Windows\Sni\IoType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ISniNativeMethods.cs">
-      <Link>Interop\Windows\Sni\ISniNativeMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Prefix.cs">
-      <Link>Interop\Windows\Sni\Prefix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Provider.cs">
-      <Link>Interop\Windows\Sni\Provider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\QueryType.cs">
-      <Link>Interop\Windows\Sni\QueryType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniClientConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniClientConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniDnsCacheInfo.cs">
-      <Link>Interop\Windows\Sni\SniDnsCacheInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniError.cs">
-      <Link>Interop\Windows\Sni\SniError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethods.netcore.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethods.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeWrapper.cs">
-      <Link>Interop\Windows\Sni\SniNativeWrapper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniSslProtocols.cs">
-      <Link>Interop\Windows\Sni\SniSslProtocols.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\TransparentNetworkResolutionMode.cs">
-      <Link>Interop\Windows\Sni\TransparentNetworkResolutionMode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\SystemErrors.cs">
-      <Link>Interop\Windows\SystemErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\UnicodeString.cs">
-      <Link>Interop\Windows\UnicodeString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ActivityCorrelator.cs">
-      <Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.netcore.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\BitConverterCompatible.cs">
-      <Link>Microsoft\Data\Common\BitConverterCompatible.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
-      <Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\NameValuePair.cs">
-      <Link>Microsoft\Data\Common\NameValuePair.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\DataException.cs">
-      <Link>Microsoft\Data\DataException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\OperationAbortedException.cs">
-      <Link>Microsoft\Data\OperationAbortedException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
-      <Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\FieldNameLookup.cs">
-      <Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\TimeoutTimer.cs">
-      <Link>Microsoft\Data\ProviderBase\TimeoutTimer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorManagedHelper.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.windows.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlNotificationRequest.cs">
-      <Link>Microsoft\Data\Sql\SqlNotificationRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AAsyncCallContext.cs">
-      <Link>Microsoft\Data\SqlClient\AAsyncCallContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
-      <Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
-      <Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AssemblyRef.cs">
-      <Link>Microsoft\Data\SqlClient\AssemblyRef.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\CachedContexts.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\CachedContexts.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionData.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
-      <Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs">
-      <Link>Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclavePackage.cs">
-      <Link>Microsoft\Data\SqlClient\EnclavePackage.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveSessionCache.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveSessionCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ISqlVector.cs">
-      <Link>Microsoft\Data\SqlClient\ISqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalAppContextSwitches.cs">
-      <Link>Microsoft\Data\SqlClient\LocalAppContextSwitches.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.unix.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\ConcurrentQueueSemaphore.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\ConcurrentQueueSemaphore.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.windows.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\LocalDB.netcore.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniAsyncCallback.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniAsyncCallback.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniError.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniError.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniCommon.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniCommon.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniLoadHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniLoadHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniMarsConnection.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniMarsConnection.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniMarsHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniMarsHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniNetworkStream.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniNetworkStream.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniNpHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniNpHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniPacket.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniPacket.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniPhysicalHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniPhysicalHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniProviders.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniProviders.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniProxy.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniProxy.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniSmuxFlags.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniSmuxFlags.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniSmuxHeader.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniSmuxHeader.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniSslStream.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniSslStream.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SniTcpHandle.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SniTcpHandle.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SslOverTdsStream.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SslOverTdsStream.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\SsrpClient.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\SsrpClient.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\OnChangedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\OnChangedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Packet.cs">
-      <Link>Microsoft\Data\SqlClient\Packet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\PacketHandle.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netcore.windows.cs">
-      <Link>Microsoft\Data\SqlClient\PacketHandle.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs">
-      <Link>Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PoolBlockingPeriod.cs">
-      <Link>Microsoft\Data\SqlClient\PoolBlockingPeriod.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlDataRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlNormalizer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlNormalizer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlSer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlSer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\SessionHandle.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netcore.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SessionHandle.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
-      <Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SortOrder.cs">
-      <Link>Microsoft\Data\SqlClient\SortOrder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAppContextSwitchManager.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAppContextSwitchManager.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatch.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatch.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommand.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopy.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopy.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEventSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEventSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientLogger.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientLogger.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCollation.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCollation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Batch.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Batch.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Encryption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Encryption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Reader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Reader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Scalar.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Scalar.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Xml.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Xml.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCredential.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataAdapter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDbColumn.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDbColumn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependency.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyListener.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnums.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnvChange.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnvChange.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlError.cs">
-      <Link>Microsoft\Data\SqlClient\SqlError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlErrorCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlException.cs">
-      <Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs">
-      <Link>Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameterCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameterCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlReferenceCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSecurityUtility.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSecurityUtility.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialTextReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialTextReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStatistics.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUdtInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPool.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPools.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPools.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsEnums.cs">
-      <Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParameterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.unix.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSessionPool.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSessionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsValueSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsValueSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TransactionRequest.cs">
-      <Link>Microsoft\Data\SqlClient\TransactionRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\UserAgent.cs">
-      <Link>Microsoft\Data\SqlClient\UserAgent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
-      <Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.unix.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.unix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.windows.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlFileStream.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlVector.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
-      <Link>Resources\ResCategoryAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResDescriptionAttribute.cs">
-      <Link>Resources\ResDescriptionAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\StringsHelper.cs">
-      <Link>Resources\StringsHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)TypeForwards.netcore.cs">
-      <Link>TypeForwards.netcore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Resource Files ================================================== -->
-  <ItemGroup>
-    <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies -->
-    <!-- the app context switch in their csproj. -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\ILLink.Substitutions.xml"
-                      Condition="'$(OSGroup.ToUpper())' == 'WINDOWS_NT'">
-      <Link>Resources\ILLink.Substitutions.xml</Link>
-    </EmbeddedResource>
-
-    <!-- Used by SqlMetaDataFactory to construct its DataSet -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
-      <Link>Resources\Microsoft.Data.SqlCLient.SqlMetaData.xml</Link>
-      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
-    </EmbeddedResource>
-
-    <!-- Base strings in English -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Strings.resx">
-      <Link>Resources\Strings.resx</Link>
-      <LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>System</CustomToolNamespace>
-    </EmbeddedResource>
-
-    <!-- Includes all strings that have been translated -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Strings.*.resx">
-      <Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <LogicalName>Microsoft.Data.SqlCLient.Resources.%(Filename).resources</LogicalName>
-    </EmbeddedResource>
-
-    <!-- Strings designer that depends on the resx -->
-    <Compile Include="$(CommonSourceRoot)Resources\Strings.Designer.cs">
-      <Link>Resources\Strings.Designer.cs</Link>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Package References ============================================== -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="Microsoft.SqlServer.Server" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
-  </ItemGroup>
-
-  <!-- CodeGen Targets ================================================= -->
-  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
-  <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
-  <Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index 93fc5a5375..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,69 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFramework>net462</TargetFramework>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-    <Product>Framework $(BaseProduct)</Product>
-    <Configurations>Debug;Release</Configurations>
-  </PropertyGroup>
-
-  <!-- CLS Compliance -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Files -->
-  <ItemGroup>
-    <Compile Include="../../ref/Microsoft.Data.cs" />
-    <Compile Include="../../ref/Microsoft.Data.Sql.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.DataClassification.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Diagnostics.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlClient.Server.cs" />
-    <Compile Include="../../ref/Microsoft.Data.SqlTypes.cs" />
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- References -->
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI">
-      <PrivateAssets>All</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Buffers" />
-    <PackageReference Include="System.Data.Common" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Threading.Channels" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
deleted file mode 100644
index eb14ccc985..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ /dev/null
@@ -1,1089 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
-    <TargetFrameworks>net462</TargetFrameworks>
-    <ProjectGuid>{407890AC-9876-4FEF-A6F1-F36A876BAADE}</ProjectGuid>
-    <RootNamespace />
-    <OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
-    <EnableLocalAppContext>true</EnableLocalAppContext>
-    <OutputPlatform>AnyCPU</OutputPlatform>
-    <BinPath>$(BinFolder)$(Configuration).$(OutputPlatform)\</BinPath>
-    <ObjPath>$(ObjFolder)$(Configuration).$(OutputPlatform)\</ObjPath>
-    <OutputPath>$(BinPath)$(AssemblyName)\netfx\</OutputPath>
-    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
-    <IntermediateOutputPath>$(ObjPath)$(AssemblyName)\netfx\</IntermediateOutputPath>
-    <Product>Framework $(BaseProduct)</Product>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
-  <ItemGroup Condition="'$(SigningKeyPath)' == ''">
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>UnitTests</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <!-- Override debugtype=portable in Directory.Build.props for netfx -->
-  <PropertyGroup>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.CLSCompliantAttribute">
-      <_Parameter1>true</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
-  </ItemGroup>
-  <PropertyGroup>
-    <!-- CSC Compiler Options -->
-    <NoConfig>True</NoConfig>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <NoWarn>1701,1702</NoWarn>
-    <GenerateFullPaths>True</GenerateFullPaths>
-    <NoStandardLib>True</NoStandardLib>
-    <WarningLevel>4</WarningLevel>
-    <FileAlignment>512</FileAlignment>
-    <HighEntropyVA>True</HighEntropyVA>
-    <DebugSymbols>True</DebugSymbols>
-    <NoLogo>True</NoLogo>
-    <SubsystemVersion>6.00</SubsystemVersion>
-    <OutputType>Library</OutputType>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <Utf8Output>True</Utf8Output>
-    <ErrorReport>None</ErrorReport>
-    <BuildProjectReferences>True</BuildProjectReferences>
-    <GenerateAssemblyRefs>True</GenerateAssemblyRefs>
-    <DefineConstants>$(DefineConstants);USEOFFSET;CODE_ANALYSIS_BASELINE;FEATURE_LEGACYSURFACEAREA;FEATURE_UTF32;FEATURE_UTF7;TRACE;</DefineConstants>
-    <!-- Preprocess properties -->
-    <AllowPartialTrustedCalls>true</AllowPartialTrustedCalls>
-    <AssemblyKeyType>ECMA</AssemblyKeyType>
-    <!-- the RawClDefines was the only way to get AssemblyAttributes.cs to not include [SecurityRules] which break the link step -->
-    <GenerateAssemblyAttribute>true</GenerateAssemblyAttribute>
-    <RawClDefines>$(RawClDefines);SUPPRESS_SECURITY_RULES=1</RawClDefines>
-    <!-- ADO.NET internal defines -->
-    <ComCompatibleSideBySide>True</ComCompatibleSideBySide>
-    <GenerateTargetFrameworkAttribute>False</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
-  <!-- ********************** Configuration and Platform specific properties ********************* -->
-  <!-- All Available Configurations-->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
-    <DefineConstants>$(DefineConstants);DEBUG;DBG;_DEBUG;_LOGGING;</DefineConstants>
-    <DebugType>Full</DebugType>
-    <Optimize>False</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.Contains('Release'))">
-    <DefineConstants>$(DefineConstants);RETAIL;</DefineConstants>
-    <DebugType>Pdbonly</DebugType>
-    <Optimize>True</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-  </ItemGroup>
-
-  <!-- OS Constants ==================================================== -->
-  <PropertyGroup>
-    <!-- Netfx project only builds for Windows, so we always define _WINDOWS here -->
-    <DefineConstants>$(DefineConstants),_WINDOWS</DefineConstants>
-  </PropertyGroup>
-
-  <!-- Compiled Files ================================================== -->
-  <ItemGroup>
-    <Compile Include="$(CommonSourceRoot)Interop\Common\Sni\SniErrors.cs">
-      <Link>Interop\Common\Sni\SniErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\FileTypes.cs">
-      <Link>Interop\Windows\Kernel32\FileTypes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlCodeAccess.cs">
-      <Link>Interop\Windows\Kernel32\IoControlCodeAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\IoControlTransferType.cs">
-      <Link>Interop\Windows\Kernel32\IoControlTransferType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\Kernel32.cs">
-      <Link>Interop\Windows\Kernel32\Kernel32.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Kernel32\Kernel32Safe.netfx.cs">
-      <Link>Interop\Windows\Kernel32\Kernel32Safe.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateDisposition.cs">
-      <Link>Interop\Windows\NtDll\CreateDisposition.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\CreateOptions.cs">
-      <Link>Interop\Windows\NtDll\CreateOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\DesiredAccess.cs">
-      <Link>Interop\Windows\NtDll\DesiredAccess.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\FileFullEaInformation.cs">
-      <Link>Interop\Windows\NtDll\FileFullEaInformation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ImpersonationLevel.cs">
-      <Link>Interop\Windows\NtDll\ImpersonationLevel.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\IoStatusBlock.cs">
-      <Link>Interop\Windows\NtDll\IoStatusBlock.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\NtDll.cs">
-      <Link>Interop\Windows\NtDll\NtDll.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributeFlags.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributeFlags.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\ObjectAttributes.cs">
-      <Link>Interop\Windows\NtDll\ObjectAttributes.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\NtDll\SecurityQualityOfService.cs">
-      <Link>Interop\Windows\NtDll\SecurityQualityOfService.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\AuthProviderInfo.cs">
-      <Link>Interop\Windows\Sni\AuthProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\ConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ConsumerNumber.cs">
-      <Link>Interop\Windows\Sni\ConsumerNumber.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Delegates.cs">
-      <Link>Interop\Windows\Sni\Delegates.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\IoType.cs">
-      <Link>Interop\Windows\Sni\IoType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\ISniNativeMethods.cs">
-      <Link>Interop\Windows\Sni\ISniNativeMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Prefix.cs">
-      <Link>Interop\Windows\Sni\Prefix.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\Provider.cs">
-      <Link>Interop\Windows\Sni\Provider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\QueryType.cs">
-      <Link>Interop\Windows\Sni\QueryType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniClientConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniClientConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniConsumerInfo.cs">
-      <Link>Interop\Windows\Sni\SniConsumerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniDnsCacheInfo.cs">
-      <Link>Interop\Windows\Sni\SniDnsCacheInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniError.cs">
-      <Link>Interop\Windows\Sni\SniError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsArm64.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsArm64.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsNotSupported.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsNotSupported.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsX64.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsX64.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeMethodsX86.netfx.cs">
-      <Link>Interop\Windows\Sni\SniNativeMethodsX86.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniNativeWrapper.cs">
-      <Link>Interop\Windows\Sni\SniNativeWrapper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SniSslProtocols.cs">
-      <Link>Interop\Windows\Sni\SniSslProtocols.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\SqlDependencyProcessDispatcherStorage.netfx.cs">
-      <Link>Interop\Windows\Sni\SqlDependencyProcessDispatcherStorage.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\Sni\TransparentNetworkResolutionMode.cs">
-      <Link>Interop\Windows\Sni\TransparentNetworkResolutionMode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\SystemErrors.cs">
-      <Link>Interop\Windows\SystemErrors.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Interop\Windows\UnicodeString.cs">
-      <Link>Interop\Windows\UnicodeString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ActivityCorrelator.cs">
-      <Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.netfx.cs">
-      <Link>Microsoft\Data\Common\AdapterUtil.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\BitConverterCompatible.cs">
-      <Link>Microsoft\Data\Common\BitConverterCompatible.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\AttestationProtocolUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionOptions.Debug.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionString.netfx.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionString.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringDefaults.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringKeywords.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringSynonyms.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\DbConnectionStringUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\IpAddressPreferenceUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs">
-      <Link>Microsoft\Data\Common\ConnectionString\PoolBlockingUtilities.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ISqlVector.cs">
-      <Link>Microsoft\Data\SqlClient\ISqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
-      <Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\NameValuePair.cs">
-      <Link>Microsoft\Data\Common\NameValuePair.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\DataException.cs">
-      <Link>Microsoft\Data\DataException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\OperationAbortedException.cs">
-      <Link>Microsoft\Data\OperationAbortedException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
-      <Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
-      <Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\FieldNameLookup.cs">
-      <Link>Microsoft\Data\ProviderBase\FieldNameLookup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\TimeoutTimer.cs">
-      <Link>Microsoft\Data\ProviderBase\TimeoutTimer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.windows.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs">
-      <Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlNotificationRequest.cs">
-      <Link>Microsoft\Data\Sql\SqlNotificationRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AAsyncCallContext.cs">
-      <Link>Microsoft\Data\SqlClient\AAsyncCallContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs">
-      <Link>Microsoft\Data\SqlClient\ActiveDirectoryAuthenticationTimeoutRetryHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\ColumnMasterKeyMetadata.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncrypted\EncryptedColumnEncryptionKeyParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
-      <Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
-      <Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AssemblyRef.cs">
-      <Link>Microsoft\Data\SqlClient\AssemblyRef.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\CachedContexts.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\CachedContexts.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionData.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs">
-      <Link>Microsoft\Data\SqlClient\Connection\SqlConnectionInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ChannelDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\ConnectionPoolSlots.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\IDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\TransactedConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
-      <Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
-      <Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\DiagnosticTransactionScope.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientCommandError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionCloseError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientConnectionOpenError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientMetrics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionCommitError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackAfter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackBefore.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlClientTransactionRollbackError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs">
-      <Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs">
-      <Link>Microsoft\Data\SqlClient\DisposableTemporaryOnStack.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveDelegate.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclavePackage.cs">
-      <Link>Microsoft\Data\SqlClient\EnclavePackage.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\EnclaveSessionCache.cs">
-      <Link>Microsoft\Data\SqlClient\EnclaveSessionCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalAppContextSwitches.cs">
-      <Link>Microsoft\Data\SqlClient\LocalAppContextSwitches.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceROot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbConfigurationSection.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbConfigurationSection.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbInstanceElement.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbInstanceElement.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbInstancesCollection.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\LocalDb\LocalDbInstancesCollection.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs">
-      <Link>Microsoft\Data\SqlClient\ManagedSni\ResolvedServerSpn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\NoneAttestationEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\OnChangedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\OnChangedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Packet.cs">
-      <Link>Microsoft\Data\SqlClient\Packet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PacketHandle.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\PacketHandle.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs">
-      <Link>Microsoft\Data\SqlClient\ParameterPeekAheadValue.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\PoolBlockingPeriod.cs">
-      <Link>Microsoft\Data\SqlClient\PoolBlockingPeriod.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\AppConfigManager.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryIntervalBaseEnumerator.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogic.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBase.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicBaseProvider.cs</Link>
-    </Compile>
-    <!-- @TODO: Move file out of common -->
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\Common\SqlRetryLogicProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\IAppContextSwitchOverridesSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryCommandSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\ISqlConfigurableRetryConnectionSection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicLoader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs">
-      <Link>Microsoft\Data\SqlClient\Reliability\SqlRetryIntervalEnumerators.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\RowsCopiedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ExtendedClrTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedGettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ITypedSettersV3.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MemoryRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiGettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiGettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiSettersStream.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiSettersStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SmiXetterTypeCode.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlDataRecord.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlMetaData.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlMetaData.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlNormalizer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlNormalizer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\Server\TriggerAction.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
-      <Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Server\SqlSer.cs">
-      <Link>Microsoft\Data\SqlClient\Server\SqlSer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SessionHandle.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\SessionHandle.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
-      <Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Algorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256EncryptionKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAeadAes256CbcHmac256Factory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationParametersBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs">
-      <Link>Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBatchCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopy.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopy.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMappingCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHint.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnOrderHintCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs">
-      <Link>Microsoft\Data\SqlClient\SqlBulkCopyOptions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCachedBuffer.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCachedBuffer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithm.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionAlgorithmFactoryList.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEncryptionType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEncryptionType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientEventSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientEventSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientLogger.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientLogger.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientMetaDataCollectionNames.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientPermission.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientPermissionAttribute.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs">
-      <Link>Microsoft\Data\SqlClient\SqlClientSymmetricKey.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCollation.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCollation.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Batch.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Batch.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Encryption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Encryption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.NonQuery.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Reader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Reader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Scalar.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Scalar.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Xml.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommand.Xml.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOption.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
-      <Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCredential.cs">
-      <Link>Microsoft\Data\SqlClient\SqlCredential.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataAdapter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDataReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDataReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDbColumn.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDbColumn.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependency.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyListener.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyListener.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnums.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnvChange.cs">
-      <Link>Microsoft\Data\SqlClient\SqlEnvChange.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlError.cs">
-      <Link>Microsoft\Data\SqlClient\SqlError.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlErrorCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlException.cs">
-      <Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs">
-      <Link>Microsoft\Data\SqlClient\SQLFallbackDNSCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlMetaDataFactory.cs">
-      <Link>Microsoft\Data\SqlClient\SqlMetaDataFactory.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationSource.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationSource.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlNotificationType.cs">
-      <Link>Microsoft\Data\SqlClient\SqlNotificationType.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameter.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlParameterCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlParameterCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlReferenceCollection.cs">
-      <Link>Microsoft\Data\SqlClient\SqlReferenceCollection.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatedEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEvent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs">
-      <Link>Microsoft\Data\SqlClient\SqlRowUpdatingEventHandler.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSecurityUtility.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSecurityUtility.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSequentialTextReader.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSequentialTextReader.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStatistics.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStatistics.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlStream.cs">
-      <Link>Microsoft\Data\SqlClient\SqlStream.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs">
-      <Link>Microsoft\Data\SqlClient\SqlSymmetricKeyCache.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlTransaction.cs">
-      <Link>Microsoft\Data\SqlClient\SqlTransaction.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUdtInfo.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUdtInfo.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlUtil.cs">
-      <Link>Microsoft\Data\SqlClient\SqlUtil.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NativeSspiContextProvider.windows..cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\NegotiateSspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiAuthenticationParameters.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs">
-      <Link>Microsoft\Data\SqlClient\SSPI\SspiContextProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SortOrder.cs">
-      <Link>Microsoft\Data\SqlClient\SortOrder.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsEnums.cs">
-      <Link>Microsoft\Data\SqlClient\TdsEnums.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParameterSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParameterSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStateObjectNative.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSessionPool.cs">
-      <Link>Microsoft\Data\SqlClient\TdsParserSessionPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsValueSetter.cs">
-      <Link>Microsoft\Data\SqlClient\TdsValueSetter.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TransactionRequest.cs">
-      <Link>Microsoft\Data\SqlClient\TransactionRequest.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\UserAgent.cs">
-      <Link>Microsoft\Data\SqlClient\UserAgent.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\BufferWriterExtensions.netfx.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\BufferWriterExtensions.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPool.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPool.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Utilities\ObjectPools.cs">
-      <Link>Microsoft\Data\SqlClient\Utilities\ObjectPools.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProvider.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs">
-      <Link>Microsoft\Data\SqlClient\VirtualSecureModeEnclaveProviderBase.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
-      <Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.windows.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlFileStream.windows.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlVector.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlVector.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs">
-      <Link>Microsoft\Data\SqlTypes\SqlTypeWorkarounds.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResCategoryAttribute.cs">
-      <Link>Resources\ResCategoryAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\StringsHelper.cs">
-      <Link>Resources\StringsHelper.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)Resources\ResDescriptionAttribute.cs">
-      <Link>Resources\ResDescriptionAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\Buffers\ArrayBufferWriter.netfx.cs">
-      <Link>System\Buffers\ArrayBufferWriter.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.netfx.cs">
-      <Link>System\Diagnostics\CodeAnalysis.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\IO\StreamExtensions.netfx.cs">
-      <Link>System\IO\StreamExtensions.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)System\Runtime\CompilerServices\IsExternalInit.netfx.cs">
-      <Link>System\Runtime\CompilerServices\IsExternalInit.netfx.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonSourceRoot)TypeForwards.Abstractions.cs">
-      <Link>TypeForwards.Abstractions.cs</Link>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Resource Files ================================================== -->
-  <ItemGroup>
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
-      <Link>Resources\Microsoft.Data.SqlClient.SqlMetaData.xml</Link>
-      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName> <!-- @TODO: How necessary is this? -->
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-
-    <!-- Base strings in English -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\Strings.resx">
-      <Link>Resources\Strings.resx</Link>
-      <LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>
-      <CustomToolNamespace>System</CustomToolNamespace>
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Strings.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-
-    <!-- Includes all strings that have been translated -->
-    <EmbeddedResource Include="$(CommonSourceRoot)Resources\$(ResxFileName).*.resx">
-      <Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <LogicalName>Microsoft.Data.SqlClient.Resources.%(Filename).resources</LogicalName>
-    </EmbeddedResource>
-
-    <!-- Strings designer that depends on the resx -->
-    <Compile Include="$(CommonSourceRoot)Resources\Strings.Designer.cs">
-      <Link>Resources\Strings.Designer.cs</Link>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Strings.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <!-- Package References ============================================== -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.Cryptography" />
-    <PackageReference Include="Microsoft.Data.SqlClient.SNI">
-      <PrivateAssets>All</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Buffers" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-    <PackageReference Include="System.Memory" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" />
-    <PackageReference Include="System.Text.Json" />
-    <PackageReference Include="System.Threading.Channels" />
-    <PackageReference Include="System.ValueTuple" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Abstractions package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions" />
-  </ItemGroup>
-
-  <!--
-    Refer to the Logging package via project or package reference
-    depending on our build parameters.
-  -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging" />
-  </ItemGroup>
-
-  <!-- CodeGen Targets ================================================= -->
-  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
-  <Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
-  <Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets b/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets
deleted file mode 100644
index 9c43ce4989..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyInfo.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="BeforeBuild">
-        <ItemGroup>
-            <AssemblyInfo Include="//------------------------------------------------------------------------------" />
-            <AssemblyInfo Include="//     This code was auto-generated by msbuild target." />
-            <AssemblyInfo Include="//     Changes to this file may cause incorrect behavior and will be lost if the code is regenerated." />
-            <AssemblyInfo Include="//------------------------------------------------------------------------------" />
-            <AssemblyInfo Include="using System%3B" />
-            <AssemblyInfo Include="using System.Reflection%3B" />
-            <AssemblyInfo Include="using System.Resources%3B" />
-            <AssemblyInfo Include="using System.Security%3B" />
-            <AssemblyInfo Include="using System.Runtime.InteropServices%3B" />
-            <AssemblyInfo Include="using System.Runtime.Versioning%3B%0A" />
-
-            <AssemblyInfo Include="[assembly: ComVisible(false)]" />
-            <AssemblyInfo Include="[assembly: TargetFramework(&quot;.NETFramework,Version=$(TargetFrameworkVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: SatelliteContractVersion(&quot;$(AssemblyVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyTitle(&quot;$(AssemblyName)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyDescription(&quot;$(Description)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyCompany(&quot;$(Company)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyProduct(&quot;$(Product)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyCopyright(&quot;$(Copyright)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyVersion(&quot;$(AssemblyVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyFileVersion(&quot;$(AssemblyFileVersion)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyInformationalVersion(&quot;$(Version)&quot;)]" />
-            <AssemblyInfo Include="[assembly: AssemblyConfiguration(&quot;$(Configuration)&quot;)]" />
-            <AssemblyInfo Include="[assembly: NeutralResourcesLanguage(&quot;en-US&quot;)]" />
-        </ItemGroup>
-        <MakeDir Directories="$(IntermediateOutputPath)" />
-        <WriteLinesToFile File="$(IntermediateOutputPath)$(AssemblyName).AssemblyInfo.cs" Overwrite="True" Lines="@(AssemblyInfo)" />
-        <ItemGroup>
-            <Compile Include="$(IntermediateOutputPath)$(AssemblyName).AssemblyInfo.cs" />
-        </ItemGroup>
-    </Target>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets b/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets
deleted file mode 100644
index 618d30af8b..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateAssemblyRef.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="BeforeBuild">
-        <PropertyGroup>
-            <OutputPath>$(NetFxSource)src\System\Data\SqlClient\</OutputPath>
-            <Tab>%20%20%20%20</Tab>
-        </PropertyGroup>
-        <ItemGroup>
-            <AssemblyRef Include="//------------------------------------------------------------------------------" />
-            <AssemblyRef Include="//     This code was auto-generated by msbuild target." />
-            <AssemblyRef Include="//     Changes to this file may cause incorrect behavior and will be lost if the code is regenerated." />
-            <AssemblyRef Include="//------------------------------------------------------------------------------" />
-            <AssemblyRef Include="// Licensed to the .NET Foundation under one or more agreements." />
-            <AssemblyRef Include="// The .NET Foundation licenses this file to you under the MIT license." />
-            <AssemblyRef Include="// See the LICENSE file in the project root for more information." />
-            <AssemblyRef Include="%0A" />
-            <AssemblyRef Include="namespace Microsoft.Data.SqlClient" />
-            <AssemblyRef Include="{" />
-            <AssemblyRef Include="$(Tab)internal static class AssemblyRef" />
-            <AssemblyRef Include="$(Tab)$(Tab){" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string MicrosoftVSDesigner = $(MicrosoftVSDesigner)%3B"/>
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string SystemDrawing = $(SystemDrawing)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string EcmaPublicKey = $(EcmaPublicKey)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string EcmaPublicKeyFull = $(EcmaPublicKeyFull)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)$(Tab)internal const string SystemDesign = $(SystemDesign)%3B" />
-            <AssemblyRef Include="$(Tab)$(Tab)}" />
-            <AssemblyRef Include="$(Tab)}" />
-        </ItemGroup>
-        <WriteLinesToFile File="$(OutputPath)AssemblyRef.cs" Overwrite="True" Lines="@(AssemblyRef)" />
-    </Target>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
index 8be139a0e6..7045eecc65 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj
@@ -87,12 +87,12 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\Microsoft.Data.SqlClient.TestUtilities\Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
 
   <!-- References for netcore -->
@@ -117,11 +117,11 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)ManualTests\SQL\UdtTest\UDTs\Address\Address.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\Microsoft.Data.SqlClient.TestUtilities\Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
index 25a1d53d0d..c28f1cfeb7 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj
@@ -382,11 +382,11 @@
     <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
 
   <!-- References for netcore -->
@@ -415,11 +415,11 @@
     <ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS/TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools/TDS/TDS.Servers/TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index 7ad0323852..d481e4cca6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Address</RootNamespace>
     <AssemblyName>Address</AssemblyName>
-    <ProjectGuid>{D1392B54-998A-4F27-BC17-4CE149117BCC}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index 105dad030d..6066c1c751 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Circle</RootNamespace>
     <AssemblyName>Circle</AssemblyName>
-    <ProjectGuid>{6C88F00F-9597-43AD-9E5F-9B344DA3B16F}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index 6728189c55..67f26c9ae9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Shapes</RootNamespace>
     <AssemblyName>Shapes</AssemblyName>
-    <ProjectGuid>{B73A7063-37C3-415D-AD53-BB3DA20ABD6E}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index bcc8ad499d..aa1dd19dd2 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Utf8String</RootNamespace>
     <AssemblyName>Utf8String</AssemblyName>
-    <ProjectGuid>{E0A6BB21-574B-43D9-890D-6E1144F2EE9E}</ProjectGuid>
-    <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup>
-    <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
index 239be4d3a2..2da560b6b7 100644
--- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
@@ -4,35 +4,38 @@
     <AssemblyName>PerformanceTests</AssemblyName>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <Configurations>Debug;Release;</Configurations>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform).$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath>
     <StartupObject>Microsoft.Data.SqlClient.PerformanceTests.Program</StartupObject>
   </PropertyGroup>
+
+  <!-- Items to remove -->
   <ItemGroup>
     <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
-    <None Remove="BenchmarkDotNet.Artifacts\**" />
-  </ItemGroup>
-  <ItemGroup>
     <None Remove=".AssemblyAttributes" />
+    <None Remove="BenchmarkDotNet.Artifacts\**" />
   </ItemGroup>
 
-  <!-- Conditional Project References -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" />
-  </ItemGroup>
-
-  <!-- Conditional Package References -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient" />
+  <!-- Content files to copy to output directory -->
+  <ItemGroup>
+    <None Include="datatypes.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runnerconfig.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <!-- Unconditional Package References -->
+  <!-- References ====================================================== -->
+  <!-- Test target references -->
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
+    <!-- If the tests are compiled/running in "Package" mode, the reference to MDS will be to the -->
+    <!-- nuget package. This enables ensuring the tests run successfully against a fully-packaged -->
+    <!-- version of MDS. Package mode is specified by setting the build parameter ReferenceType   -->
+    <!-- to "Package". If this is not specified, the build will revert to default behavior of     -->
+    <!-- referencing MDS via the project.                                                         -->
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'"  />
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'" />
   </ItemGroup>
 
+  <!-- Other references -->
   <ItemGroup>
-    <None Include="datatypes.json" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="runnerconfig.json" CopyToOutputDirectory="PreserveNewest" />
+    <PackageReference Include="BenchmarkDotNet" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
index 318b44a28d..3c35a1a205 100644
--- a/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
@@ -64,10 +64,10 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.Servers\TDS.Servers.csproj" />
   </ItemGroup>
 
   <!-- References for netcore -->
@@ -85,9 +85,9 @@
                       IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"
                       PrivateAssets="all" />
 
-    <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\Common\Microsoft.Data.SqlClient.TestCommon.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS.Servers\TDS.Servers.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
index 6d84a14da8..7d95dfe7c0 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <StartupObject>Microsoft.Data.SqlClient.ExtUtilities.Runner</StartupObject>
-    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index 2f802adc75..083cca8a61 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <Target Name="CopyConfig" BeforeTargets="Compile">
     <Copy SourceFiles="config.default.json" DestinationFiles="config.json" Condition="!Exists('config.json')" />
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
index a90ef98be2..2e1a1b5c81 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj
@@ -2,11 +2,8 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.SqlServer.TDS.EndPoint</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.EndPoint</AssemblyName>
-    <ProjectGuid>{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}</ProjectGuid>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="FederatedAuthentication\FederatedAuthenticationTicketService.cs" />
@@ -53,12 +50,8 @@
   </ItemGroup>
 
   <!-- References ====================================================== -->
-  <ItemGroup>
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj">
-      <Name>TDS</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Security.Principal.Windows" />
+    <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\tests\tools\TDS\TDS\TDS.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
index e2df4cc760..57d3dfadd2 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/TDS.Servers.csproj
@@ -2,17 +2,10 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.SqlServer.TDS.Servers</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS.Servers</AssemblyName>
-    <ProjectGuid>{978063D3-FBB5-4E10-8C45-67C90BE1B931}</ProjectGuid>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj">
-      <Name>TDS.EndPoint</Name>
-    </ProjectReference>
-    <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj">
-      <Name>TDS</Name>
-    </ProjectReference>
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
index 6b30cbe05c..a4da7c8b92 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS/TDS.csproj
@@ -2,9 +2,6 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.SqlServer.TDS</RootNamespace>
     <AssemblyName>Microsoft.SqlServer.TDS</AssemblyName>
-    <ProjectGuid>{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}</ProjectGuid>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>  
-    <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/tools/GenAPI/Directory.Build.props b/tools/GenAPI/Directory.Build.props
deleted file mode 100644
index 730ca3a87b..0000000000
--- a/tools/GenAPI/Directory.Build.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">
-
-  <!-- Import parent Directory.build.props -->
-  <Import Project="..\..\src\Directory.Build.props" />
-</Project>
diff --git a/tools/props/Tools.props b/tools/props/Tools.props
deleted file mode 100644
index 5190b46806..0000000000
--- a/tools/props/Tools.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RestoreSources>
-      $(RestoreSources)
-    </RestoreSources>
-  </PropertyGroup>
-</Project>
diff --git a/tools/targets/CompareMdsRefAssemblies.targets b/tools/targets/CompareMdsRefAssemblies.targets
index 91458d72b4..1e89a26bf3 100644
--- a/tools/targets/CompareMdsRefAssemblies.targets
+++ b/tools/targets/CompareMdsRefAssemblies.targets
@@ -10,8 +10,8 @@
   Usage:
     dotnet build build.proj /t:CompareMdsRefAssemblies /p:BaselinePackageVersion=6.1.4
 
-  BaselinePackageVersion is required. Both the legacy ref projects (netcore/ref,
-  netfx/ref) and the new consolidated ref project (ref/) are built and compared.
+  BaselinePackageVersion is required. The consolidated ref project (ref/) is
+  built and compared against the published package's ref assemblies.
 
   Depends on src/Directory.Build.props for path properties and build configuration.
 -->
@@ -32,44 +32,22 @@
       <BaselinePackageUrl>https://api.nuget.org/v3-flatcontainer/microsoft.data.sqlclient/$(BaselinePackageVersion)/microsoft.data.sqlclient.$(BaselinePackageVersion).nupkg</BaselinePackageUrl>
       <BaselineExtractDir>$([MSBuild]::NormalizePath('$(BaselinePackageDir)', 'extracted', '$(BaselinePackageVersion)'))\</BaselineExtractDir>
 
-      <!-- New consolidated ref project -->
-      <NewRefProjectPath>$([MSBuild]::NormalizePath('$(ManagedSourceCode)', 'ref', 'Microsoft.Data.SqlClient.csproj'))</NewRefProjectPath>
-      <NewRefOutputDir>$([MSBuild]::NormalizePath('$(ManagedSourceCode)', 'ref', 'bin', '$(Configuration)'))\</NewRefOutputDir>
-
-      <!-- Legacy ref output directories (set by legacy csproj OutputPath) -->
-      <LegacyNetFxRefDir>$([MSBuild]::NormalizePath('$(Artifacts)', 'bin', 'Windows_NT', '$(Configuration)', 'Microsoft.Data.SqlClient', 'ref'))\</LegacyNetFxRefDir>
-      <LegacyNetCoreRefDir>$([MSBuild]::NormalizePath('$(Artifacts)', 'bin', 'AnyOS', '$(Configuration)', 'Microsoft.Data.SqlClient', 'ref'))\</LegacyNetCoreRefDir>
-
-      <!-- Legacy ref project paths -->
-      <LegacyNetFxRefProject>$([MSBuild]::NormalizePath('$(NetFxSource)', 'ref', 'Microsoft.Data.SqlClient.csproj'))</LegacyNetFxRefProject>
-      <LegacyNetCoreRefProject>$([MSBuild]::NormalizePath('$(NetCoreSource)', 'ref', 'Microsoft.Data.SqlClient.csproj'))</LegacyNetCoreRefProject>
+      <!-- Consolidated ref project -->
+      <RefProjectPath>$([MSBuild]::NormalizePath('$(RepoRoot)', 'src', 'Microsoft.Data.SqlClient', 'ref', 'Microsoft.Data.SqlClient.csproj'))</RefProjectPath>
+      <RefOutputDir>$([MSBuild]::NormalizePath('$(RepoRoot)', 'artifacts', 'Microsoft.Data.SqlClient.ref', '$(ReferenceType)-$(Configuration)'))\</RefOutputDir>
     </PropertyGroup>
 
-    <!--
-      Each _RefTfm item carries metadata indicating which legacy output dir to
-      use.  net462 comes from the netfx ref project (Windows_NT); the others
-      come from the netcore ref project (AnyOS).
-    -->
     <ItemGroup>
-      <_RefTfm Include="net462">
-        <LegacyRefDir>$(LegacyNetFxRefDir)</LegacyRefDir>
-      </_RefTfm>
-      <_RefTfm Include="net8.0">
-        <LegacyRefDir>$(LegacyNetCoreRefDir)</LegacyRefDir>
-      </_RefTfm>
-      <_RefTfm Include="net9.0">
-        <LegacyRefDir>$(LegacyNetCoreRefDir)</LegacyRefDir>
-      </_RefTfm>
-      <_RefTfm Include="netstandard2.0">
-        <LegacyRefDir>$(LegacyNetCoreRefDir)</LegacyRefDir>
-      </_RefTfm>
+      <_RefTfm Include="net462" />
+      <_RefTfm Include="net8.0" />
+      <_RefTfm Include="net9.0" />
+      <_RefTfm Include="netstandard2.0" />
     </ItemGroup>
 
     <Message Importance="high" Text="Configuration:      $(Configuration)" />
     <Message Importance="high" Text="BaselineExtractDir: $(BaselineExtractDir)" />
-    <Message Importance="high" Text="NewRefOutputDir:    $(NewRefOutputDir)" />
-    <Message Importance="high" Text="LegacyNetFxRefDir:  $(LegacyNetFxRefDir)" />
-    <Message Importance="high" Text="LegacyNetCoreRefDir:$(LegacyNetCoreRefDir)" />
+    <Message Importance="high" Text="RefProjectPath:     $(RefProjectPath)" />
+    <Message Importance="high" Text="RefOutputDir:       $(RefOutputDir)" />
   </Target>
 
   <!-- ================================================================== -->
@@ -120,49 +98,26 @@
   </Target>
 
   <!-- ================================================================== -->
-  <!-- _BuildLegacyRefNetFx                                               -->
-  <!-- ================================================================== -->
-  <Target Name="_BuildLegacyRefNetFx" DependsOnTargets="_SetApiCompatProperties" Condition="'$(IsEnabledWindows)' == 'true'">
-    <Message Importance="high" Text="Building legacy netfx ref project (net462)..." />
-    <MSBuild 
-      Targets="Restore;Build" 
-      Projects="$(LegacyNetFxRefProject)"/>
-  </Target>
-
-  <!-- ================================================================== -->
-  <!-- _BuildLegacyRefNetCore                                             -->
+  <!-- _BuildRefProject                                                   -->
   <!-- ================================================================== -->
-  <Target Name="_BuildLegacyRefNetCore" DependsOnTargets="_SetApiCompatProperties">
-    <Message Importance="high" Text="Building legacy netcore ref project (net8.0, net9.0, netstandard2.0)..." />
-    <!-- Build legacy netcore ref project using AnyOS to align with expected directory LegacyNetCoreRefDir -->
+  <Target Name="_BuildRefProject" DependsOnTargets="_SetApiCompatProperties">
+    <Message Importance="high" Text="Building consolidated ref project (all TFMs)..." />
     <MSBuild 
       Targets="Restore;Build" 
-      Projects="$(LegacyNetCoreRefProject)"
-      Properties="$(ProjectProperties);OSGroup=AnyOS"/>
-  </Target>
-
-  <!-- ================================================================== -->
-  <!-- _BuildNewRefProject                                                -->
-  <!-- ================================================================== -->
-  <Target Name="_BuildNewRefProject" DependsOnTargets="_SetApiCompatProperties">
-    <Message Importance="high" Text="Building new consolidated ref project (all TFMs)..." />
-    <MSBuild 
-      Targets="Restore;Build" 
-      Projects="$(NewRefProjectPath)"/>
+      Projects="$(RefProjectPath)"/>
   </Target>
 
   <!-- ================================================================== -->
   <!-- _RunRefApiCompat                                                   -->
   <!-- ================================================================== -->
   <Target Name="_RunRefApiCompat"
-          DependsOnTargets="_DownloadBaselinePackage;_RestoreTools;_BuildLegacyRefNetFx;_BuildLegacyRefNetCore;_BuildNewRefProject">
+          DependsOnTargets="_DownloadBaselinePackage;_RestoreTools;_BuildRefProject">
 
     <!--
-      For each TFM, compare:
-        1) Legacy ref output vs baseline (from published NuGet package)
-        2) New consolidated ref output vs baseline
-      Using strict mode to flag any difference (additions or removals).
-      ContinueOnError ensures all comparisons run even if some fail.
+      For each TFM, compare the consolidated ref output against the baseline
+      ref assembly from the published NuGet package. Using strict mode flags
+      any difference (additions or removals). ContinueOnError ensures all
+      comparisons run even if some fail.
 
       Output from each comparison is written to a file under
       $(ApiCompatResultsDir) so the user can review results after the run.
@@ -174,27 +129,12 @@
 
     <MakeDir Directories="$(ApiCompatResultsDir)" />
 
-    <!-- ============================================================== -->
-    <!-- Legacy ref vs baseline                                         -->
-    <!-- ============================================================== -->
-    <Message
-      Importance="high"
-      Text="--- Comparing LEGACY %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
-
-    <Exec
-      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;%(_RefTfm.LegacyRefDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)legacy-%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
-      WorkingDirectory="$(RepoRoot)"
-      ContinueOnError="ErrorAndContinue" />
-
-    <!-- ============================================================== -->
-    <!-- New consolidated ref vs baseline                               -->
-    <!-- ============================================================== -->
     <Message
       Importance="high"
-      Text="--- Comparing NEW %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
+      Text="--- Comparing %(_RefTfm.Identity) ref vs baseline $(BaselinePackageVersion) ---" />
 
     <Exec
-      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;$(NewRefOutputDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)new-%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
+      Command="dotnet apicompat -l &quot;$(BaselineExtractDir)ref\%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; -r &quot;$(RefOutputDir)%(_RefTfm.Identity)\Microsoft.Data.SqlClient.dll&quot; --strict-mode &gt; &quot;$(ApiCompatResultsDir)%(_RefTfm.Identity).txt&quot; 2&gt;&amp;1"
       WorkingDirectory="$(RepoRoot)"
       ContinueOnError="ErrorAndContinue" />
 
diff --git a/tools/targets/GenerateMdsPackage.targets b/tools/targets/GenerateMdsPackage.targets
deleted file mode 100644
index b4bf4a0d5c..0000000000
--- a/tools/targets/GenerateMdsPackage.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="GenerateMdsPackage" Condition="'$(GenerateNuget)' == 'true'">
-    <!-- Get the current commit id and store it in CommitId property to be used in nuget pack command -->
-    <Exec Command="git rev-parse HEAD" ConsoleToMSBuild="true">
-      <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
-    </Exec>	
-    <Message Text="Commit Id = $(CommitId)" />
-    <Exec Command="powershell.exe -NonInteractive -executionpolicy Unrestricted ^
-      -command &quot;&amp;$(ToolsDir)scripts\downloadLatestNuget.ps1 -nugetDestPath '$(NuGetRoot)'&quot;" />
-    <Exec Command="$(NuGetCmd) pack -Symbols -SymbolPackageFormat snupkg $(ToolsDir)specs\Microsoft.Data.SqlClient.nuspec -Version $(MdsPackageVersion) -OutputDirectory $(PackagesDir) -properties &quot;COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(AbstractionsPackageVersion);LoggingPackageVersion=$(LoggingPackageVersion)&quot;" />
-  </Target>
-</Project>
diff --git a/tools/targets/NotSupported.targets b/tools/targets/NotSupported.targets
deleted file mode 100644
index 10900e76be..0000000000
--- a/tools/targets/NotSupported.targets
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-    <!-- Tell ResolveMatchingContract to run and resolve contract to project reference -->
-    <ResolveMatchingContract>true</ResolveMatchingContract>
-    <NotSupportedSourceFile>$(IntermediateOutputPath)\$(TargetFramework)\$(AssemblyName).notsupported.cs</NotSupportedSourceFile>
-    <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateNotSupportedSource</CoreCompileDependsOn>
-    <!-- Not supported sources are created from the ref assembly, we currently don't produce finalizers in dummmy assemblies, so we disable ApiCompat to not fail. -->
-    <RunApiCompat>false</RunApiCompat>
-    <GenerateDocumentationFile Condition="'$(OSGroup)' != 'Windows_NT'">false</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);CS0618</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-    <AssemblyMetadata Include="NotSupported">
-      <Value>True</Value>
-    </AssemblyMetadata>
-  </ItemGroup>
-
-  <!-- GenerateNotSupportedSource
-       Inputs:
-         * A contract assembly
-         * Reference assemblies
-       Generates source for the contract that throws PlatformNotSupportedException
-  -->
-  <Target Name="GenerateNotSupportedSource"
-    AfterTargets="ResolveCodeAnalysisRuleSet"
-    DependsOnTargets="ResolveMatchingContract"
-    Inputs="@(ReferencePath);@(ResolvedMatchingContract)"
-    Outputs="$(NotSupportedSourceFile)">
-    <ItemGroup>
-      <!-- build out a list of directories where dependencies are located -->
-      <_referencePathDirectoriesWithDuplicates Include="@(ReferencePath->'%(RootDir)%(Directory)'->TrimEnd('\'))" />
-      <!-- strip metadata, removing duplicates -->
-      <_referencePathDirectories Include="%(_referencePathDirectoriesWithDuplicates.Identity)" />
-    </ItemGroup>
-
-    <Error Text="No single matching contract found." Condition="'@(ResolvedMatchingContract->Count())' != '1'" />
-
-    <PropertyGroup>
-      <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/bin/$(Configuration)/net10.0/</GenApiPath>
-      <GenApiCommand>
-        "$(DotnetPath)dotnet" $(GenApiPath)Microsoft.DotNet.GenAPI.dll
-          "%(ResolvedMatchingContract.Identity)"
-          -l:"@(_referencePathDirectories)"
-          -o:"$(NotSupportedSourceFile)"
-      </GenApiCommand>
-      <GenApiCommand Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
-        $(GenApiCommand)
-        -t:"$(GeneratePlatformNotSupportedAssemblyMessage)"
-      </GenApiCommand>
-      <!-- Convert more than one whitespace character into one space -->
-      <GenApiCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GenApiCommand), "\s+", " "))</GenApiCommand>
-    </PropertyGroup>
-
-    <Message Text=">>> Building MDS 'not supported' binaries via command: $(GenApiCommand)"/>
-    <Exec Command="$(GenApiCommand)" WorkingDirectory="$(ToolRuntimePath)"/>
-
-    <ItemGroup>
-      <FileWrites Include="$(NotSupportedSourceFile)" />
-      <Compile Include="$(NotSupportedSourceFile)" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/tools/targets/ResolveContract.targets b/tools/targets/ResolveContract.targets
deleted file mode 100644
index 98d3582716..0000000000
--- a/tools/targets/ResolveContract.targets
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <PropertyGroup Condition="'$(IsSourceProject)' == 'true'">
-    <ContractProject Condition="'$(ContractProject)' == ''">$(NetCoreSource)ref/$(MSBuildProjectName).csproj</ContractProject>
-    <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract>
-    <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$(ContractOutputPath)/$(MSBuildProjectName).dll</ContractAssemblyPath>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(HasMatchingContract)' == 'true'">
-    <ResolvedMatchingContract Condition="Exists('$(ContractAssemblyPath)')" Include="$(ContractAssemblyPath)" />
-    <!-- If the contract doesn't exist in the default contract output path add a project reference to the contract project to resolve -->
-    <ProjectReference Condition="'@(ResolvedMatchingContract)' == ''" Include="$(ContractProject)">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <OutputItemType>ResolvedMatchingContract</OutputItemType>
-    </ProjectReference>
-  </ItemGroup>
-
-  <!-- intentionally empty since we no longer need a target -->
-  <Target Name="ResolveMatchingContract" />
-
-  <Target Name="VerifyMatchingContract" AfterTargets="ResolveReferences">
-    <Message Text="IsSourceProject = $(IsSourceProject)" />
-    <Message Text="HasMatchingContract = $(HasMatchingContract)" />
-    <Message Text="ContractAssemblyPath = $(ContractAssemblyPath)" />
-    <Message Text="ResolvedMatchingContract.Identity = %(ResolvedMatchingContract.Identity)" />
-
-    <Error Condition="'$(HasMatchingContract)' == 'true' and !Exists('%(ResolvedMatchingContract.Identity)')" Text="ResolveMatchingContract could not find a matching contract '%(ResolvedMatchingContract.Identity)' not found." />
-  </Target>
-</Project>
diff --git a/tools/targets/TrimDocsForIntelliSense.targets b/tools/targets/TrimDocsForIntelliSense.targets
deleted file mode 100644
index 05feb26739..0000000000
--- a/tools/targets/TrimDocsForIntelliSense.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Licensed to the .NET Foundation under one or more agreements. 
-The .NET Foundation licenses this file to you under the MIT license. -->
-<Project>
-  <!-- This target runs after Build, and trims XML documentation generated in the $(OutputPath) of the project where this target is included.-->
-  <Target Name="TrimDocsForIntelliSense" AfterTargets="Build" Condition="'$(GenerateDocumentationFile)' == 'true'">
-    <Exec Command="powershell.exe -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' == 'Windows_NT' " />
-    <Exec Command="pwsh -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;$(ToolsDir)intellisense\TrimDocs.ps1 -inputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos; -outputFile &apos;$(OutputPath)\Microsoft.Data.SqlClient.xml&apos;&quot;" Condition=" '$(OS)' != 'Windows_NT' " />
-  </Target>
-</Project>