Skip to content

Merge | Pack Mds Target, Wire PR/CI Pipelines to Build2.proj #4033

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 27 commits into from
Mar 19, 2026
Merged

Merge | Pack Mds Target, Wire PR/CI Pipelines to Build2.proj #4033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1feabab
In progress work for pack target ... kinda working
benrr101 Mar 6, 2026
c840aac
Add config to genapi path.
benrr101 Mar 6, 2026
7c24eaa
Fix generation of docs in ref project
benrr101 Mar 9, 2026
7d0f219
Dump reference type specific builds
benrr101 Mar 9, 2026
e971112
Generating a package file works!!!
benrr101 Mar 9, 2026
8e06806
Resync pipelines folder in solution
benrr101 Mar 10, 2026
64e3974
Add an assembly build number argument?
benrr101 Mar 10, 2026
9e8d78d
Wiring up build numbers through build2.proj
benrr101 Mar 10, 2026
b26e97a
Build number argument
benrr101 Mar 11, 2026
b93ffc1
Maybe wiring it up?!?
benrr101 Mar 11, 2026
c183862
Reinstate the assemblybuildnumber property
benrr101 Mar 11, 2026
891b2ed
Build all of MDS, once
benrr101 Mar 11, 2026
a23cb73
PR comments from copilot
benrr101 Mar 11, 2026
73f0bf8
Specify test results folder for CI builds
benrr101 Mar 11, 2026
d0aa7b8
TargetFramework => TestFramework
benrr101 Mar 11, 2026
ef05fcb
Fixing a couple more comments
benrr101 Mar 12, 2026
2abb29a
Couple more comments from copilot
benrr101 Mar 12, 2026
f354eac
downgrade back to 7.0.0 :)
benrr101 Mar 12, 2026
2384e21
I dunno, fixing some stuff, I guess.
benrr101 Mar 12, 2026
ce8443f
Merge branch 'main' into dev/russellben/common/pack2
benrr101 Mar 13, 2026
e50713c
Merge branch 'main' into dev/russellben/common/pack2
benrr101 Mar 13, 2026
efbdbb2
Fix indenting
benrr101 Mar 16, 2026
cd744bf
Back out changes to official pipelines
benrr101 Mar 16, 2026
34f53e2
A couple more comments from CoPilot
benrr101 Mar 16, 2026
4050a33
Merge branch 'main' into dev/russellben/common/pack2
benrr101 Mar 18, 2026
cc41334
Generate AKV documentation file during CI build ... idk why this is o…
benrr101 Mar 18, 2026
3f08d21
Comments from Copilot ... I'd love it if it could give the same comme…
benrr101 Mar 18, 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
272 changes: 196 additions & 76 deletions build2.proj
View file
Open in desktop

Large diffs are not rendered by default.

104 changes: 13 additions & 91 deletions eng/pipelines/common/templates/steps/ci-project-build-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,61 +71,25 @@ parameters:
default: $(akvPackageVersion)

steps:
- ${{ if or(eq(parameters.operatingSystem, 'Windows'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
# Build MDS
- ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
Comment thread
benrr101 marked this conversation as resolved.
- task: MSBuild@1
displayName: 'Restore [Win]'
displayName: 'Build Driver'
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
inputs:
solution: build.proj
solution: build2.proj
msbuildArchitecture: x64
msbuildArguments: >-
-t:restore
platform: '${{ parameters.platform }}'
configuration: '${{ parameters.buildConfiguration }}'
msbuildArguments:
-t:BuildMds
-p:ReferenceType=${{ parameters.referenceType }}
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
retryCountOnTaskFailure: 1

- ${{ if eq(parameters.build, 'allNoDocs') }}:
- task: MSBuild@1
displayName: 'Build Driver (no docs) [Win]'
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
inputs:
solution: build.proj
msbuildArchitecture: x64
platform: '${{ parameters.platform }}'
configuration: '${{ parameters.buildConfiguration }}'
msbuildArguments: >-
-t:BuildAllConfigurations
-p:ReferenceType=${{ parameters.referenceType }}
-p:GenerateNuget=false
-p:GenerateDocumentationFile=false
-p:BuildNumber=${{ parameters.buildNumber }}
-p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}

- ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all')) }}:
- task: MSBuild@1
displayName: 'Build Driver [Win]'
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
inputs:
solution: build.proj
msbuildArchitecture: x64
platform: '${{ parameters.platform }}'
configuration: '${{ parameters.buildConfiguration }}'
msbuildArguments:
-t:BuildAllConfigurations
-p:ReferenceType=${{ parameters.referenceType }}
-p:GenerateNuget=false
-p:BuildNumber=${{ parameters.buildNumber }}
-p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-p:BuildNumber=${{ parameters.buildNumber }}
-p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
Comment thread
benrr101 marked this conversation as resolved.
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-p:PackageVersionMds=${{ parameters.mdsPackageVersion }}

# Build AKV Provider
- ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
- task: MSBuild@1
displayName: 'Build AKV Provider'
Expand All @@ -136,53 +100,10 @@ steps:
platform: '${{ parameters.platform }}'
configuration: '${{ parameters.buildConfiguration }}'
msbuildArguments: >-
-t:BuildAkvProvider
-p:ReferenceType=${{ parameters.referenceType }}
-p:GenerateNuget=false
-p:BuildNumber=${{ parameters.buildNumber }}
-p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
-p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-p:AkvPackageVersion=${{ parameters.akvPackageVersion }}

- ${{ if or(eq(parameters.operatingSystem, 'Linux'), eq(parameters.operatingSystem, 'MacOS'), eq(parameters.operatingSystem, 'deferedToRuntime')) }}:
- ${{ if or(eq(parameters.build, 'MDS'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
- task: DotNetCoreCLI@2
displayName: 'Build SqlClient [${{ parameters.operatingSystem }}]'
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
inputs:
command: custom
projects: build.proj
custom: build
arguments: >-
-t:BuildSqlClient
-p:ReferenceType=${{ parameters.referenceType }}
-p:TestEnabled=true
-p:GenerateNuget=false
-p:GenerateDocumentationFile=false
-p:Configuration=${{ parameters.buildConfiguration }}
-p:BuildNumber=${{ parameters.buildNumber }}
-p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
-p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
-p:LoggingPackageVersion=${{ parameters.loggingPackageVersion }}
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
verbosityRestore: Detailed
verbosityPack: Detailed

- ${{ if or(eq(parameters.build, 'AkvProvider'), eq(parameters.build, 'all'), eq(parameters.build, 'allNoDocs')) }}:
- task: DotNetCoreCLI@2
displayName: 'Build AKV Provider [${{ parameters.operatingSystem }}]'
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
inputs:
command: custom
projects: build.proj
custom: build
arguments: >-
-t:BuildAkvProvider
-p:ReferenceType=${{ parameters.referenceType }}
-p:TestEnabled=true
-p:GenerateNuget=false
-p:GenerateDocumentationFile=false
-p:Configuration=${{ parameters.buildConfiguration }}
-p:BuildNumber=${{ parameters.buildNumber }}
-p:AssemblyBuildNumber=${{ parameters.assemblyBuildNumber }}
Expand All @@ -192,3 +113,4 @@ steps:
-p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}
verbosityRestore: Detailed
verbosityPack: Detailed

Loading
Loading