User Story 37654: Create Abstractions package

- Removed obsolete ADO Library inclusion in CI variables.
- Moved MDS CI versions numbers into CI variables.
- Fixed Abstractions versioning to handle CI version format.

Author: paulmedynski

eng/pipelines/dotnet-sqlclient-ci-core.yml

@@ -165,7 +165,7 @@ stages:
       ${{ if eq(parameters.referenceType, 'Package') }}:
         dependsOn:
           - build_abstractions_package_stage
-          - build_nugets
+          - build_mds_akv_packages_stage
 
       prebuildSteps: # steps to run prior to building and running tests on each job
         - ${{if ne(parameters.SNIVersion, '')}}:

eng/pipelines/libraries/ci-build-variables.yml

@@ -6,7 +6,6 @@
 
 variables:
   - group: 'ADO Build properties'
-  - group: 'ADO CI Packaging'
   - group: 'ADO Test Configuration Properties'
 
   - name: buildNumber
@@ -16,11 +15,11 @@ variables:
   - name: SQLTarget
     value: 'localhost'
   - name: abstractionsPackageVersion
-    value: 1.0.0.$(buildNumber)
+    value: 1.0.0.$(buildNumber)-ci
   - name: akvPackageVersion
-    value: 7.0.0.$(buildNumber)
+    value: 7.0.0.$(buildNumber)-ci
   - name: mdsPackageVersion
-    value: $(Major).$(Minor)$(Patch)-pull.1$(buildnumber)
+    value: 7.0.0.$(buildNumber)-ci
   - name: skipComponentGovernanceDetection
     value: true
   - name: runCodesignValidationInjection

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

@@ -8,28 +8,41 @@
 
   <!-- Versioning Properties -->
   <PropertyGroup>
-    <!-- The current Major version number for the Abstractions package. -->
-    <AbstractionsPackageMajorVersion>1</AbstractionsPackageMajorVersion>
-
     <!--
-      If the Abstractions package version is specified on the command-line, then
-      we use it as-is, for example:
-
-        msbuild -p:AbstractionsPackageVersion=1.0.0
-        dotnet build -p:AbstractionsPackageVersion=1.0.0
-
-      Otherwise, we use a default value with a "-dev" suffix.
-
-      $(BuildNumber) is defined in tools/props/Versions.props.
+      We accept two external properties to control versioning:
+
+        AbstractionsPackageVersion:
+          - Used as the NuGet package version, both in the package file name
+            and in the package metadata.
+          - Used as the base value of the assembly attribute
+            'AssemblyInformationalVersion' generated by MSBuild.
+          - If not specified, defaults to:
+              $(AbstractionsPackageMajorVersion).0.0.$(BuildNumber)-dev.
+        
+        AbstractionsAssemblyFileVersion:
+          - Used as the value of the assembly attribute 'AssemblyFileVersion'
+            generated by MSBuild.
+          - If not specified:
+            - If $(AbstractionsPackageVersion) is specified, use the numeric
+              parts of its value, for example 1.0.0.345.
+            - Otherwise, defaults to:
+              $(AbstractionsPackageMajorVersion).0.0.$(BuildNumber).
     -->
-    <AbstractionsPackageVersionSuffix Condition="'$(AbstractionsPackageVersion)' == ''">-dev</AbstractionsPackageVersionSuffix>
-    <AbstractionsPackageVersion>$(AbstractionsPackageMajorVersion).0.0.$(BuildNumber)</AbstractionsPackageVersion>
 
-    <!--
-      We pin the AssemblyVersion of our package to its current Major version
-      number, with all remaining parts set to 0.
-    -->
-    <AbstractionsPackageAssemblyVersion>$(AbstractionsPackageMajorVersion).0.0.0</AbstractionsPackageAssemblyVersion>
+    <!-- The default major version number. -->
+    <DefaultMajorVersion>1</DefaultMajorVersion>
+
+    <!-- Determine the assembly file version. -->
+    <!-- If AbstractionsAssemblyFileVersion is set, use its value as-is. -->
+    <OurAssemblyFileVersion Condition="'$(AbstractionsAssemblyFileVersion)' != ''">$(AbstractionsAssemblyFileVersion)</OurAssemblyFileVersion>
+    <!-- If AbstractionsPackageVersion is set, use its trimmed value. -->
+    <OurAssemblyFileVersion Condition="'$(AbstractionsAssemblyFileVersion)' == '' and '$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion.Split('-')[0])</OurAssemblyFileVersion>
+    <!-- If neither property is set, use the default value.-->
+    <OurAssemblyFileVersion Condition="'$(AbstractionsAssemblyFileVersion)' == '' and '$(AbstractionsPackageVersion)' == ''">$(DefaultMajorVersion).0.0.$(BuildNumber)</OurAssemblyFileVersion>
+    
+    <!-- Determine the package version. -->
+    <OurPackageVersion Condition="'$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion)</OurPackageVersion>
+    <OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(DefaultMajorVersion).0.0.$(BuildNumber)-dev</OurPackageVersion>
   </PropertyGroup>
 
   <!-- Target Config -->
@@ -48,10 +61,15 @@
     <AssemblyName>Microsoft.Data.SqlClient.Extensions.Abstractions</AssemblyName>
     <RootNamespace>Microsoft.Data.SqlClient.Extensions.Abstractions</RootNamespace>
 
-    <AssemblyVersion>$(AbstractionsPackageAssemblyVersion)</AssemblyVersion>
-    <AssemblyFileVersion>$(AbstractionsPackageVersion)</AssemblyFileVersion>
-    <FileVersion>$(AssemblyFileVersion)</FileVersion>
-    <Version>$(AbstractionsPackageVersion)$(AbstractionsPackageVersionSuffix)</Version>
+    <!--
+      We pin the AssemblyVersion of our package to the default major version
+      number, with all remaining parts set to 0.
+    -->
+    <AssemblyVersion>$(DefaultMajorVersion).0.0.0</AssemblyVersion>
+
+    <AssemblyFileVersion>$(OurAssemblyFileVersion)</AssemblyFileVersion>
+    <FileVersion>$(OurAssemblyFileVersion)</FileVersion>
+    <Version>$(OurPackageVersion)</Version>
   </PropertyGroup>
   <ItemGroup>
     <!-- Our API is CLS Compliant. -->
@@ -69,12 +87,8 @@
     See: https://learn.microsoft.com/en-us/nuget/reference/msbuild-targets#pack-target
   -->
   <PropertyGroup>
-    <!--
-      We omit specifying <PackageId> here since it defaults to $(AssemblyName),
-      specified above.
-    -->
-
-    <PackageVersion>$(Version)</PackageVersion>
+    <PackageId>$(AssemblyName)</PackageId>
+    <PackageVersion>$(OurPackageVersion)</PackageVersion>
     <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>