Skip to content

[7.0] Merge | Pack Mds Target, Wire PR/CI Pipelines to Build2.proj #4110

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

Open
paulmedynski wants to merge 1 commit into
base: release/7.0
Choose a base branch
from
Open

[7.0] Merge | Pack Mds Target, Wire PR/CI Pipelines to Build2.proj #4110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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')) }}:
- 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 }}
-p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
-p:PackageVersionMds=${{ parameters.mdsPackageVersion }}
Comment on lines +84 to +90
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

msbuildArguments under the MSBuild@1 task is currently written as a YAML mapping (each line contains a :), not a scalar string. Azure Pipelines expects msbuildArguments to be a string, so this will either fail YAML parsing/type validation or pass the wrong value to the task. Use a folded scalar (>-) or quote the entire argument string so the task receives a single msbuild arguments string.

Copilot uses AI. Check for mistakes.

# 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