- Removed MDS package ref dependency on Abstractions until pipelines are ready.

- Renamed AbstractionsPackage to Abstractions in targets.
- Updated BUILDGUIDE based on project ref behaviour.

Author: paulmedynski

BUILDGUIDE.md

@@ -21,7 +21,7 @@ The following build targets are defined in `build.proj`:
 |Target|Description|
 |-|-|
 |`BuildAllConfigurations`|Default target. Builds the .NET Framework and .NET drivers for all target frameworks and operating systems.|
-|`BuildAbstractionsPackage`|Restore, build, and pack the Abstractions package, publishing the resulting NuGet into `packages/`.|
+|`BuildAbstractions`|Restore, build, and pack the Abstractions package, publishing the resulting NuGet into `packages/`.|
 |`BuildNetCore`|Builds the .NET driver for all target frameworks.|
 |`BuildNetCoreAllOS`|Builds the .NET driver for all target frameworks and operating systems.|
 |`BuildNetFx`|Builds the .NET Framework driver for all target frameworks.|
@@ -55,8 +55,6 @@ build:
 Using the default configuration and running all tests:
 
 ```bash
-msbuild -t:BuildAbstractionsPackage
-msbuild
 msbuild -t:BuildTestsNetFx -p:TF=net462
 msbuild -t:BuildTestsNetCore
 msbuild -t:RunTests
@@ -65,8 +63,6 @@ msbuild -t:RunTests
 Using the Release configuration:
 
 ```bash
-msbuild -t:BuildAbstractionsPackage -p:Configuration=Release
-msbuild -p:Configuration=Release
 msbuild -t:BuildTestsNetFx -p:TF=net462 -p:Configuration=Release
 msbuild -t:BuildTestsNetCore -p:Configuration=Release
 msbuild -t:RunTests -p:Configuration=Release
@@ -75,8 +71,6 @@ msbuild -t:RunTests -p:Configuration=Release
 Running only the unit tests:
 
 ```bash
-msbuild -t:BuildAbstractionsPackage
-msbuild
 msbuild -t:BuildTestsNetFx -p:TF=net462
 msbuild -t:BuildTestsNetCore
 msbuild -t:RunUnitTests
@@ -85,8 +79,6 @@ msbuild -t:RunUnitTests
 Using a specific .NET runtime to run tests:
 
 ```bash
-msbuild -t:BuildAbstractionsPackage
-msbuild
 msbuild -t:BuildTestsNetFx -p:TF=net462
 msbuild -t:BuildTestsNetCore
 msbuild -t:RunTests -p:DotnetPath=C:\net8-win-x86\
@@ -209,7 +201,6 @@ Tests can be built and run with custom "Reference Type" property that enables di
 > CREATE A NUGET PACKAGE WITH BELOW COMMAND AND ADD TO LOCAL FOLDER + UPDATE NUGET CONFIG FILE TO READ FROM THAT LOCATION
 >
 > ```bash
-> msbuild -t:BuildAbstractionsPackage -p:Configuration=Release
 > msbuild -p:Configuration=Release
 > ```
 

build.proj

@@ -52,8 +52,8 @@
 
   <!-- Populate all managed projects -->
   <ItemGroup>
-    <AbstractionsPackage Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
-    <AbstractionsTestPackage Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
+    <Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
+    <AbstractionsTest Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
     <SqlServerLib Include="**/Microsoft.SqlServer.Server.csproj" />
     <NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
     <NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />
@@ -94,7 +94,7 @@
   <Target Name="BuildTestsNetCore" DependsOnTargets="RestoreTestsNetCore;BuildUnitTestsNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
   <Target Name="BuildTestsNetFx" DependsOnTargets="RestoreTestsNetFx;BuildUnitTestsNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx" Condition="$(IsEnabledWindows) == 'true'"/>
 
-  <!-- Abstractions Package Targets -->
+  <!-- Abstractions Targets -->
   <PropertyGroup>
     <!--
       If the AbstractionsPackageVersion property was supplied on the
@@ -114,30 +114,30 @@
       >AbstractionsPackageVersion=$(AbstractionsPackageVersion)</AbstractionsProperties>
   </PropertyGroup>
 
-  <Target Name="RestoreAbstractionsPackage">
+  <Target Name="RestoreAbstractions">
     <MSBuild
-      Projects="@(AbstractionsPackage)"
+      Projects="@(Abstractions)"
       Targets="Restore"
       Properties="$(AbstractionsProperties)" />
   </Target>
 
-  <Target Name="BuildAbstractionsPackage">
+  <Target Name="BuildAbstractions">
     <MSBuild
-      Projects="@(AbstractionsPackage)"
+      Projects="@(Abstractions)"
       Targets="Build;Pack"
       Properties="$(AbstractionsProperties)" />
   </Target>
 
-  <Target Name="RestoreAbstractionsTestPackage">
+  <Target Name="RestoreAbstractionsTest">
     <MSBuild
-      Projects="@(AbstractionsTestPackage)"
+      Projects="@(AbstractionsTest)"
       Targets="Restore"
       Properties="$(AbstractionsProperties)" />
   </Target>
 
-  <Target Name="BuildAbstractionsTestPackage">
+  <Target Name="BuildAbstractionsTest">
     <MSBuild
-      Projects="@(AbstractionsTestPackage)"
+      Projects="@(AbstractionsTest)"
       Targets="Build"
       Properties="$(AbstractionsProperties)" />
   </Target>
@@ -149,7 +149,7 @@
 
   <Target
     Name="RestoreNetCore"
-    DependsOnTargets="RestoreSqlServerLib;RestoreAbstractionsPackage">
+    DependsOnTargets="RestoreSqlServerLib;RestoreAbstractions">
     <MSBuild Projects="@(NetCoreDriver)" Targets="restore" />
   </Target>
 
@@ -161,7 +161,7 @@
 
   <Target
     Name="RestoreNetFx"
-    DependsOnTargets="RestoreSqlServerLib;RestoreAbstractionsPackage"
+    DependsOnTargets="RestoreSqlServerLib;RestoreAbstractions"
     Condition="'$(IsEnabledWindows)' == 'true'">
     <MSBuild Projects="@(NetFxDriver)" Targets="restore" />
   </Target>
@@ -184,7 +184,7 @@
 
   <Target
     Name="BuildNetFx"
-    DependsOnTargets="RestoreNetFx;BuildSqlServerLib;BuildAbstractionsPackage"
+    DependsOnTargets="RestoreNetFx;BuildSqlServerLib;BuildAbstractions"
     Condition="'$(IsEnabledWindows)' == 'true'">
     <MSBuild Projects="@(NetFxDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties);$(NugetPackProperties);" />
   </Target>
@@ -204,13 +204,13 @@
 
   <Target
     Name="BuildNetCore"
-    DependsOnTargets="RestoreNetCore;BuildSqlServerLib;BuildAbstractionsPackage">
+    DependsOnTargets="RestoreNetCore;BuildSqlServerLib;BuildAbstractions">
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);Platform=AnyCPU;$(ProjectProperties)" />
   </Target>
 
   <Target
     Name="BuildNetCoreAllOS"
-    DependsOnTargets="RestoreNetCore;BuildSqlServerLib;BuildAbstractionsPackage">
+    DependsOnTargets="RestoreNetCore;BuildSqlServerLib;BuildAbstractions">
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;" RemoveProperties="TargetsWindows;TargetsUnix;" />
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="'$(IsEnabledWindows)' == 'true'" />
     <MSBuild Projects="@(NetCoreDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;" RemoveProperties="TargetsWindows;TargetsUnix;" />
@@ -433,11 +433,11 @@
   <!-- Clean all build outputs. -->
   <Target Name="Clean">
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "artifacts", SearchOption.AllDirectories))' />
-    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "packages", SearchOption.AllDirectories))' />
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "bin", SearchOption.AllDirectories))' />
-    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "obj", SearchOption.AllDirectories))' />
     <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", ".nuget", SearchOption.AllDirectories))' />
-  </Target>
+    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "obj", SearchOption.AllDirectories))' />
+    <RemoveDir Directories='$([System.IO.Directory]::GetDirectories(".", "packages", SearchOption.AllDirectories))' />
+</Target>
 
   <!-- AKV Targets ========================================================= -->
   <Target Name="BuildAkv">

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

@@ -55,9 +55,12 @@
     <ProjectReference
       Include="../../../Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
       Condition="'$(ReferenceType)' == 'Project'" />
+    <!-- TODO(ADO-38703): Package ref requires pipeline changes TBD. -->
+    <!--
     <PackageReference
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Condition="'$(ReferenceType)' == 'Package'" />
+    -->
   </ItemGroup>
 
   <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS' AND '$(TargetGroup)' != 'netcoreapp'" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -1075,9 +1075,12 @@
     <ProjectReference
       Include="../../../Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
       Condition="'$(ReferenceType)' == 'Project'" />
+    <!-- TODO(ADO-38703): Package ref requires pipeline changes TBD. -->
+    <!--
     <PackageReference
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Condition="'$(ReferenceType)' == 'Package'" />
+    -->
   </ItemGroup>
 
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />

src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

@@ -58,9 +58,12 @@
     <ProjectReference
       Include="../../../Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
       Condition="'$(ReferenceType)' == 'Project'" />
+    <!-- TODO(ADO-38703): Package ref requires pipeline changes TBD. -->
+    <!--
     <PackageReference
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Condition="'$(ReferenceType)' == 'Package'" />
+    -->
   </ItemGroup>
 
   <Import Project="$(ToolsDir)targets\TrimDocsForIntelliSense.targets" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -1049,9 +1049,12 @@
     <ProjectReference
       Include="../../../Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj"
       Condition="'$(ReferenceType)' == 'Project'" />
+    <!-- TODO(ADO-38703): Package ref requires pipeline changes TBD. -->
+    <!--
     <PackageReference
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Condition="'$(ReferenceType)' == 'Package'" />
+    -->
   </ItemGroup>
 
   <Import Project="$(CommonSourceRoot)tools\targets\GenerateResourceStringsSource.targets" />