Skip to content

Official Build Cleanup 2 #4155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benrr101 merged 2 commits into from
Apr 9, 2026
Merged

Official Build Cleanup 2 #4155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
143be4c
PR comments and uh what
benrr101 Apr 6, 2026
67302f0
Rely on AssemblyBuildNumber for non-MDS projects, too.
benrr101 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions eng/pipelines/onebranch/jobs/validate-signed-package-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Comment thread
benrr101 marked this conversation as resolved.
displayName: "Install NuGet Package"

# Find all DLL files in the installed NuGet package, verify each is signed with a strong name
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/onebranch/sqlclient-non-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ extends:
stages:
- template: /eng/pipelines/onebranch/stages/build-stages.yml@self
parameters:
isPreview: ${{ parameters.isPreview }}
Comment thread
paulmedynski marked this conversation as resolved.
isOfficial: false # This is a non-official pipeline.
publishSymbols: ${{ parameters.publishSymbols }}
buildSqlServerServer: ${{ parameters.buildSqlServerServer }}
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/onebranch/sqlclient-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 0 additions & 6 deletions eng/pipelines/onebranch/stages/build-stages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -358,5 +353,4 @@ stages:
artifactName: '${{ parameters.sqlClientArtifactsName }}'
expectedFileVersion: '${{ parameters.sqlClientFileVersion }}'
expectedPackageVersion: '${{ parameters.sqlClientPackageVersion }}'
isPreview: ${{ parameters.isPreview }}
isOfficial: ${{ parameters.isOfficial }}
6 changes: 3 additions & 3 deletions eng/pipelines/onebranch/steps/roslyn-analyzers-sqlclient-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion eng/pipelines/onebranch/variables/onebranch-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ==============================================================
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/onebranch/variables/package-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] ]
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/AbstractionsVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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. -->
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient.Extensions/Azure/src/AzureVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Comment thread
benrr101 marked this conversation as resolved.
AzureAssemblyFileVersion:
- Used as the value of the assembly attribute 'AssemblyFileVersion'
Expand All @@ -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. -->
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient.Internal/Logging/src/LoggingVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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. -->
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.Data.SqlClient/MdsVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,4 @@
<MdsAssemblyVersion>$(MdsFileVersion.Split('.')[0]).0.0.0</MdsAssemblyVersion>
</PropertyGroup>


</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/AkvProviderVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -44,7 +44,7 @@

<!-- Determine the package version. -->
<_AkvPackageVersion Condition="'$(AkvPackageVersion)' != ''">$(AkvPackageVersion)</_AkvPackageVersion>
<_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(BuildNumber)-dev</_AkvPackageVersion>
<_AkvPackageVersion Condition="'$(AkvPackageVersion)' == ''">$(AkvDefaultMajorVersion).0.0.$(AssemblyBuildNumber)-dev</_AkvPackageVersion>

<!-- Determine the assembly file version. -->
<!-- If AkvAssemblyFileVersion is set, use its value as-is. -->
Expand Down
2 changes: 1 addition & 1 deletion tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- Future Assembly Version values shall be Major.Minor.0.0; e.g. 1.0.0.0 -->
<SqlServerAssemblyVersion>1.0.0.0</SqlServerAssemblyVersion>
<SqlServerAssemblyFileVersion Condition="'$(SqlServerAssemblyFileVersion)' == ''">1.0.0.0</SqlServerAssemblyFileVersion>
<SqlServerPackageVersion Condition="'$(SqlServerPackageVersion)' == ''">1.0.0.$(BuildNumber)-dev</SqlServerPackageVersion>
<SqlServerPackageVersion Condition="'$(SqlServerPackageVersion)' == ''">1.0.0.$(AssemblyBuildNumber)-dev</SqlServerPackageVersion>
<SqlServerVersion>$(SqlServerPackageVersion)</SqlServerVersion>
</PropertyGroup>

Expand Down
Loading