Official Build Cleanup 2 (#4155)

* PR comments and uh what

* Rely on AssemblyBuildNumber for non-MDS projects, too.

Author: benrr101

eng/pipelines/onebranch/jobs/validate-signed-package-job.yml

@@ -36,10 +36,6 @@ parameters:
   - name: isOfficial
     type: boolean
 
-  # True if this build is a preview.
-  - name: isPreview
-    type: boolean
-
 jobs:
   - job: validate_nuget_package
     displayName: "Validate NuGet package"
@@ -58,7 +54,7 @@ jobs:
       # Path to the SqlClient NuGet package after installation. This path will only exist once the package
       # been installed.
       - name: nugetPackageInstallPath
-        value: '$(Pipeline.Workspace)\nugetPackageInstalls\Microsoft.Data.SqlClient\${{ parameters.expectedPackageVersion }}'
+        value: '$(Pipeline.Workspace)\nugetPackageInstalls\Microsoft.Data.SqlClient.${{ parameters.expectedPackageVersion }}'
 
       # Root folder where NuGet package will be installed locally
       - name: nugetPackageInstallRoot
@@ -119,8 +115,8 @@ jobs:
             -SkipDependencies
 
           echo "> 2. Listing contents of installed Microsoft.Data.SqlClient NuGet package:"
-          Write-Host $artifactPath
-          Get-ChildItem $artifactPath
+          Write-Host $nugetPackageInstallRoot
+          Get-ChildItem $nugetPackageInstallRoot
         displayName: "Install NuGet Package"
 
       # Find all DLL files in the installed NuGet package, verify each is signed with a strong name

eng/pipelines/onebranch/sqlclient-non-official.yml

@@ -173,7 +173,6 @@ extends:
     stages:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
-          isPreview: ${{ parameters.isPreview }}
           isOfficial: false # This is a non-official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}

eng/pipelines/onebranch/sqlclient-official.yml

@@ -201,7 +201,6 @@ extends:
     stages:
       - template: /eng/pipelines/onebranch/stages/build-stages.yml@self
         parameters:
-          isPreview: ${{ parameters.isPreview }}
           isOfficial: true # This is an official pipeline.
           publishSymbols: ${{ parameters.publishSymbols }}
           buildSqlServerServer: ${{ parameters.buildSqlServerServer }}

eng/pipelines/onebranch/stages/build-stages.yml

@@ -22,11 +22,6 @@ parameters:
   - name: isOfficial
     type: boolean
 
-  # True if this is a preview build, which uses the preview version numbers from
-  # common-variables.yml.
-  - name: isPreview
-    type: boolean
-
   # True to publish symbols to public and private servers.
   - name: publishSymbols
     type: boolean
@@ -358,5 +353,4 @@ stages:
               artifactName: '${{ parameters.sqlClientArtifactsName }}'
               expectedFileVersion: '${{ parameters.sqlClientFileVersion }}'
               expectedPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
-              isPreview: ${{ parameters.isPreview }}
               isOfficial: ${{ parameters.isOfficial }}

eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml

@@ -32,9 +32,9 @@ steps:
         $(REPO_ROOT)/build2.proj
         -t:BuildMds
         -p:Configuration=Release
-        -p:PackageVersionAbstractions="${{ parameters.abstractionsPackageVersion }}"
-        -p:PackageVersionLogging="${{ parameters.loggingPackageVersion }}"
-        -p:PackageVersionMds="${{ parameters.sqlClientPackageVersion }}"
+        -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
+        -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
+        -p:PackageVersionMds=${{ parameters.sqlClientPackageVersion }}
         -p:ReferenceType=Package
       msBuildVersion: 17.0
       setupCommandLinePicker: vs2022

eng/pipelines/onebranch/variables/onebranch-variables.yml

@@ -4,7 +4,7 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# This file is only included in SqlClient OneBranch Official pipelines.
+# This file is only included in SqlClient OneBranch official/non-official pipelines.
 
 variables:
   # Libraries ==============================================================

eng/pipelines/onebranch/variables/package-variables.yml

@@ -41,7 +41,7 @@ variables:
   # $(Build.BuildNumber) has the format XXX.YY. Additionally, each version part must be a positive
   # 16-bit integer less than 65535. Simply concatenating both parts of $(Build.BuildNumber) could
   # produce values larger than 65534, so we must omit the second part entirely. Unfortunately, this
-  # may result in multiple subsequent pipline builds using the same C# assembly versions. The
+  # may result in multiple subsequent pipeline builds using the same C# assembly versions. The
   # package versions will not be affected and will show the complete $(Build.BuildNumber) values.
   - name: _assemblyBuildNumber
     value: $[ split(variables['Build.BuildNumber'], '.')[0] ]

src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props

@@ -24,7 +24,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         AbstractionsAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -33,7 +33,7 @@
             - If $(AbstractionsPackageVersion) is specified, use the numeric
               parts of its value, for example 1.0.0.345.
             - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber).
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber).
 
       We use private properties to hold the computed values, and then always
       assign those to the public properties.  After importing this file, the
@@ -45,7 +45,7 @@
 
     <!-- Determine the package version. -->
     <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(BuildNumber)-dev</_OurPackageVersion>
+    <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
 
     <!--Determine the assembly file version. -->
     <!-- If AbstractionsAssemblyFileVersion is set, use its value as-is. -->

src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props

@@ -23,7 +23,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         AzureAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -44,7 +44,7 @@
 
     <!-- Determine the package version. -->
     <_OurPackageVersion Condition="'$(AzurePackageVersion)' != ''">$(AzurePackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(BuildNumber)-dev</_OurPackageVersion>
+    <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
 
     <!--Determine the assembly file version. -->
     <!-- If AzureAssemblyFileVersion is set, use its value as-is. -->

src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props

@@ -24,7 +24,7 @@
           - Used as the base value of the assembly attribute
             'AssemblyInformationalVersion' generated by MSBuild.
           - If not specified, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber)-dev.
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev.
 
         LoggingAssemblyFileVersion:
           - Used as the value of the assembly attribute 'AssemblyFileVersion'
@@ -33,7 +33,7 @@
             - If $(LoggingPackageVersion) is specified, use the numeric
               parts of its value, for example 1.0.0.345.
             - Otherwise, defaults to:
-              $(DefaultMajorVersion).0.0.$(BuildNumber).
+              $(DefaultMajorVersion).0.0.$(AssemblyBuildNumber).
 
       We use private properties to hold the computed values, and then always
       assign those to the public properties.  After importing this file, the
@@ -45,7 +45,7 @@
 
     <!-- Determine the package version. -->
     <_OurPackageVersion Condition="'$(LoggingPackageVersion)' != ''">$(LoggingPackageVersion)</_OurPackageVersion>
-    <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(BuildNumber)-dev</_OurPackageVersion>
+    <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_OurPackageVersion>
 
     <!--Determine the assembly file version. -->
     <!-- If LoggingAssemblyFileVersion is set, use its value as-is. -->