From 7513898bb873e8e37f6aaec1317af1694d291120 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Apr 2020 19:48:03 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/arcade build 20200408.3 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.3 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- global.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29d08a7d5..7eb2e587f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - ac9c5c72b6fbb0e025006bc930b45db27e28c5ae + c2875f0932d46832730556eaac5dd8c91b854599 - + https://github.com/dotnet/arcade - ac9c5c72b6fbb0e025006bc930b45db27e28c5ae + c2875f0932d46832730556eaac5dd8c91b854599 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 256ffbfb9..968b39bef 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 640f2b04e..2a7a2aebb 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -81,7 +81,7 @@ jobs: continueOnError: ${{ parameters.sdlContinueOnError }} - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 - -GuardianPackageName Microsoft.Guardian.Cli.0.7.2 + -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1 -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} diff --git a/global.json b/global.json index a0d354eda..e0d7a844b 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20207.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20207.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.3" } } From 7724bd1280609d6d387e767b282222e4a52f7a3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Apr 2020 20:51:52 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/arcade build 20200408.4 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.4 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.4 --- eng/Version.Details.xml | 8 ++++---- eng/common/post-build/symbols-validation.ps1 | 18 ++++++++++++++++-- global.json | 4 ++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eb2e587f..2cfc7018c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - c2875f0932d46832730556eaac5dd8c91b854599 + dd866339a1702dd03f99f0e07b7afba9f81df680 - + https://github.com/dotnet/arcade - c2875f0932d46832730556eaac5dd8c91b854599 + dd866339a1702dd03f99f0e07b7afba9f81df680 diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index f7cfe986d..22eeb2656 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -1,7 +1,8 @@ param( [Parameter(Mandatory=$true)][string] $InputPath, # Full path to directory where NuGet packages to be checked are stored [Parameter(Mandatory=$true)][string] $ExtractPath, # Full path to directory where the packages will be extracted during validation - [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion # Version of dotnet symbol to use + [Parameter(Mandatory=$true)][string] $DotnetSymbolVersion, # Version of dotnet symbol to use + [Parameter(Mandatory=$false)][switch] $ContinueOnError # If we should keep checking symbols after an error ) function FirstMatchingSymbolDescriptionOrDefault { @@ -125,6 +126,8 @@ function CheckSymbolsAvailable { Remove-Item $ExtractPath -Force -Recurse -ErrorAction SilentlyContinue } + $TotalFailures = 0 + Get-ChildItem "$InputPath\*.nupkg" | ForEach-Object { $FileName = $_.Name @@ -148,11 +151,22 @@ function CheckSymbolsAvailable { if ($Status -ne 0) { Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $Status modules in the package $FileName" - ExitWithExitCode $exitCode + + if ($ContinueOnError) { + $TotalFailures++ + } + else { + ExitWithExitCode 1 + } } Write-Host } + + if ($TotalFailures -ne 0) { + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Symbols missing for $TotalFailures packages" + ExitWithExitCode 1 + } } function InstallDotnetSymbol { diff --git a/global.json b/global.json index e0d7a844b..f121a8015 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.4", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.4" } } From ac8d9f9c089e0e2080fd38f4cf5376ed1c63b08c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Apr 2020 21:54:24 +0000 Subject: [PATCH 03/15] Update dependencies from https://github.com/dotnet/arcade build 20200408.7 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.7 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.7 --- eng/Version.Details.xml | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2cfc7018c..141f1b481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ - + https://github.com/dotnet/arcade dd866339a1702dd03f99f0e07b7afba9f81df680 - + https://github.com/dotnet/arcade dd866339a1702dd03f99f0e07b7afba9f81df680 diff --git a/global.json b/global.json index f121a8015..3076f736e 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.7", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.7" } } From 2c28106d523a4600bb74404028ae59d4b3d58a92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Apr 2020 00:44:40 +0000 Subject: [PATCH 04/15] Update dependencies from https://github.com/dotnet/arcade build 20200408.12 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.12 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20208.12 --- eng/Version.Details.xml | 8 ++--- eng/common/templates/job/execute-sdl.yml | 32 ++++++++++--------- .../templates/post-build/post-build.yml | 2 ++ global.json | 4 +-- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 141f1b481..722cd4df9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - dd866339a1702dd03f99f0e07b7afba9f81df680 + b59ad40aaab798be36807f2b157422be8b4cb0c0 - + https://github.com/dotnet/arcade - dd866339a1702dd03f99f0e07b7afba9f81df680 + b59ad40aaab798be36807f2b157422be8b4cb0c0 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 2a7a2aebb..c64c4f568 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,7 @@ parameters: # 'continueOnError', the parameter value is not correctly picked up. # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; + downloadArtifacts: true # optional: determines if the artifacts should be dowloaded dependsOn: '' # Optional: dependencies of the job artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts # Usage: @@ -31,8 +32,20 @@ jobs: steps: - checkout: self clean: true - - ${{ if ne(parameters.artifactNames, '') }}: - - ${{ each artifactName in parameters.artifactNames }}: + - ${{ if ne(parameters.downloadArtifacts, 'false')}}: + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: - task: DownloadBuildArtifacts@0 displayName: Download Build Artifacts inputs: @@ -41,20 +54,9 @@ jobs: project: $(AzDOProjectName) pipeline: $(AzDOPipelineId) buildId: $(AzDOBuildId) - artifactName: ${{ artifactName }} + downloadType: specific files + itemPattern: "**" downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - - ${{ if eq(parameters.artifactNames, '') }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: specific files - itemPattern: "**" - downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fbab4cb5d..d058dd151 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -9,6 +9,7 @@ parameters: continueOnError: false params: '' artifactNames: '' + downloadArtifacts: true # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -192,6 +193,7 @@ stages: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} + downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: diff --git a/global.json b/global.json index 3076f736e..1b6b3463f 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.7", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.7" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.12", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.12" } } From c9e54997eab965dc2b620bbe92582648ac1fe471 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Apr 2020 20:27:24 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/arcade build 20200409.6 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20209.6 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20209.6 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.sh | 9 ++++++++- global.json | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 722cd4df9..c6c3c1bcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - b59ad40aaab798be36807f2b157422be8b4cb0c0 + 156d512fd28545c4fdd5c7d6410b9ce263624e0e - + https://github.com/dotnet/arcade - b59ad40aaab798be36807f2b157422be8b4cb0c0 + 156d512fd28545c4fdd5c7d6410b9ce263624e0e diff --git a/eng/common/tools.sh b/eng/common/tools.sh index caae1dbdb..5e4429c64 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -201,7 +201,14 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/global.json b/global.json index 1b6b3463f..b24e47bcd 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20208.12", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20208.12" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20209.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20209.6" } } From 07a08aaf635ded6674b003e72f008ea3a2772177 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Apr 2020 21:39:00 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/arcade build 20200409.7 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20209.7 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20209.7 --- eng/Version.Details.xml | 8 +++--- .../channels/generic-public-channel.yml | 4 +-- .../templates/post-build/common-variables.yml | 2 +- .../templates/post-build/post-build.yml | 8 +++--- .../post-build/setup-maestro-vars.yml | 26 ++++++++----------- global.json | 4 +-- 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6c3c1bcb..01ba73cb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 156d512fd28545c4fdd5c7d6410b9ce263624e0e + 18ac1be0e3520e91b7a2332fe98dd4a8ebe47dbe - + https://github.com/dotnet/arcade - 156d512fd28545c4fdd5c7d6410b9ce263624e0e + 18ac1be0e3520e91b7a2332fe98dd4a8ebe47dbe diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 08853ec45..bf98d990e 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -25,7 +25,7 @@ stages: - job: publish_symbols displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }})) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats - name: AzDOProjectName @@ -99,7 +99,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - name: ArtifactsCategory value: ${{ coalesce(variables._DotNetArtifactsCategory, '.NETCore') }} - condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }})) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'], format('[{0}]', ${{ parameters.channelId }} )) pool: vmImage: 'windows-2019' steps: diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 867f37cd8..c99fd7503 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -63,7 +63,7 @@ variables: - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion - value: "2019-01-16" + value: "2020-02-20" - name: SourceLinkCLIVersion value: 3.0.0 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d058dd151..ba53d7793 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -54,10 +54,8 @@ stages: displayName: Post-build Checks dependsOn: setupMaestroVars variables: - - name: InitialChannels - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'] ] - - name: PromoteToMaestroChannelId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'] ] + - name: TargetChannels + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] pool: vmImage: 'windows-2019' steps: @@ -65,7 +63,7 @@ stages: displayName: Maestro Channels Consistency inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 - arguments: -PromoteToChannels "$(InitialChannels)[$(PromoteToMaestroChannelId)]" + arguments: -PromoteToChannels "$(TargetChannels)" -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview2ChannelId}},${{parameters.Net5Preview3ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}} - job: diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 05e611edb..b3d29d449 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -5,7 +5,9 @@ jobs: - template: common-variables.yml - name: BuildId value: $[ coalesce(variables.BARBuildId, 0) ] - - name: PromoteToChannelId + - name: PromoteToMaestroChannels + value: $[ coalesce(variables.PromoteToChannelIds, 0) ] + - name: PromoteToMaestroChannel value: $[ coalesce(variables.PromoteToMaestroChannelId, 0) ] pool: vmImage: 'windows-2019' @@ -14,7 +16,7 @@ jobs: - task: DownloadBuildArtifacts@0 displayName: Download Release Configs - condition: eq(variables.PromoteToChannelId, 0) + condition: and(eq(variables.PromoteToMaestroChannels, 0), eq(variables.PromoteToMaestroChannel, 0)) inputs: buildType: current artifactName: ReleaseConfigs @@ -26,20 +28,16 @@ jobs: targetType: inline script: | try { - if ($Env:PromoteToChannelId -eq 0) { + if ($Env:PromoteToMaestroChannels -eq 0 -and $Env:PromoteToMaestroChannel -eq 0) { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - - $Channels = "" - $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } - + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId $AzureDevOpsBuildId = $Env:Build_BuildId - $PromoteToMaestroChannelId = 0 } else { $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" @@ -51,25 +49,23 @@ jobs: $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } $BarId = $Env:BARBuildId - $Channels = 'None' - - #TODO: Fix this once this issue is done: https://github.com/dotnet/arcade/issues/3834 - $IsStableBuild = 'False' + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels][$Env:PromoteToMaestroChannel]" + $IsStableBuild = $buildInfo.stable $AzureDevOpsProject = $buildInfo.azureDevOpsProject $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - $PromoteToMaestroChannelId = $Env:PromoteToMaestroChannelId } Write-Host "##vso[task.setvariable variable=BARBuildId;isOutput=true]$BarId" - Write-Host "##vso[task.setvariable variable=InitialChannels;isOutput=true]$Channels" + Write-Host "##vso[task.setvariable variable=TargetChannels;isOutput=true]$Channels" Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild" Write-Host "##vso[task.setvariable variable=AzDOProjectName;isOutput=true]$AzureDevOpsProject" Write-Host "##vso[task.setvariable variable=AzDOPipelineId;isOutput=true]$AzureDevOpsBuildDefinitionId" Write-Host "##vso[task.setvariable variable=AzDOBuildId;isOutput=true]$AzureDevOpsBuildId" - Write-Host "##vso[task.setvariable variable=PromoteToMaestroChannelId;isOutput=true]$PromoteToMaestroChannelId" } catch { Write-Host $_ diff --git a/global.json b/global.json index b24e47bcd..7f4ee8ae9 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20209.6", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20209.6" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20209.7", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20209.7" } } From 59f46632e373b9b267f50575c0133d7319e5a766 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Apr 2020 18:43:44 +0000 Subject: [PATCH 07/15] Update dependencies from https://github.com/dotnet/arcade build 20200410.1 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20210.1 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20210.1 --- eng/Version.Details.xml | 8 ++++---- eng/common/sdk-task.ps1 | 12 ++++++++++++ eng/common/templates/job/job.yml | 10 ++++++++++ eng/common/templates/post-build/post-build.yml | 15 ++++++++++++++- global.json | 4 ++-- 5 files changed, 42 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01ba73cb7..013a826e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 18ac1be0e3520e91b7a2332fe98dd4a8ebe47dbe + eead20d5a6a17bdf591efb3f8117c7af4079c668 - + https://github.com/dotnet/arcade - 18ac1be0e3520e91b7a2332fe98dd4a8ebe47dbe + eead20d5a6a17bdf591efb3f8117c7af4079c668 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 3872af59b..79c25e7f3 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -57,6 +57,18 @@ try { ExitWithExitCode 1 } + if( $msbuildEngine -eq "vs") { + # Ensure desktop MSBuild is available for sdk tasks. + if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) { + $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty + } + if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty + } + + InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + } + $taskProject = GetSdkTaskProject $task if (!(Test-Path $taskProject)) { Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 536c15c46..fc39647f4 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,6 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false + useBuildManifest: false mergeTestResults: false testRunTitle: $(AgentOsName)-$(BuildConfiguration)-xunit name: '' @@ -218,3 +219,12 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if eq(parameters.useBuildManifest, true) }}: + - task: PublishBuildArtifacts@1 + displayName: Publish Build Manifest + inputs: + PathToPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/manifest.props' + PublishLocation: Container + ArtifactName: BuildManifests + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ba53d7793..ee8f03d29 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -16,6 +16,7 @@ parameters: symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' signingValidationAdditionalParameters: '' + useBuildManifest: false # Which stages should finish execution before post-build stages start validateDependsOn: @@ -112,6 +113,16 @@ stages: pool: vmImage: 'windows-2019' steps: + - ${{ if eq(parameters.useBuildManifest, true) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download build manifest + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BuildManifests - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: @@ -134,11 +145,13 @@ stages: filePath: eng\common\enable-cross-org-publishing.ps1 arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. - task: PowerShell@2 displayName: Validate inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine dotnet + arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} diff --git a/global.json b/global.json index 7f4ee8ae9..f8f751083 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20209.7", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20209.7" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20210.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20210.1" } } From 7ee75f58f7688a35bdf65d568beed16d3fe896d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Apr 2020 13:54:49 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/arcade build 20200413.1 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.1 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 013a826e7..321fd61f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - eead20d5a6a17bdf591efb3f8117c7af4079c668 + 7b66c62a9d79d03c3f78d7658b36734c081d267f - + https://github.com/dotnet/arcade - eead20d5a6a17bdf591efb3f8117c7af4079c668 + 7b66c62a9d79d03c3f78d7658b36734c081d267f diff --git a/global.json b/global.json index f8f751083..5fd69e801 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20210.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20210.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.1" } } From 619c69ce65766d22e65ee3ddf9e39a3952809794 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Apr 2020 18:18:41 +0000 Subject: [PATCH 09/15] Update dependencies from https://github.com/dotnet/arcade build 20200413.3 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.3 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 321fd61f6..31f482004 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 7b66c62a9d79d03c3f78d7658b36734c081d267f + 8935804abfd6519052fa1ef87be9df011c317e24 - + https://github.com/dotnet/arcade - 7b66c62a9d79d03c3f78d7658b36734c081d267f + 8935804abfd6519052fa1ef87be9df011c317e24 diff --git a/global.json b/global.json index 5fd69e801..22c8ed1db 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.3" } } From 596a9f450a5e2656e20453abb53d2f39500292c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Apr 2020 21:05:32 +0000 Subject: [PATCH 10/15] Update dependencies from https://github.com/dotnet/arcade build 20200413.5 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.5 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.5 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31f482004..4c9a3130f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 8935804abfd6519052fa1ef87be9df011c317e24 + b155bde2e4e49695bc4eda8ffea35dc7fe39e4c3 - + https://github.com/dotnet/arcade - 8935804abfd6519052fa1ef87be9df011c317e24 + b155bde2e4e49695bc4eda8ffea35dc7fe39e4c3 diff --git a/global.json b/global.json index 22c8ed1db..3ca6ad9dd 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.5", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.5" } } From 8d8922f8cd1d813a01da6caaaa2d0860fd020514 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Apr 2020 22:15:51 +0000 Subject: [PATCH 11/15] Update dependencies from https://github.com/dotnet/arcade build 20200413.6 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.6 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20213.6 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c9a3130f..4b86206e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - b155bde2e4e49695bc4eda8ffea35dc7fe39e4c3 + 3443768880a95d33ae072643ab87a7ab1be015a3 - + https://github.com/dotnet/arcade - b155bde2e4e49695bc4eda8ffea35dc7fe39e4c3 + 3443768880a95d33ae072643ab87a7ab1be015a3 diff --git a/global.json b/global.json index 3ca6ad9dd..2b7c30828 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.5", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.5" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.6" } } From 73182fae5215a82ef82b2f7d3c3b332e2b2fcc73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Apr 2020 15:53:41 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/arcade build 20200414.1 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.1 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b86206e5..aeb41c38b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 3443768880a95d33ae072643ab87a7ab1be015a3 + 9f6847705aa5d5ba71e9653e20f14f8ec5eb639e - + https://github.com/dotnet/arcade - 3443768880a95d33ae072643ab87a7ab1be015a3 + 9f6847705aa5d5ba71e9653e20f14f8ec5eb639e diff --git a/global.json b/global.json index 2b7c30828..1c3ad348c 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20213.6", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20213.6" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.1" } } From de1fbe84c2a9aaf4a50425ea128ba60022d3d4ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Apr 2020 17:57:49 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/arcade build 20200414.3 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.3 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aeb41c38b..03be74774 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 9f6847705aa5d5ba71e9653e20f14f8ec5eb639e + 4945d6471ce54a0ed2abd90427db09a69a1f244e - + https://github.com/dotnet/arcade - 9f6847705aa5d5ba71e9653e20f14f8ec5eb639e + 4945d6471ce54a0ed2abd90427db09a69a1f244e diff --git a/global.json b/global.json index 1c3ad348c..447f0f780 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.3" } } From 4fd9eaf559a684318d47d50a6256c8421b21a5f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Apr 2020 21:46:32 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/arcade build 20200414.4 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.4 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03be74774..98c896f58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 4945d6471ce54a0ed2abd90427db09a69a1f244e + 147fb52b59819d861c76d820ee1732d00858f2e4 - + https://github.com/dotnet/arcade - 4945d6471ce54a0ed2abd90427db09a69a1f244e + 147fb52b59819d861c76d820ee1732d00858f2e4 diff --git a/global.json b/global.json index 447f0f780..0f082ae4b 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.4", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.4" } } From 1dcd8da9877c041becf92274f7d9974d2a99be4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Apr 2020 23:33:54 +0000 Subject: [PATCH 15/15] Update dependencies from https://github.com/dotnet/arcade build 20200414.6 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.6 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20207.4 -> 5.0.0-beta.20214.6 --- eng/Version.Details.xml | 8 ++++---- eng/common/build.ps1 | 10 ++++++++++ eng/common/build.sh | 13 +++++++++++++ global.json | 4 ++-- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98c896f58..58b3b3020 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 147fb52b59819d861c76d820ee1732d00858f2e4 + 5f64bc0c3daca8298b9bda02ee39da6e2eed8b03 - + https://github.com/dotnet/arcade - 147fb52b59819d861c76d820ee1732d00858f2e4 + 5f64bc0c3daca8298b9bda02ee39da6e2eed8b03 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 813d440d2..8db88fcc1 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -20,6 +20,7 @@ Param( [switch] $publish, [switch] $clean, [switch][Alias('bl')]$binaryLog, + [switch] $manifest, [switch] $ci, [switch] $prepareMachine, [switch] $help, @@ -61,6 +62,7 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -manifest Generates a build manifest, including signing metadata. Requires 'publish' also be specified." Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -100,6 +102,13 @@ function Build { $properties = $msbuildArgs } + if ($manifest) { + if (-not $publish) { + Write-Host "'-publish' is required if '-manifest' is specified." + ExitWithExitCode 1 + } + } + MSBuild $toolsetBuildProj ` $bl ` $platformArg ` @@ -116,6 +125,7 @@ function Build { /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` /p:Publish=$publish ` + /p:GenerateBuildManifest=$manifest ` @properties } diff --git a/eng/common/build.sh b/eng/common/build.sh index 36f9aa046..554706bb8 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -35,6 +35,7 @@ usage() echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo " --manifest Generates a build manifest, including signing metadata. Requires 'publish' also be specified." echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -64,6 +65,7 @@ sign=false public=false ci=false clean=false +manifest=false warn_as_error=true node_reuse=true @@ -146,6 +148,9 @@ while [[ $# > 0 ]]; do node_reuse=$2 shift ;; + -manifest) + manifest=true + ;; *) properties="$properties $1" ;; @@ -183,6 +188,13 @@ function Build { bl="/bl:\"$log_dir/Build.binlog\"" fi + if [[ "$manifest" == true ]]; then + if [[ ! "$publish" == true ]]; then + echo "'--publish' is required if '-manifest' is specified." + exit 0 + fi + fi + MSBuild $_InitializeToolset \ $bl \ /p:Configuration=$configuration \ @@ -196,6 +208,7 @@ function Build { /p:PerformanceTest=$performance_test \ /p:Sign=$sign \ /p:Publish=$publish \ + /p:GenerateBuildManifest=$manifest \ $properties ExitWithExitCode 0 diff --git a/global.json b/global.json index 0f082ae4b..af94e5247 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20214.6", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20214.6" } }