diff --git a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml b/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml index bc566398cc..27369eb6cc 100644 --- a/eng/pipelines/onebranch/jobs/validate-signed-package-job.yml +++ b/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 diff --git a/eng/pipelines/onebranch/sqlclient-non-official.yml b/eng/pipelines/onebranch/sqlclient-non-official.yml index 1ab3c653c3..a908ae4e74 100644 --- a/eng/pipelines/onebranch/sqlclient-non-official.yml +++ b/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 }} diff --git a/eng/pipelines/onebranch/sqlclient-official.yml b/eng/pipelines/onebranch/sqlclient-official.yml index c6c18d679a..7f02ea0226 100644 --- a/eng/pipelines/onebranch/sqlclient-official.yml +++ b/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 }} diff --git a/eng/pipelines/onebranch/stages/build-stages.yml b/eng/pipelines/onebranch/stages/build-stages.yml index 14e7977c3f..ba24af6309 100644 --- a/eng/pipelines/onebranch/stages/build-stages.yml +++ b/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 }} diff --git a/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml b/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml index 813df97326..ac515aa021 100644 --- a/eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml +++ b/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 diff --git a/eng/pipelines/onebranch/variables/onebranch-variables.yml b/eng/pipelines/onebranch/variables/onebranch-variables.yml index 4009c60b3d..7b7c7597cb 100644 --- a/eng/pipelines/onebranch/variables/onebranch-variables.yml +++ b/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 ============================================================== diff --git a/eng/pipelines/onebranch/variables/package-variables.yml b/eng/pipelines/onebranch/variables/package-variables.yml index 92f9863021..b1466b06b9 100644 --- a/eng/pipelines/onebranch/variables/package-variables.yml +++ b/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] ] diff --git a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props b/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props index 2bd328fb92..75be8d98c3 100644 --- a/src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props +++ b/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 @@ <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' != ''">$(AbstractionsPackageVersion) - <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(BuildNumber)-dev + <_OurPackageVersion Condition="'$(AbstractionsPackageVersion)' == ''">$(AbstractionsDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev diff --git a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props b/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props index 3a9debd3bb..2102cd798a 100644 --- a/src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props +++ b/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 @@ <_OurPackageVersion Condition="'$(AzurePackageVersion)' != ''">$(AzurePackageVersion) - <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(BuildNumber)-dev + <_OurPackageVersion Condition="'$(AzurePackageVersion)' == ''">$(AzureDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev diff --git a/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props b/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props index 597a692457..9205b88793 100644 --- a/src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props +++ b/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 @@ <_OurPackageVersion Condition="'$(LoggingPackageVersion)' != ''">$(LoggingPackageVersion) - <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(BuildNumber)-dev + <_OurPackageVersion Condition="'$(LoggingPackageVersion)' == ''">$(LoggingDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev diff --git a/src/Microsoft.Data.SqlClient/MdsVersions.props b/src/Microsoft.Data.SqlClient/MdsVersions.props index a9f8d1cc83..97063881d9 100644 --- a/src/Microsoft.Data.SqlClient/MdsVersions.props +++ b/src/Microsoft.Data.SqlClient/MdsVersions.props @@ -85,5 +85,4 @@ $(MdsFileVersion.Split('.')[0]).0.0.0 - diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props index d575830c40..47982a6478 100644 --- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props +++ b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props @@ -23,7 +23,7 @@ - Used as the base value of the assembly attribute 'AssemblyInformationalVersion' generated by MSBuild. - If not specified, defaults to: - $(AkvDefaultMajorVersion).0.0.$(BuildNumber)-dev. + $(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev. AkvAssemblyFileVersion: - Used as the value of the assembly attribute 'AssemblyFileVersion' @@ -32,7 +32,7 @@ - If $(AkvPackageVersion) is specified, use the numeric parts of its value, for example 7.0.0.345. - Otherwise, defaults to: - $(AkvDefaultMajorVersion).0.0.$(BuildNumber). + $(AkvDefaultMajorVersion).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 @@ -44,7 +44,7 @@ <_AkvPackageVersion Condition="'$(AkvPackageVersion)' != ''">$(AkvPackageVersion) - <_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(BuildNumber)-dev + <_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 858b41628b..f2132677c9 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -19,7 +19,7 @@ 1.0.0.0 1.0.0.0 - 1.0.0.$(BuildNumber)-dev + 1.0.0.$(AssemblyBuildNumber)-dev $(SqlServerPackageVersion)