User Story 37654: Create Abstractions package

- Fixed Abstractions package versioning in official builds.
- Fixed broken assembly version checks in official builds.
- Removed Abstractions solution file.

Author: paulmedynski

eng/pipelines/common/templates/jobs/build-signed-package-job.yml

@@ -39,7 +39,11 @@ jobs:
     name: GetBuildType
   
   - template: ../steps/build-all-configurations-signed-dlls-step.yml@self
-  
+    parameters:
+      # These values are sourced from common-variables.yml.
+      abstractionsPackageVersion: $(abstractionsPackageVersion)
+      abstractionsAssemblyFileVersion: $(abstractionsAssemblyFileVersion)
+
   - template: ../steps/code-analyze-step.yml@self
     parameters:
       analyzeType: all

eng/pipelines/common/templates/jobs/validate-signed-package-job.yml

@@ -344,10 +344,16 @@ jobs:
 
   - powershell: |
       # Check assembly versions.
+      #
+      # GOTCHA: This expects the Versions.props file having XML elements in a
+      # certain order.  If the order changes, this check will fail!
+      #
+      # TODO: This also isn't checking the versions of the actual assemblies in
+      # the package, so it isn't terribly useful.
 
       [Xml] $versionprops = Get-Content -Path "tools/props/Versions.props" 
-      $AssemblyFileVersion =  $versionprops.Project.PropertyGroup[0].AssemblyFileVersion
-      $AssemblyVersion = $versionprops.Project.PropertyGroup[0].AssemblyVersion
+      $AssemblyFileVersion =  $versionprops.Project.PropertyGroup[1].AssemblyFileVersion
+      $AssemblyVersion = $versionprops.Project.PropertyGroup[1].AssemblyVersion
       
       if($AssemblyFileVersion -eq $AssemblyVersion)
       {

eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

@@ -4,6 +4,13 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 parameters:
+
+  - name: abstractionsPackageVersion
+    type: string
+
+  - name: abstractionsAssemblyFileVersion
+    type: string
+
   - name: AssemblyFileVersion
     type: string
     default: $(AssemblyFileVersion)
@@ -47,4 +54,4 @@ steps:
     inputs:
       solution: '**/build.proj'
       configuration: '${{parameters.Configuration }}'
-      msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk'
+      msbuildArguments: '-p:AssemblyFileVersion=${{parameters.AssemblyFileVersion }} -t:BuildAllConfigurations -p:GenerateNuget=false -p:SigningKeyPath=$(Agent.TempDirectory)\netfxKeypair.snk -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }} -p:AbstractionsAssemblyFileVersion=${{ parameters.abstractionsAssemblyFileVersion }}'

eng/pipelines/jobs/pack-abstractions-package-ci-job.yml

@@ -57,9 +57,9 @@ jobs:
 
     variables:
 
-      # The Abstractions solution file to use for all dotnet CLI commands.
-      - name: solution
-        value: src/Microsoft.Data.SqlClient.Extensions/Abstractions/Abstractions.slnx
+      # The Abstractions project file to use for all dotnet CLI commands.
+      - name: project
+        value: src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj
 
       # The directory where the NuGet packages will be staged before being
       # published as pipeline artifacts.
@@ -118,7 +118,7 @@ jobs:
         inputs:
           command: custom
           custom: restore
-          projects: $(solution)
+          projects: $(project)
           arguments: $(commonArguments)
 
       # Build the solution.
@@ -127,7 +127,7 @@ jobs:
         inputs:
           command: custom
           custom: build
-          projects: $(solution)
+          projects: $(project)
           arguments: $(buildArguments) --no-restore
 
       # Create the NuGet packages.
@@ -136,7 +136,7 @@ jobs:
         inputs:
           command: custom
           custom: pack
-          projects: $(solution)
+          projects: $(project)
           arguments: $(buildArguments) --no-build -o $(dotnetPackagesDir)
 
       # Publish the NuGet packages as a named pipeline artifact.

eng/pipelines/jobs/test-abstractions-package-ci-job.yml

@@ -76,9 +76,9 @@ jobs:
 
     variables:
 
-      # The Abstractions solution file to use for all dotnet CLI commands.
-      - name: solution
-        value: src/Microsoft.Data.SqlClient.Extensions/Abstractions/Abstractions.slnx
+      # The Abstractions test project file to use for all dotnet CLI commands.
+      - name: project
+        value: src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj
 
       # dotnet CLI arguments common to all commands.
       - name: commonArguments
@@ -141,7 +141,7 @@ jobs:
         inputs:
           command: custom
           custom: restore
-          projects: $(solution)
+          projects: $(project)
           arguments: $(commonArguments)
 
       # Build the solution.
@@ -150,7 +150,7 @@ jobs:
         inputs:
           command: custom
           custom: build
-          projects: $(solution)
+          projects: $(project)
           arguments: $(buildArguments) --no-restore
 
       # Run the tests for each .NET runtime.
@@ -160,7 +160,7 @@ jobs:
           inputs:
             command: custom
             custom: test
-            projects: $(solution)
+            projects: $(project)
             arguments: $(buildArguments) --no-build -f ${{ runtime }}
 
       # Run the tests for each .NET Framework runtime.
@@ -170,5 +170,5 @@ jobs:
           inputs:
             command: custom
             custom: test
-            projects: $(solution)
+            projects: $(project)
             arguments: $(buildArguments) --no-build -f ${{ runtime }}

eng/pipelines/libraries/common-variables.yml

@@ -26,6 +26,20 @@ variables:
   - name: artifactDirectory
     value: '$(REPOROOT)/packages'
 
+  # ----------------------------------------------------------------------------
+  # Abstractions Package Versions
+  #
+  # These are version values that will be used by the official build.  They
+  # should be updated after each release to reflect the next release's versions.
+
+  # The NuGet package version for the Abstractions package.
+  - name: abstractionsPackageVersion
+    value: 1.0.0.$(Build.BuildNumber)
+  
+  # The AssemblyFileVersion for all assemblies in the Abstractions package.
+  - name: abstractionsAssemblyFileVersion
+    value: '1.0.0.0'
+
   # Update this after every release. This is used to generate the MDS NuGet package version.
   - name: Major
     value: '7'

src/Microsoft.Data.SqlClient.Extensions/Abstractions/Abstractions.slnx

@@ -20,7 +20,7 @@
     -->
 
     <!--
-      GOTCHA: These two Assembly properties must appear in the first
+      GOTCHA: These two Assembly properties must appear in the second
       <PropertyGroup> in this file due to hardcoded XML processing in:
 
       eng/pipelines/common/templates/jobs/validate-signed-package-job.yml