diff --git a/.gitignore b/.gitignore
index d2a25b6336..c2e6afabd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,9 @@ Generated\ Files/
 TestResult.xml
 nunit-*.xml
 
+# TRX format test results
+**/*.trx
+
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/
@@ -365,4 +368,7 @@ MigrationBackup/
 **/config.json
 
 # Generated Milestone PR metadata files
-.milestone-prs/
\ No newline at end of file
+.milestone-prs/
+
+# MDS "Not Supported" GenAPI code
+**/notsupported/*.cs
diff --git a/build2.proj b/build2.proj
index 479d802f12..ec8b32b141 100644
--- a/build2.proj
+++ b/build2.proj
@@ -1,57 +1,400 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<!-- Build Parameters ============================================== -->
-	<PropertyGroup>
-		<!-- Configuration:  Which build configuration to build                                 -->
-		<!-- Allowed values: Debug, Release                                                     -->
-		<!-- Default value:  Debug                                                              -->
-		<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>
-
-	<!-- Imports ======================================================= -->
-	<Import Project="src/Directory.Build.props" />
-
-	<!-- Microsoft.Data.SqlClient Build Targets ======================== -->
-	<PropertyGroup>
-		<MdsProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
-	</PropertyGroup>
-
-	<!-- BuildMds: Builds all binaries for MDS -->
-	<Target Name="BuildMds" DependsOnTargets="BuildMdsUnix;BuildMdsWindows" />
-
-	<!-- BuildMdsUnix: Builds all unix-specific MDS binaries -->
-	<Target Name="BuildMdsUnix">
-		<PropertyGroup>
-			<DotnetCommand>
-				$(DotnetPath)dotnet build $(MdsProjectPath)
-				  -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>
-		</PropertyGroup>
-		<Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/>
-		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-	</Target>
-
-	<!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
-	<Target Name="BuildMdsWindows">
-		<PropertyGroup>
-			<DotnetCommand>
-				$(DotnetPath)dotnet build $(MdsProjectPath)
-				  -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>
-		</PropertyGroup>
-		<Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)"/>
-		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
-	</Target>
+  <!-- Imports ========================================================= -->
+  <Import Project="src/Directory.Build.props" />
+
+  <!-- Build Parameters ================================================ -->
+  <!-- @TODO: Add a Help target that lists targets and these descriptions of the parameters -->
+  <PropertyGroup>
+    <!--
+      Configuration
+      Applies to:     All targets
+      Description:    Which build configuration to build
+      Default value:  Debug
+      Allowed values: Debug, Release
+    -->
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+
+    <!--
+      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)' == ''" />
+
+    <!--
+      PackageVersionAbstractions
+      Applies to:     BuildMds, BuildMdsRef, BuildMdsUnix, BuildMdsWindows
+                      TestMdsFunctional, TestMdsManual
+      Description:    Specifies what version of the Microsoft.Data.SqlClient.Abstractions to use
+                      when compiling MDS. If not specified, the version defined in
+                      Directory.Packages.props is used. This argument only has effect if the
+                      ReferenceType argument is set to "Package".
+      Default value:  [blank]
+      Example:        1.0.1-dev2345
+    -->
+    <PackageVersionAbstractions Condition="'$(PackageVersionAbstractions)' == ''" />
+    <PackageVersionAbstractionsArgument Condition="'$(PackageVersionAbstractions)' != ''">
+      -p:AbstractionsPackageVersion=$(PackageVersionAbstractions)
+    </PackageVersionAbstractionsArgument>
+
+    <!--
+      PackageVersionLogging
+      Applies to:     BuildMds, BuildMdsUnix, BuildMdsWindows
+                      TestMdsFunctional, TestMdsManual
+      Description:    Specifies what version of the Microsoft.Data.SqlClient.Logging to use
+                      when compiling MDS. If not specified, the version defined in
+                      Directory.Packages.props is used. This argument only has effect if the
+                      ReferenceType argument is set to "Package".
+      Default value:  [blank]
+      Example:        1.0.1-dev2345
+    -->
+    <PackageVersionLogging Condition="'$(PackageVersionLogging)' == ''" />
+    <PackageVersionLoggingArgument Condition="'$(PackageVersionLogging)' != ''">
+      -p:LoggingPackageVersion=$(PackageVersionLogging)
+    </PackageVersionLoggingArgument>
+
+    <!--
+      PackageVersionMds
+      Applies to:     TestMdsFunctional, TestMdsManual
+      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
+    -->
+    <PackageVersionMds Condition="'$(PackageVersionMds)' == ''" />
+    <PackageVersionMdsArgument Condition="'$(PackageVersionMds)' != ''">
+      -p:MdsPackageVersion=$(PackageVersionMds)
+    </PackageVersionMdsArgument>
+
+    <!--
+      ReferenceType
+      Applies to:     BuildMds, BuildMdsUnix, BuildMdsWindows
+      Description:    Determines how to build MDS. If set to "Project", any cross-project
+                      references (eg, Abstractions from MDS) will be made as project references. If
+                      set to "Package", package references will be made instead. When running in
+                      package mode, target versions can be specified via PackageVersion* build
+                      parameters. If these are not provided, the central feed version will be used
+                      instead (see Directory.Packages.props). When running in project mode, the
+                      dependencies will be built automatically.
+
+      Applies to:     TestMdsFunctional, TestMdsManual
+      Description:    Determines whether to test against a project reference or a package version
+                      of the test targets. Same description above applies.
+
+      Default value:  Project
+      Allowed values: (Package|Project)
+    -->
+    <ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
+    <ReferenceTypeArgument Condition="'$(ReferenceType.ToLower())' == 'package'">
+      -p:ReferenceType=Package
+    </ReferenceTypeArgument>
+
+    <!--
+      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 suffixes 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>
+    <TestBlameArgument Condition="'$(TestBlameTimeout)' != '0'">
+      --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)
+    -->
+    <TestFilters Condition="'$(TestFilters)' == ''">category!=failing&amp;category!=flaky</TestFilters>
+    <TestFilters Condition="'$(TestFilters.ToLower())' == 'none'" />
+    <TestFiltersArgument Condition="'$(TestFilters)' != ''">
+      --filter "$(TestFilters)"
+    </TestFiltersArgument>
+
+    <!--
+      TestFramework
+      Applies to:    Test* targets
+      Description:   Target framework moniker for the version of .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>
+
+    <!--
+      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_special_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>
+    <!-- Root for MDS projects -->
+    <MdsRoot>$(RepoRoot)src/Microsoft.Data.SqlClient/</MdsRoot>
+
+    <!-- Tools/Specs Paths -->
+    <MdsNuspecPath>$(RepoRoot)tools/specs/Microsoft.Data.SqlClient.nuspec</MdsNuspecPath>
+    <GenApiPath>$(RepoRoot)tools/GenAPI/Microsoft.DotNet.GenAPI/</GenApiPath>
+    <GenApiProjectPath>$(GenApiPath)Microsoft.DotNet.GenAPI.csproj</GenApiProjectPath>
+
+    <!-- Project Paths -->
+    <MdsFunctionalTestProjectPath>$(MdsRoot)tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj</MdsFunctionalTestProjectPath>
+    <MdsManualTestProjectPath>$(MdsRoot)tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj</MdsManualTestProjectPath>
+    <MdsNotSupportedProjectPath>$(MdsRoot)notsupported/Microsoft.Data.SqlClient.csproj</MdsNotSupportedProjectPath>
+    <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;BuildMdsRef;BuildMdsNotSupported" />
+
+  <!--
+    BuildMdsNotSupported: Builds a version of the MDS assemblies that always throws
+    PlatformNotSupportedException. It generates the source for this using GenAPI which is built as
+    the first step of this target.
+  -->
+  <Target Name="BuildMdsNotSupported">
+    <PropertyGroup>
+      <DotNetCommand>
+        "$(DotNetPath)dotnet" build "$(GenApiProjectPath)"
+        -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 GenAPI project via command: '$(DotNetCommand)'"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+
+    <!-- Get the path to the GenAPI artifact -->
+    <ItemGroup>
+      <GenApiArtifactPath Include="$(GenApiPath)bin/**/Microsoft.DotNet.GenAPI.dll" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <DotNetCommand>
+        "$(DotNetPath)dotnet" build "$(MdsNotSupportedProjectPath)"
+        -p:Configuration=$(Configuration)
+        -p:GenApiPath="@(GenApiArtifactPath->'%(FullPath)')"
+      </DotNetCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <DotNetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotNetCommand), "\s+", " "))</DotNetCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Building not supported binaries project via command: '$(DotNetCommand)'"/>
+    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+  </Target>
+
+  <!-- BuildMdsRef: Builds the ref binaries project for MDS, which is OS-agnostic -->
+  <Target Name="BuildMdsRef">
+    <PropertyGroup>
+      <DotNetCommand>
+        $(DotNetPath)dotnet build $(MdsRefProjectPath)
+        -p:Configuration=$(Configuration)
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+      </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">
+    <PropertyGroup>
+      <DotNetCommand>
+        $(DotNetPath)dotnet build $(MdsProjectPath)
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Unix
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+      </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>
+
+  <!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
+  <Target Name="BuildMdsWindows">
+    <PropertyGroup>
+      <DotNetCommand>
+        $(DotNetPath)dotnet build $(MdsProjectPath)
+        -p:Configuration=$(Configuration)
+        -p:TargetOs=Windows_NT
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+      </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)" />
+    <Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+  </Target>
+
+  <!-- Pack MDS Target ===================================================== -->
+  <!-- PackMds: Packages MDS binaries into a NuGet package -->
+  <Target Name="PackMds">
+    <!-- @TODO -->
+  </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)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionMdsArgument)
+      </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)
+        $(TestCollectArgument)
+        $(TestFiltersArgument)
+        $(TestFrameworkArgument)
+        $(TestSetArgument)
+        --results-directory "$(TestResultsFolderPath)"
+        --logger:"trx;LogFilePrefix=$(LogFilePrefix)"
+
+        <!-- Reference Type Arguments -->
+        $(ReferenceTypeArgument)
+        $(PackageVersionAbstractionsArgument)
+        $(PackageVersionLoggingArgument)
+        $(PackageVersionMdsArgument)
+      </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 specified in this command.
+      -->
+      <LogFilePrefix>MdsUnit-$(OS)</LogFilePrefix>
+      <LogFilePrefix Condition="'$(TestFramework)' != ''">$(LogFilePrefix)-$(TestFramework)</LogFilePrefix>
+
+      <DotNetCommand>
+        $(DotNetPath)dotnet test "$(MdsUnitTestProjectPath)"
+        -p:Configuration=$(Configuration)
+        $(TestBlameArgument)
+        $(TestCollectArgument)
+        $(TestFiltersArgument)
+        $(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.Extensions/Azure/test/Azure.Test.csproj b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
index 2182b21680..7d2a0c56a5 100644
--- a/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
+++ b/src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
@@ -1,44 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <!-- General Properties ============================================== -->
   <PropertyGroup>
-    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
+    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Azure.Test</AssemblyName>
+    <RootNamespace>Microsoft.Data.SqlClient.Extensions.Azure.Test</RootNamespace>
+
     <ImplicitUsings>enable</ImplicitUsings>
+    <IsTestProject>true</IsTestProject>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <AssemblyName>Microsoft.Data.SqlClient.Extensions.Azure.Test</AssemblyName>
 
     <!--
       Exclude Interactive tests by default since they require user interaction (e.g. browser
       sign-in).
 
       To run them explicitly:
-
         dotnet test -filter "Category=Interactive"
 
       Note that the "filter" argument actually requires two dashes, but that character sequence
       isn't permitted within an XML comment, so we only show a single dash above.
     -->
+    <!-- @TODO: Integrate this into build.proj so that filters can be composed at command line -->
     <VSTestTestCaseFilter>Category!=Interactive</VSTestTestCaseFilter>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="../src/Azure.csproj" />
-  </ItemGroup>
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="xunit.runner.console" />
-    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
-  </ItemGroup>
+    <!--
+      MDS is not built for net462 unless it is built for Windows. Thus, we will not be able to
+      fulfill the MDS for net462 reference unless we are building on Windows.
+    -->
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
 
+  <!-- Global Usings =================================================== -->
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
 
-  <!-- Copy the xUnit config file to our artifacts. -->
+  <!-- Embedded resources and content files ============================ -->
   <ItemGroup>
     <Content Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -46,17 +47,25 @@
     </Content>
   </ItemGroup>
 
-  <!--
-    Depend on the TestUtilities project because it copies the JSON config for
-    tests into the artifacts.  We don't refer to any of its assemblies.
-  -->
+  <!-- References ====================================================== -->
+  <!-- Test target references -->
   <ItemGroup>
-    <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/src/Microsoft.Data.SqlClient.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'"/>
+    <PackageReference Include="Microsoft.Data.SqlClient"
+                      Condition="'$(ReferenceType)' == 'Package'"/>
+
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
+    <!-- @TODO: Should we have a package mode reference for azure? -->
   </ItemGroup>
 
-  <!-- Conditional Project References -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Project'">
-    <ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
+  <!-- References for netfx -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.runner.console" />
 
     <!--
       We explicitly depend on SNI for .NET Framework due to bugs in how its DLLs get published
@@ -65,12 +74,30 @@
       This is probably an incompatibility between the build targets that the SNI NuGet package
       injects into downstream projects, and how the MDS project configures its output directories.
     -->
-    <PackageReference Condition="'$(TargetFramework)' == 'net462'" Include="Microsoft.Data.SqlClient.SNI" />
-  </ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI" />
 
-  <!-- Conditional Package References -->
-  <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
-    <PackageReference Include="Microsoft.Data.SqlClient" />
+    <!--
+      We take a dependency on the TestUtilities project because it copies the JSON config
+      for tests into the build output.
+    -->
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj"/>
   </ItemGroup>
 
+  <!-- References for netcore -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="xunit.runner.console" />
+
+    <!-- We explicitly depend on SNI.runtime for netcore for the same reason as in netfx -->
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
+
+    <!--
+      We take a dependency on the TestUtilities project because it copies the JSON config
+      for tests into the build output.
+    -->
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj"/>
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient.sln b/src/Microsoft.Data.SqlClient.sln
index f1794cdb41..636064e61a 100644
--- a/src/Microsoft.Data.SqlClient.sln
+++ b/src/Microsoft.Data.SqlClient.sln
@@ -379,6 +379,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj", "{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notsupported", "notsupported", "{351BE847-A0BF-450C-A5BC-8337AFA49EAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient\notsupported\Microsoft.Data.SqlClient.csproj", "{1DB299CE-95EA-4566-84DD-171768758291}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.GenAPI", "..\tools\GenAPI\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj", "{583E2B51-A90B-4F34-AD8B-4061504E855E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Cci.Extensions", "..\tools\GenAPI\Microsoft.Cci.Extensions\Microsoft.Cci.Extensions.csproj", "{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -791,6 +799,24 @@ Global
 		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x64.Build.0 = Release|Any CPU
 		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x86.ActiveCfg = Release|Any CPU
 		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01}.Release|x86.Build.0 = Release|Any CPU
+		{1DB299CE-95EA-4566-84DD-171768758291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DB299CE-95EA-4566-84DD-171768758291}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1DB299CE-95EA-4566-84DD-171768758291}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1DB299CE-95EA-4566-84DD-171768758291}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DB299CE-95EA-4566-84DD-171768758291}.Release|x64.ActiveCfg = Release|Any CPU
+		{1DB299CE-95EA-4566-84DD-171768758291}.Release|x86.ActiveCfg = Release|Any CPU
+		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Release|x64.ActiveCfg = Release|Any CPU
+		{583E2B51-A90B-4F34-AD8B-4061504E855E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -866,6 +892,10 @@ Global
 		{020A7E7B-04C9-4326-985F-045B42CC2200} = {7289C27E-D7DF-2C71-84B4-151F3A162493}
 		{D433ED2D-5E47-4A4B-B94A-EC71482715C7} = {020A7E7B-04C9-4326-985F-045B42CC2200}
 		{AA77C107-9A78-4A99-98BB-21FF7A1E0B01} = {2B71F605-037E-5629-6E23-0FA3C297446D}
+		{351BE847-A0BF-450C-A5BC-8337AFA49EAA} = {7289C27E-D7DF-2C71-84B4-151F3A162493}
+		{1DB299CE-95EA-4566-84DD-171768758291} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
+		{583E2B51-A90B-4F34-AD8B-4061504E855E} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
+		{2F900B8A-EA19-4274-9AE9-3E6A59856FCC} = {351BE847-A0BF-450C-A5BC-8337AFA49EAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {01D48116-37A2-4D33-B9EC-94793C702431}
diff --git a/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
new file mode 100644
index 0000000000..065e10dcd3
--- /dev/null
+++ b/src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj
@@ -0,0 +1,211 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!--
+    Everybody hold onto your pants because this is going to get a bit ugly.
+
+    The purpose of this project is to generate a "Not Supported" version of the MDS assembly. At a
+    high level, this is done by:
+      * Building the ref project (as a dependency to this project)
+      * Feeding the ref assembly to GenAPI (built separately)
+      * GenAPI generates a single cs file with the entire API surface implemented to throw
+        PlatformNotSupportedExceptions
+      * This cs file is included as a compilation item in this project.
+
+    The big question might be: Why do we need a "Not Supported" version of MDS?
+    In some situations, most importantly PowerShell, including a NuGet package will automatically
+    reference the appropriate assembly in the /lib folder of the package, which is inherently OS-
+    agnostic. MDS implementation assemblies are placed in the /runtimes folder to provide the OS-
+    specific versions of MDS. The "Not Supported" binary is thus placed in the lib folder so that
+    in OS-agnostic situations, the user is reminded to reference an OS-specific version of MDS.
+
+    The next big question might be: Why is this a separate project?
+    In previous iterations, generating the "Not Supported" binaries was part of the netcore ref
+    project and netcore src project. This made it necessary to conditionally switch the project
+    and all associated variables from "implementation" mode into "not supported" mode. It was
+    very difficult to understand what was going on. Creating a separate project just for
+    "not supported" mode simplifies this considerably. It also makes it much cleaner to excise
+    when this project is no longer required.
+
+    The last big question might be: Why does this need to be a project at all?
+    Since it looks like we're just running a static GenAPI program against the ref binaries, surely
+    we could just do that as an arbitrary command execution in the build.proj file, right? Well,
+    not really. GenAPI needs a list of folders to find built-in reference libraries. To get that
+    list correctly, we need access to @(ReferencePath), which is most easily done by passing it in
+    as an input to a target in a csproj. What's more, we need to compile the source that GenAPI
+    generates. Unless we want to manually call csc (and who wants to do that) we need a project.
+
+    NOTE: If you are trying to build this from your IDE - YOU ARE DOING IT WRONG.
+    This project can only be built after the GenAPI project has been built. Normally this would mean
+    adding a reference from this project to the GenAPI project. Although this is possible, it is
+    not a clean solution (due to reasons related to target frameworks). Thus, building this project
+    assumes the GenAPI project has already been built in a previous step. Instead, use the
+    following command in build2.proj to build the "not supported" binaries:
+
+    > msbuild build2.proj /t:BuildMdsNotSupported
+
+    @TODO: Remove this project
+    The primary prerequisite for removing this project is making the "common" MDS project OS-
+    agnostic. Once that happens, the lib binary will be able to switch OS implementation at runtime
+    and a "not supported" error is no longer necessary.
+
+    alternatively:
+    @TODO: Replace the GenAPI project with a C# Source Generator
+  -->
+
+  <!-- General Properties ============================================== -->
+  <PropertyGroup>
+    <AssemblyName>Microsoft.Data.SqlClient</AssemblyName>
+    <TargetFrameworks>net462;net8.0;net9.0;netstandard2.0</TargetFrameworks>
+
+    <!--
+      Files to compile will be generated per-framework by the GenerateNotSupportedSource target and
+      included via Compile tags. Leaving this enabled will cause warnings about files being
+      included more than once.
+    -->
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+
+    <!-- Disable obsolete member usage warning -->
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
+  </PropertyGroup>
+
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <!--
+      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>$(RepoRoot)artifacts/$(AssemblyName).notsupported/$(Configuration)/</OutputPath>
+  </PropertyGroup>
+
+  <!-- References ====================================================== -->
+  <!--
+    Reference the ref project to cause it to be built, so we can use it as the contract to build
+    not supported assemblies against. Note, this must be set to output item type of none otherwise
+    the assemblies for the ref project will be copied to the output for this project, causing
+    conflicts that fail the build.
+  -->
+  <PropertyGroup>
+    <RefProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj</RefProjectPath>
+    <RefArtifactPath>$(RepoRoot)artifacts/Microsoft.Data.SqlClient.ref/$(Configuration)/$(TargetFramework)/Microsoft.Data.SqlClient.dll</RefArtifactPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RefProjectPath)"
+                      ReferenceOutputAssembly="false"
+                      Private="false"
+                      OutputItemType="None" />
+  </ItemGroup>
+
+  <!--
+    Reference to Abstractions package. Even though the ref project has a reference to the
+    abstractions package, the binaries will not be copied into this project's output, so we need to
+    make our own reference to the package to ensure it is brought in for compilation.
+  -->
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
+                      Condition="'$(ReferenceType)' != 'Package'" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
+                      Condition="'$(ReferenceType)' == 'Package'" />
+  </ItemGroup>
+
+  <!-- References to external packages that the API refers to -->
+  <!-- References for netframework -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Runtime.Caching" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+
+    <PackageReference Include="Microsoft.Bcl.Cryptography" />
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI"
+                      PrivateAssets="all"
+                      IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" />
+    <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.Runtime.InteropServices.RuntimeInformation" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Threading.Channels" />
+  </ItemGroup>
+
+  <!-- References for netstandard -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <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" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.Threading.Channels" />
+  </ItemGroup>
+
+  <!-- References for netcore -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462' AND '$(TargetFramework)' != 'netstandard2.0'">
+    <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>
+
+  <!-- Generate "Not Supported" Source ================================= -->
+  <PropertyGroup>
+    <NotSupportedSourceFile>$(AssemblyName).$(TargetFramework).notsupported.cs</NotSupportedSourceFile>
+  </PropertyGroup>
+
+  <Target Name="GenerateNotSupportedSource"
+          BeforeTargets="CoreCompile"
+          DependsOnTargets="ResolveReferences">
+
+    <!-- Verify that GenAPI and ref projects were built successfully -->
+    <Error Text="Ref project output was not found at: '$(RefArtifactPath)'"
+           Condition="!Exists('$(RefArtifactPath)')" />
+    <Error Text="GenAPI project output was not found at: '$(GenApiPath)'"
+           Condition="!Exists('$(GenApiPath)')" />
+
+    <!--
+      Cleanup the list of reference path directories by trimming trailing \ and removing
+      duplicates.
+    -->
+    <ItemGroup>
+      <_referencePathDirectoriesWithDuplicates
+        Include="@(ReferencePath->'%(RootDir)%(Directory)'->TrimEnd('\'))" />
+      <_referencePathDirectories
+        Include="%(_referencePathDirectoriesWithDuplicates.Identity)" />
+    </ItemGroup>
+
+    <!-- Execute GenAPI against the ref assembly to generate the source file -->
+    <PropertyGroup>
+      <GenApiCommand>
+        $(DotnetPath)dotnet "$(GenApiPath)"
+          $(RefArtifactPath)
+          -l:"@(_referencePathDirectories)"
+          -o:"$(NotSupportedSourceFile)"
+          -t:"Microsoft.Data.SqlClient is not supported on this platform."
+      </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)" ConsoleToMsBuild="true" />
+
+    <!-- Include the "Not Supported" source file into this project -->
+    <ItemGroup>
+      <Compile Include="$(NotSupportedSourceFile)" />
+    </ItemGroup>
+  </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 41b4df05ab..447fb01182 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj
@@ -11,6 +11,49 @@
     </AssemblyAttribute>
   </ItemGroup>
 
+  <!-- Strong name signing ============================================= -->
+  <!-- This is done in Directory.Build.props -->
+
+  <!-- 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>
+
+  <!-- Trim Docs for IntelliSense ====================================== -->
+  <!--
+    It has been determined that including the remarks section in IntelliSense docs looks bad in
+    Visual Studio. So, before we generate the ref binaries, we trim off the remarks tags. We leave
+    them in the xml files, though, because those are the source for the docs site, which needs to
+    have the full documentation.
+  -->
+  <!-- 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">
+    <PropertyGroup>
+      <PowerShellCommand Condition="'$(OS)' == 'Windows_NT'">powershell.exe</PowerShellCommand>
+      <PowerShellCommand Condition="'$(OS)' != 'Windows_NT'">pwsh</PowerShellCommand>
+      <PowerShellCommand>
+        $(PowerShellCommand)
+          -NonInteractive
+          -ExecutionPolicy Unrestricted
+          -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(OutputPath)\Microsoft.Data.SqlClient.xml' -outputFile '$(OutputPath)\Microsoft.Data.SqlClient.xml'"
+      </PowerShellCommand>
+
+      <!-- Convert more than one whitespace character into one space -->
+      <PowerShellCommand>$([System.Text.RegularExpressions.Regex]::Replace($(PowerShellCommand), "\s+", " "))</PowerShellCommand>
+    </PropertyGroup>
+
+    <Message Text=">>> Trimming documentation file from generated documentation file: $(PowerShellCommand)"/>
+    <Exec Command="$(PowerShellCommand)" ConsoleToMsBuild="true" />
+  </Target>
+
   <!-- References ====================================================== -->
   <!-- Reference to Abstractions -->
   <ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 2e9045ee83..4fbe15bd1b 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -14,36 +14,26 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- When we're not signing, we are permitted to expose our internals to tests. -->
+  <!-- Strong name signing ============================================= -->
+  <!-- Strong naming is being done in Directory.Build.props -->
+  <!-- Otherwise, we're not signing, so we are permitted to expose our internals to tests. -->
   <ItemGroup Condition="'$(SigningKeyPath)' == ''">
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>UnitTests</_Parameter1>
     </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>-->
 
@@ -55,6 +45,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/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
index f648a68ab9..eab4f0493c 100644
--- a/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
@@ -5,7 +5,16 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
 
   <!-- References ====================================================== -->
   <!-- Test target reference -->
diff --git a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
index f3f45a0a65..bdbdeafe53 100644
--- a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
@@ -4,6 +4,17 @@
     <AssemblyName>ExternalConfigurableRetryLogic</AssemblyName>
   </PropertyGroup>
 
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <!-- References ====================================================== -->
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj"
diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props
deleted file mode 100644
index 83acd326e0..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props
+++ /dev/null
@@ -1,50 +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="..\..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <OSGroup Condition="$(OSGroup) == ''">$(OS)</OSGroup>
-    <TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
-    <TargetsUnix Condition="'$(OSGroup)'=='Unix'">true</TargetsUnix>
-    <Configurations>Debug;Release;</Configurations>
-    <Platforms>AnyCPU;x86;x64</Platforms>
-  </PropertyGroup>
-
-  <!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
-  <PropertyGroup>
-    <TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net462</TargetNetFxVersion>
-    <TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0;net9.0;net10.0</TargetNetCoreVersion>
-  </PropertyGroup>
-
-  <Choose>
-    <!-- Set Default Target Framework when building for Debug and Release configurations. (Visual Studio) -->
-    <When Condition="'$(TestTargetOS)' == ''">
-      <PropertyGroup>
-        <TargetFrameworks Condition="'$(TargetsWindows)' == 'true'">$(TargetNetCoreVersion);$(TargetNetFxVersion)</TargetFrameworks>
-        <TargetFrameworks Condition="'$(TargetsUnix)' == 'true'">$(TargetNetCoreVersion);</TargetFrameworks>
-      </PropertyGroup>
-    </When>
-    <!-- Set Target Framework when TestTargetOS is not empty. (Command Line) -->
-    <Otherwise>
-      <PropertyGroup>
-        <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">$(TargetNetCoreVersion)</TargetFrameworks>
-        <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">$(TargetNetFxVersion)</TargetFrameworks>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <!-- Copy test utilities to output folder -->
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)tools\Microsoft.Data.SqlClient.TestUtilities\CodeCoverage.runsettings">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>CodeCoverage.runsettings</Link>
-    </None>
-    <None Include="$(MSBuildThisFileDirectory)tools\Microsoft.Data.SqlClient.TestUtilities\xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>xunit.runner.json</Link>
-    </None>
-  </ItemGroup>
-</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 ec13e9a857..9a94a253d2 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
@@ -6,6 +6,17 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <!-- Links to internal project files ================================= -->
   <ItemGroup>
     <!-- @TODO: These should be removed -->
@@ -27,6 +38,15 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
 
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>xunit.runner.json</Link>
+    </None>
+
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>CodeCoverage.runsettings</Link>
+    </None>
   </ItemGroup>
 
   <!-- References ====================================================== -->
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 7ae352c028..a4924c9219 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
@@ -9,6 +9,17 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
 
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <!-- Test Set ======================================================== -->
   <PropertyGroup>
     <!-- This is a measure to allow parallelizing this test project across multiple jobs. By -->
@@ -57,6 +68,15 @@
           CopyToOutputDirectory="PreserveNewest" />
     <None Update="SQL\ConnectionTestWithSSLCert\GenerateSelfSignedCertificate.ps1"
           CopyToOutputDirectory="Always" />
+
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>xunit.runner.json</Link>
+    </None>
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>CodeCoverage.runsettings</Link>
+    </None>
   </ItemGroup>
 
   <!-- Items to include in test set 1 -->
@@ -384,10 +404,10 @@
     <!-- referencing MDS via the project.                                                         -->
     <ProjectReference Include="$(RepoRoot)src\Microsoft.Data.SqlClient\src\Microsoft.Data.SqlClient.csproj"
                       Condition="'$(ReferenceType)' != 'Package'"  />
-    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
-
     <PackageReference Include="Microsoft.Data.SqlClient"
                       Condition="'$(ReferenceType)' == 'Package'" />
+
+    <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
     <!-- @TODO: Should there be a package mode test for AKV? -->
   </ItemGroup>
 
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 0ef316f6db..5fb901fac6 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
@@ -8,6 +8,18 @@
     <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
     <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
+
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Condition="!$(ReferenceType.Contains('Package'))" Include="$(SqlServerSource)Microsoft.SqlServer.Server.csproj" />
     <PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.SqlServer.Server" />
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 dbd175305d..219d3cf3f1 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
@@ -8,6 +8,18 @@
     <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
     <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
+
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Condition="!$(ReferenceType.Contains('Package'))" Include="$(SqlServerSource)Microsoft.SqlServer.Server.csproj" />
     <PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.SqlServer.Server" />
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 ccd8342e17..2a2c902404 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
@@ -8,6 +8,18 @@
     <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
     <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
+
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Condition="!$(ReferenceType.Contains('Package'))" Include="$(SqlServerSource)Microsoft.SqlServer.Server.csproj" />
     <PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.SqlServer.Server" />
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 c1031bbaac..be4b202d51 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
@@ -8,6 +8,18 @@
     <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)</IntermediateOutputPath>
     <OutputPath>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)</OutputPath>
   </PropertyGroup>
+
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Condition="!$(ReferenceType.Contains('Package'))" Include="$(SqlServerSource)Microsoft.SqlServer.Server.csproj" />
     <PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.SqlServer.Server" />
diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
index c26651ba7d..49b7a47634 100644
--- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
+++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
@@ -11,7 +11,13 @@
     <StressRoot>$(MSBuildThisFileDirectory)</StressRoot>
 
     <!-- Target all frameworks that MDS supports. -->
-    <TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+
+    <!--
+      We can only build MDS for net462 if we are building for Windows, so we will only build this
+      for net462 if we are on Windows.
+    -->
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
 
     <!--
       Use the latest C# language version, regardless of what a particular
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 59aa6c7ed3..5dca2b6845 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
@@ -7,6 +7,17 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.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="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+  </PropertyGroup>
+
   <!-- Embedded resources and content files  =========================== -->
   <ItemGroup>
     <EmbeddedResource Update="Resources.resx">
@@ -19,6 +30,14 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>xunit.runner.json</Link>
+    </None>
+    <None Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/CodeCoverage.runsettings">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>CodeCoverage.runsettings</Link>
+    </None>
   </ItemGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.props
deleted file mode 100644
index abbaa56026..0000000000
--- a/src/Microsoft.Data.SqlClient/tests/tools/Directory.Build.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">
-
-  <!-- Import parent Directory.build.props -->
-  <Import Project="..\Directory.Build.props" />
-
-</Project>
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 cae90f7473..a90ef98be2 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
@@ -40,13 +40,19 @@
     <Compile Include="TDSServerEndPointConnection.cs" />
     <Compile Include="TDSServerParser.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
+
+  <!-- Windows Only Files -->
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
     <Compile Include="SSPI\SSPIContext.Windows.cs" />
     <Compile Include="SSPI\SecurityWrapper.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsWindows)' != 'true'">
+
+  <!-- Unix Only Files -->
+  <ItemGroup Condition="'$(OS)' == 'Unix'">
     <Compile Include="SSPI\SSPIContext.Unix.cs" />
   </ItemGroup>
+
+  <!-- References ====================================================== -->
   <ItemGroup>
     <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj">
       <Name>TDS</Name>
diff --git a/tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj b/tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
index 3c8676acac..5aa4e28584 100644
--- a/tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
+++ b/tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
@@ -7,7 +7,6 @@
     <LangVersion>8.0</LangVersion>
     <IsPackable>true</IsPackable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>$(ToolsArtifactsDir)</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj b/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj
index 1ee92e1808..4ec9283d9d 100644
--- a/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj
+++ b/tools/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj
@@ -1,25 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
     <PackageType>MSBuildSdk</PackageType>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
     <NoWarn>$(NoWarn);0436</NoWarn>
-    <OutputPath>$(ToolsArtifactsDir)</OutputPath>
   </PropertyGroup>
 
+  <!-- Target Framework ================================================ -->
+  <PropertyGroup>
+    <!--
+      We only need one version of this project to be built.
+      NOTE: This should not be changed to a netfx target, as we expect to be able to run GenAPI on
+          any OS via the dotnet command.
+    -->
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+
+  <!-- References ====================================================== -->
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Cci.Extensions\Microsoft.Cci.Extensions.csproj" />
+
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" />
     <PackageReference Include="System.Diagnostics.TextWriterTraceListener" />
     <PackageReference Include="System.Diagnostics.TraceSource" />
     <PackageReference Include="System.Private.Uri" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Cci.Extensions\Microsoft.Cci.Extensions.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/tools/targets/NotSupported.targets b/tools/targets/NotSupported.targets
index c200014ada..10900e76be 100644
--- a/tools/targets/NotSupported.targets
+++ b/tools/targets/NotSupported.targets
@@ -38,15 +38,24 @@
     <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>
+      <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>
-    <Exec Command="$(GenAPIPath) $(GenAPIArgs)" WorkingDirectory="$(ToolRuntimePath)"/>
+
+    <Message Text=">>> Building MDS 'not supported' binaries via command: $(GenApiCommand)"/>
+    <Exec Command="$(GenApiCommand)" WorkingDirectory="$(ToolRuntimePath)"/>
+
     <ItemGroup>
       <FileWrites Include="$(NotSupportedSourceFile)" />
       <Compile Include="$(NotSupportedSourceFile)" />