diff --git a/build2.proj b/build2.proj
index 479d802f12..dff2760992 100644
--- a/build2.proj
+++ b/build2.proj
@@ -1,29 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<!-- Build Parameters ============================================== -->
+  <!-- Imports ========================================================= -->
+  <Import Project="src/Directory.Build.props" />
+
+  <!-- Build Parameters ================================================ -->
 	<PropertyGroup>
-		<!-- Configuration:  Which build configuration to build                                 -->
-		<!-- Allowed values: Debug, Release                                                     -->
-		<!-- Default value:  Debug                                                              -->
+    <!--
+		  Configuration
+		  Applies to:     All targets
+		  Description:    Which build configuration to build
+		  Default value:  Debug
+		  Allowed values: Debug, Release
+		-->
 		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
 
-		<!-- DotnetPath: Path to folder containing the `dotnet` binary. Override this if a      -->
-		<!--    specific version (eg, x86) is required. Otherwise, this defaults to using the   -->
-		<!--    dotnet binary in the PATH variable. The provided path should end with a `\` (or -->
-		<!--    `/`) character. Eg. C:\x86\                                                     -->
-		<DotnetPath Condition="'$(DotnetPath)' == ''"></DotnetPath>
-	</PropertyGroup>
+    <!--
+      DotnetPath
+      Applies to:    All targets
+      Description:   Path to folder containing the `dotnet` binary. Override this if a specific
+                     version (eg, x86) is required. Otherwise, this defaults to using the dotnet
+                     binary in the PATH variable. The provided path should end with a `\` (or `/`)
+                     character.
+      Default value: [blank]
+      Example:       C:\x86\
+    -->
+    <DotnetPath Condition="'$(DotnetPath)' == ''" />
+
+    <!--
+      MdsPackageVersion
+      Applies to:     TestMdsFunctional, TestMdsManual targets
+      Description:    Specifies what version of the Microsoft.Data.SqlClient package to run tests
+                      against. If not specified, the version defined in Versions.props is used.
+                      This argument only has effect if the ReferenceType argument is set to
+                      "Package".
+      Default value:  [blank]
+      Example:        7.0.0-preview4
+    -->
+    <MdsPackageVersion Condition="'$(MdsPackageVersion)' == ''" />
+    <TestPackageBuildArgument Condition="'$(MdsPackageVersion)' != ''">
+      $(TestPackageBuildArgument)
+      -p:MdsPackageVersion=$(MdsPackageVersion)
+    </TestPackageBuildArgument>
+
+    <!--
+      ReferenceType
+      Applies to:     TestMdsFunctional, TestMdsManual targets
+      Description:    Determines what mode to put test runs into. If set to "Project", the test
+                      projects will reference their test target as a ProjectReference, ie, running
+                      against the code as-is in the repository. This will also trigger a build of
+                      the target project, if necessary. If set to "Package", the test projects will
+                      reference their test target as a PackageReference, ie, running against a
+                      packaged version of the project.
+      Default value:  Project
+      Allowed values: (Package|Project)
+    -->
+    <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
+    <TestPackageBuildArgument Condition="'$(ReferenceType.ToLower())' == 'package'">
+      $(TestPackageBuildArgument)
+      -p:ReferenceType=Package
+    </TestPackageBuildArgument>
+
+    <!--
+      TestBlameTimeout
+      Applies to:     Test* targets
+      Description:    How long to wait on a test before timing it out. This will be fed to the
+                      dotnet blame-hang-timeout argument. If 0 is specified, hang timeout will be
+                      disabled. For more details and supported suffixed see:
+                      https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-test-vstest#options
+      Default value:  10m
+      Allowed values: (time_expression|0)
+    -->
+    <TestBlameTimeout Condition="'$(TestBlameTimeout)' == ''">10m</TestBlameTimeout>
+    <TestBlameTimeout Condition="'$(TestBlameTimeout)' == '0'" />
+    <TestBlameArgument Condition="'$(TestBlameTimeout)' != ''">
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout $(TestBlameTimeout)
+    </TestBlameArgument>
+
+    <!--
+      TestCollectCodeCoverage
+      Applies to:     Test* targets
+      Description:    Whether code coverage data should be collected during test target execution.
+      Default value:  true
+      Allowed value:  (true|false)
+    -->
+    <TestCollectCodeCoverage Condition="'$(TestCollectCodeCoverage)' == ''">true</TestCollectCodeCoverage>
+    <TestCollectArgument Condition="'$(TestCollectCodeCoverage.ToLower())' == 'true'">
+      --collect "Code coverage"
+      --settings "$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings"
+    </TestCollectArgument>
+
+    <!--
+      TestFilters
+      Applies to:     Test* targets
+      Description:    Filter to use to include or exclude any tests. If not specified, this defaults
+                      to including all tests that are not in the category "failing" or "flaky". Use
+                      "none" to disable filtering and run all tests in the target.
+                      For more information see:
+                      https://learn.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests
+      Default value:  category!=failing&category!=flaky
+      Allowed values: (category_expression|none)
+    -->
+    <TestFilter Condition="'$(TestFilter)' == ''">category!=failing&amp;category!=flaky</TestFilter>
+    <TestFilter Condition="'$(TestFilter.ToLower())' == 'none'" />
+    <TestFilterArgument Condition="'$(TestFilter)' != ''">
+      --filter "$(TestFilter)"
+    </TestFilterArgument>
 
-	<!-- Imports ======================================================= -->
-	<Import Project="src/Directory.Build.props" />
+    <!--
+      TestFramework
+      Applies to:    Test* targets
+      Description:   Target framework moniker for the version of the .NET to use to execute the
+                     specified test target. If not specified, this defaults to running tests for
+                     *all* framework versions supported for the project.
+      Default value: [blank]
+      Example:       net462
+    -->
+    <TestFramework Condition="'$(TestFramework)' == ''" />
+    <TestFrameworkArgument Condition="'$(TestFramework)' != ''">-f $(TestFramework)</TestFrameworkArgument>
 
-	<!-- Microsoft.Data.SqlClient Build Targets ======================== -->
+    <!--
+      TestResultsFolderPath
+      Applies to:    Test* targets
+      Description:   Absolute path to directory where any test results should be dumped. If not
+                     specified, this path will default to test_results in the root of the
+                     repository.
+      Default value: $(REPO_ROOT)\test_results
+      Example:       C:\my_test_results\my_extra_specaial_test_run_folder\
+    -->
+    <TestResultsFolderPath Condition="'$(TestResultsFolderPath)' == ''">$(RepoRoot)test_results</TestResultsFolderPath>
+
+    <!--
+      TestSet
+      Applies to:     TestMdsManual target
+      Description:    Used to select a set of tests to run from the MDS manual tests project. If not
+                      specified, all tests will be executed.
+      Default value:  [blank]
+      Allowed values: ([1][2][3][AE])
+      Examples:       "1", "12", "AE", "12AE"
+    -->
+    <TestSet Condition="'$(TestSet)' == ''" />
+    <TestSetArgument Condition="'$(TestSet)' != ''">-p:TestSet="$(TestSet)"</TestSetArgument>
+	</PropertyGroup>
+
+  <!-- ================================================================= -->
+	<!-- Microsoft.Data.SqlClient Targets -->
 	<PropertyGroup>
-		<MdsProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
+    <!-- Root for MDS projects -->
+    <MdsRoot>$(RepoRoot)src/Microsoft.Data.SqlClient/</MdsRoot>
+
+    <!-- Tools/Specs Paths -->
+    <MdsNuspecPath>$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</MdsNuspecPath>
+
+    <!-- Project Paths -->
+    <MdsFunctionalTestProjectPath>$(MdsRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</MdsFunctionalTestProjectPath>
+    <MdsManualTestProjectPath>$(MdsRoot)tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj</MdsManualTestProjectPath>
+    <MdsProjectPath>$(MdsRoot)src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
+    <MdsRefProjectPath>$(MdsRoot)ref/Microsoft.Data.SqlClient.csproj</MdsRefProjectPath>
+    <MdsUnitTestProjectPath>$(MdsRoot)tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj</MdsUnitTestProjectPath>
 	</PropertyGroup>
 
+  <!-- Build MDS Targets =============================================== -->
 	<!-- BuildMds: Builds all binaries for MDS -->
-	<Target Name="BuildMds" DependsOnTargets="BuildMdsUnix;BuildMdsWindows" />
+	<Target Name="BuildMds" DependsOnTargets="BuildMdsRef;BuildMdsUnix;BuildMdsWindows" />
+
+  <!-- BuildMdsRef: Builds the ref binaries project for MDS, which is OS-agnostic -->
+  <Target Name="BuildMdsRef">
+    <PropertyGroup>
+      <DotnetCommand>
+        $(DotnetPath)dotnet build $(MdsRefProjectPath)
+          -p:Configuration=$(Configuration)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building MDS ref binaries via command: $(DotnetCommand)"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 
 	<!-- BuildMdsUnix: Builds all unix-specific MDS binaries -->
 	<Target Name="BuildMdsUnix">
@@ -33,9 +188,10 @@
 				  -p:Configuration=$(Configuration)
 				  -p:TargetOs=Unix
 			</DotnetCommand>
-			<!-- Convert more than one whitespace character into one space --> 
-			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
 		</PropertyGroup>
+
 		<Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/>
 		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 	</Target>
@@ -48,10 +204,121 @@
 				  -p:Configuration=$(Configuration)
 				  -p:TargetOs=Windows_NT
 			</DotnetCommand>
-			<!-- Convert more than one whitespace character into one space --> 
-			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
 		</PropertyGroup>
-		<Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)"/>
+		<Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)" />
 		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 	</Target>
+
+  <!-- Pack MDS Target ===================================================== -->
+  <!-- PackMds: Packages MDS binaries into a NuGet package -->
+  <Target Name="PackMds">
+    <PropertyGroup>
+      <GitCommand>
+        git rev-parse HEAD
+      </GitCommand>
+    </PropertyGroup>
+    <Message Text=">>> Fetching git commit hash via command: $(GitCommand)" />
+    <Exec Command="$(GitCommand)" ConsoleToMsBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="CommitHash" />
+    </Exec>
+
+    <PropertyGroup>
+      <NugetCommand>
+        nuget pack &quot;$(MdsNuspecPath)&quot;
+          -OutputDirectory &quot;$(MdsArtifactsPath)&quot;
+          -Version &quot;$(MdsPackageVersion)&quot;
+          -Properties &quot;COMMITID=$(CommitHash);Configuration=$(Configuration);&quot;
+          -Symbols
+          -SymbolPackageFormat snupkg
+      </NugetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Packageing MDS via command: $(NugetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(NugetCommand)" />
+  </Target>
+
+  <!-- Test MDS Targets ==================================================== -->
+  <!-- TestMds: Runs all test projects for MDS -->
+  <Target Name="TestMds" DependsOnTargets="TestMdsFunctional;TestMdsManual;TestMdsUnit" />
+
+  <!-- TestMdsFunctional: Runs functional tests for MDS -->
+  <Target Name="TestMdsFunctional">
+    <!-- @TODO: Prevent from running in non-admin user mode -->
+    <PropertyGroup>
+      <LogFilePrefix>MdsFunctional-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        $(DotnetPath)dotnet test "$(MdsFunctionalTestProjectPath)"
+          -p:Configuration=$(Configuration)
+          $(TestBlameArgument)
+          $(TestCollectArgument)
+          $(TestFilterArgument)
+          $(TestFrameworkArgument)
+          $(TestPackageReferenceArgument)
+          --results-directory "$(TestResultsFolderPath)"
+          --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Running functional tests for MDS via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- TestMdsManual: Runs manual tests for MDS -->
+  <Target Name="TestMdsManual">
+    <PropertyGroup>
+      <LogFilePrefix>MdsManual-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestSet)' != ''">$(LogFilePrefix)-$(TestSet)</LogFilePrefix>
+
+      <DotnetCommand>
+        $(DotnetPath)dotnet test "$(MdsManualTestProjectPath)"
+          -p:Configuration=$(Configuration)
+          $(TestBlameArgument)
+          $(TestFilterArgument)
+          $(TestFrameworkArgument)
+          $(TestPackageReferenceArgument)
+          $(TestSetArgument)
+          --results-directory "$(TestResultsFolderPath)"
+          --logger:"trx;LogFilePrefix=$(LogFilePrefix)
+      </DotnetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Running manual tests for MDS via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
+
+  <!-- TestMdsUnit: Runs unit tests for MDS -->
+  <Target Name="TestMdsUnit">
+    <PropertyGroup>
+      <!--
+        Note: This test exclusively uses project references, so neither ReferenceType nor any
+            package version arguments are not specified in this command.
+      -->
+      <LogFilePrefix>MdsUnit-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotnetCommand>
+        $(DotnetPath)dotnet test "$(MdsUnitTestProjectPath)"
+          -p:Configuration=$(Configuration)
+          $(TestBlameArgument)
+          $(TestCollectArgument)
+          $(TestFilterArgument)
+          $(TestFrameworkArgument)
+          --results-directory "$(TestResultsFolderPath)"
+          --logger:"trx;LogFilePrefix=$(LogFilePrefix)
+      </DotnetCommand>
+
+      <!-- Convert more than one whitespace character into one space -->
+      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
+    </PropertyGroup>
+    <Message Text=">>> Running unit tests for MDS via command: $(DotnetCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
+  </Target>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
index 401b0c7d8b..9b0ada20f1 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -4,6 +4,28 @@
     <TargetFrameworks>net462;net8.0;net9.0;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
+  <!-- Platform Not Supported (PNSE) generation ======================= -->
+  <PropertyGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true'">
+    <GeneratePlatformNotSupportedAssemblyMessage>Microsoft.Data.SqlClient is not supported on this platform.</GeneratePlatformNotSupportedAssemblyMessage>
+    <ContractAssemblyPath>$(TargetDir)$(AssemblyName).dll</ContractAssemblyPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
+    <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="'$(TargetOs)' != 'Windows_NT'">false</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true'">
+    <ResolvedMatchingContract Include="$(ContractAssemblyPath)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
+    <AssemblyMetadata Include="NotSupported">
+      <Value>True</Value>
+    </AssemblyMetadata>
+  </ItemGroup>
+
   <!-- CLS Compliance ================================================== -->
   <ItemGroup>
     <AssemblyAttribute Include="System.CLSCompliantAttribute">
@@ -12,13 +34,25 @@
   </ItemGroup>
 
   <!-- Strong name signing ============================================= -->
-
   <!-- When a signing key is specified, we will perform strong name assembly signing. -->
   <PropertyGroup Condition="'$(SigningKeyPath)' != ''">
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <!-- @TODO: Move to directory.build.props? -->
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+
+    <!--
+      MSBuild will add the target framework to the end of this path by default. Telling it not to
+      is possible but also requires specifying the IntermediateOutputPath. So while it would be
+      nice to have a flatter directory structure, it's more hassle than its worth.
+    -->
+    <OutputPath>$(ArtifactPath)$(AssemblyName).ref/$(Configuration)/</OutputPath>
+  </PropertyGroup>
+
   <!-- References ====================================================== -->
   <!-- Reference to Abstractions -->
   <ItemGroup>
@@ -80,4 +114,36 @@
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
   </ItemGroup>
+
+  <!-- GenerateNotSupportedSource ===================================== -->
+  <Target Name="GenerateNotSupportedSource"
+          AfterTargets="ResolveCodeAnalysisRuleSet"
+          DependsOnTargets="ResolveMatchingContract"
+          Inputs="@(ReferencePath);@(ResolvedMatchingContract)"
+          Outputs="$(NotSupportedSourceFile)"
+          Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">
+    <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>
+      <GenAPIArgs>"%(ResolvedMatchingContract.Identity)"</GenAPIArgs>
+      <GenAPIArgs>$(GenAPIArgs) -l:"@(_referencePathDirectories)"</GenAPIArgs>
+      <GenAPIArgs>$(GenAPIArgs) -o:"$(NotSupportedSourceFile)"</GenAPIArgs>
+      <GenAPIArgs Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' OR '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">$(GenAPIArgs) -t:"$(GeneratePlatformNotSupportedAssemblyMessage)"</GenAPIArgs>
+      <GenAPIArgs Condition="'$(GeneratePlatformNotSupportedAssemblyWithGlobalPrefix)' == 'true'">$(GenAPIArgs) -global</GenAPIArgs>
+      <GenAPIPath Condition="'$(MSBuildRuntimeType)' == 'core'"> "$(DotnetPath)dotnet" "$(ToolsArtifactsDir)net8.0/Microsoft.DotNet.GenAPI.dll"</GenAPIPath>
+      <GenAPIPath Condition="'$(MSBuildRuntimeType)' != 'core'"> "$(ToolsArtifactsDir)net472\Microsoft.DotNet.GenAPI.exe"</GenAPIPath>
+    </PropertyGroup>
+    <Exec Command="$(GenAPIPath) $(GenAPIArgs)" WorkingDirectory="$(ToolRuntimePath)"/>
+    <ItemGroup>
+      <FileWrites Include="$(NotSupportedSourceFile)" />
+      <Compile Include="$(NotSupportedSourceFile)" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index fb54bc02ef..d847bfd58d 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -15,7 +15,6 @@
   </ItemGroup>
 
   <!-- Strong name signing ============================================= -->
-
   <!-- When a signing key is specified, we will perform strong name assembly signing. -->
   <PropertyGroup Condition="'$(SigningKeyPath)' != ''">
     <SignAssembly>true</SignAssembly>
@@ -28,29 +27,17 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- Target Frameworks =============================================== -->
-  <PropertyGroup>
-    <TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
-  </PropertyGroup>
-
   <!-- OS Constants ==================================================== -->
   <PropertyGroup>
-    <!-- @TODO: Move to directory.build.props? -->
-    <!--
-      If a target OS was not specified, we must choose a reasonable default.
-
-      For .NET Framework targets, we can assume a target OS of Windows, since
-      we don't support .NET Framework on any other OS.
-
-      For .NET targets, we will use the host OS, since that is where the
-      resulting artifacts are likely to be executed (i.e. tests).
-
-      Official builds should always explicitly specify a target OS.
-    -->
-    <TargetOs Condition="'$(TargetOs)' == '' AND '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETFramework'">Windows_NT</TargetOs>
+    <!-- If the TargetOs was not specified (as is the case during IDE development), the build     -->
+    <!-- should target the host OS.                                                               -->
     <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
 
-    <!-- Uncomment the following line to override the OS you are developing for -->
+    <!-- The following lines are provided for developer convenience. Many IDEs will automatically -->
+    <!-- hide code that is excluded via pre-compiler directives, making it difficult to edit in   -->
+    <!-- the IDE when on the wrong OS. To ease this, uncomment one of the following lines to      -->
+    <!-- force one OS or another. This is only for development usage. Do not commit these lines   -->
+    <!-- uncommented. -->
     <!--<TargetOs>Unix</TargetOs>-->
     <!--<TargetOs>Windows_NT</TargetOs>-->
 
@@ -62,6 +49,15 @@
     <DefineConstants Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(DefineConstants);_WINDOWS</DefineConstants>
   </PropertyGroup>
 
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+
+    <!-- We cannot build netfx unless we are building for Windows. Thus, we will only add netfx if -->
+    <!-- we are building for Windows.                                                              -->
+    <TargetFrameworks Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
     <!-- @TODO: Move to directory.build.props? -->
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 9507357a00..4a80550ec8 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -118,28 +118,24 @@
     <file src="..\icons\dotnet.png" target="" />
     <file src="..\..\src\Microsoft.Data.SqlClient\src\PackageReadme.md" target="README.md" />
 
-    <!--
-      We require the $ReferenceType$ property to be supplied on the nuget pack
-      command line to indicate where the DLLs are.
-    -->
-
-    <!-- ref NetFx -->
+    <!-- /ref/ ========================================================= -->
+    <!-- @TODO: ref NetFx -->
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient\ref\net462\Microsoft.Data.SqlClient.dll" target="ref\net462\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient\ref\net462\Microsoft.Data.SqlClient.xml" target="ref\net462\" exclude="" />
 
-    <!-- ref NetCore for Net 8 -->
+    <!-- @TODO: ref NetCore for Net 8 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net8.0\Microsoft.Data.SqlClient.dll" target="ref\net8.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net8.0\Microsoft.Data.SqlClient.xml" target="ref\net8.0\" exclude="" />
 
-    <!-- ref NetCore for Net 9 -->
+    <!-- @TODO: ref NetCore for Net 9 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net9.0\Microsoft.Data.SqlClient.dll" target="ref\net9.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net9.0\Microsoft.Data.SqlClient.xml" target="ref\net9.0\" exclude="" />
 
-    <!-- ref NetCore for NetStandard2.0 -->
+    <!-- @TODO: ref NetCore for NetStandard2.0 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\netstandard2.0\Microsoft.Data.SqlClient.dll" target="ref\netstandard2.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\netstandard2.0\Microsoft.Data.SqlClient.xml" target="ref\netstandard2.0\" exclude="" />
 
-    <!-- Localized Resource Files for NetFx -->
+    <!-- @TODO: Localized Resource Files for NetFx -->
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\cs\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\de\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\es\" exclude="" />
@@ -154,27 +150,29 @@
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hans\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net462\zh-Hant\" exclude="" />
 
-    <!-- lib NetFx -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
+    <!-- /lib/ ========================================================= -->
+    <!-- lib net462 -->
+    <!-- Note: These libs contain the implementation -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="lib\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="lib\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.xml" target="lib\net462\" exclude="" />
 
-    <!-- lib NetCore for Net 8 -->
+    <!-- @TODO: lib NetCore for Net 8 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll" target="lib\net8.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb" target="lib\net8.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.xml" target="lib\net8.0\" exclude="" />
 
-    <!-- lib NetCore for Net 9 -->
+    <!-- @TODO: lib NetCore for Net 9 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll" target="lib\net9.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb" target="lib\net9.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.xml" target="lib\net9.0\" exclude="" />
 
-    <!-- lib NetCore for NetStandard2.0 -->
+    <!-- @TODO: lib NetCore for NetStandard2.0 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netstandard\netstandard2.0\Microsoft.Data.SqlClient.dll" target="lib\netstandard2.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netstandard\netstandard2.0\Microsoft.Data.SqlClient.pdb" target="lib\netstandard2.0\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netstandard\netstandard2.0\Microsoft.Data.SqlClient.xml" target="lib\netstandard2.0\" exclude="" />
 
-    <!-- Localization files for Net 8 -->
+    <!-- @TODO: Localization files for Net 8 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\cs\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\de\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\es\" exclude="" />
@@ -188,9 +186,8 @@
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\tr\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hans\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net8.0\zh-Hant\" exclude="" />
-    <!-- End of Localization files for Net 8 -->
 
-    <!-- Localization files for Net 9 -->
+    <!-- @TODO: Localization files for Net 9 -->
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\cs\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\cs\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\de\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\de\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\es\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\es\" exclude="" />
@@ -204,22 +201,23 @@
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\tr\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\tr\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hans\" exclude="" />
     <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll" target="lib\net9.0\zh-Hant\" exclude="" />
-    <!-- End of Localization files for Net 9 -->
-
-    <!-- runtimes NetFx -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
-
-    <!-- runtimes NetCore for Net 8 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
-
-    <!-- runtimes NetCore for Net 9 -->
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
-    <file src="..\..\artifacts\$ReferenceType$\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
+
+    
+    <!-- /runtime/ ===================================================== -->
+    <!-- Runtime for net462 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net462\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net462\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net462\" exclude="" />
+
+    <!-- Runtimes for net8.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\unix\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net8.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net8.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net8.0\" exclude="" />
+    
+    <!-- Runtimes for net9.0 -->
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\win\lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\unix\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\win\lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.dll" target="runtimes\unix\lib\net9.0\" exclude="" />
+    <file src="..\..\artifacts\Microsoft.Data.SqlClient\$Configuration$\windows_nt\net9.0\Microsoft.Data.SqlClient.pdb" target="runtimes\unix\lib\net9.0\" exclude="" />
   </files>
 </package>