Update dependencies from https://github.com/dotnet/arcade build 20200201.2 (#18751)
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20101.2 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20101.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20101.2
This commit is contained in:
parent
f798a68f2d
commit
5d7c96815a
|
|
@ -412,17 +412,17 @@
|
||||||
<Uri>https://github.com/dotnet/extensions</Uri>
|
<Uri>https://github.com/dotnet/extensions</Uri>
|
||||||
<Sha>275e691f7e575f208290d1cbb8cb450f4a3a85d6</Sha>
|
<Sha>275e691f7e575f208290d1cbb8cb450f4a3a85d6</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20074.6">
|
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20101.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
|
<Sha>779323758d3e8aa7e4ee3dc2619d57e696078089</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20074.6">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20101.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
|
<Sha>779323758d3e8aa7e4ee3dc2619d57e696078089</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20074.6">
|
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20101.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>841c83d8a5b8d8a6bd427f6798b086780138aa9a</Sha>
|
<Sha>779323758d3e8aa7e4ee3dc2619d57e696078089</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha.1.20079.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
|
<Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha.1.20079.1" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
|
||||||
<Uri>https://github.com/dotnet/extensions</Uri>
|
<Uri>https://github.com/dotnet/extensions</Uri>
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
-->
|
-->
|
||||||
<PropertyGroup Label="Automated">
|
<PropertyGroup Label="Automated">
|
||||||
<!-- Packages from dotnet/arcade -->
|
<!-- Packages from dotnet/arcade -->
|
||||||
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20074.6</MicrosoftDotNetGenAPIPackageVersion>
|
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20101.2</MicrosoftDotNetGenAPIPackageVersion>
|
||||||
<!-- Packages from dotnet/roslyn -->
|
<!-- Packages from dotnet/roslyn -->
|
||||||
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetPackageVersion>
|
<MicrosoftNetCompilersToolsetPackageVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetPackageVersion>
|
||||||
<!-- Packages from dotnet/core-setup -->
|
<!-- Packages from dotnet/core-setup -->
|
||||||
|
|
|
||||||
|
|
@ -175,6 +175,16 @@ function Build {
|
||||||
InitializeCustomToolset
|
InitializeCustomToolset
|
||||||
|
|
||||||
if [[ ! -z "$projects" ]]; then
|
if [[ ! -z "$projects" ]]; then
|
||||||
|
# Split project paths by semi-colon, find full-paths using readlink,
|
||||||
|
# finally and splice back as a semi-colon separated list
|
||||||
|
IFS=';' read -r -a projs <<< "$projects"
|
||||||
|
len=${#projs[@]}
|
||||||
|
for ((i=0; i<$len; i++));
|
||||||
|
do
|
||||||
|
projs[$i]=$(readlink -f "${projs[$i]}");
|
||||||
|
done
|
||||||
|
projects=$(IFS=\; ; echo "${projs[*]}")
|
||||||
|
echo Updated projects: $projects
|
||||||
properties="$properties /p:Projects=$projects"
|
properties="$properties /p:Projects=$projects"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,13 +24,15 @@ function InstallDarcCli ($darcVersion) {
|
||||||
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
|
$darcVersion = $(Invoke-WebRequest -Uri $versionEndpoint -UseBasicParsing).Content
|
||||||
}
|
}
|
||||||
|
|
||||||
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
|
$arcadeServicesSource = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
|
||||||
|
|
||||||
Write-Host "Installing Darc CLI version $darcVersion..."
|
Write-Host "Installing Darc CLI version $darcVersion..."
|
||||||
Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.'
|
Write-Host 'You may need to restart your command window if this is the first dotnet tool you have installed.'
|
||||||
if (-not $toolpath) {
|
if (-not $toolpath) {
|
||||||
|
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g"
|
||||||
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
|
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g
|
||||||
}else {
|
}else {
|
||||||
|
Write-Host "'$dotnet' tool install $darcCliPackageName --version $darcVersion --add-source '$arcadeServicesSource' -v $verbosity -g --tool-path '$toolpath'"
|
||||||
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
|
& "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ Param(
|
||||||
[Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
|
[Parameter(Mandatory=$true)][string] $gitHubPat, # GitHub personal access token from https://github.com/settings/tokens (no auth scopes needed)
|
||||||
[Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
|
[Parameter(Mandatory=$true)][string] $azdoPat, # Azure Dev Ops tokens from https://dev.azure.com/dnceng/_details/security/tokens (code read scope needed)
|
||||||
[Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created
|
[Parameter(Mandatory=$true)][string] $outputFolder, # Where the graphviz.txt file will be created
|
||||||
[string] $darcVersion = '1.1.0-beta.19175.6', # darc's version
|
[string] $darcVersion, # darc's version
|
||||||
[string] $graphvizVersion = '2.38', # GraphViz version
|
[string] $graphvizVersion = '2.38', # GraphViz version
|
||||||
[switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
|
[switch] $includeToolset # Whether the graph should include toolset dependencies or not. i.e. arcade, optimization. For more about
|
||||||
# toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
|
# toolset dependencies see https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#toolset-vs-product-dependencies
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ Param(
|
||||||
[string] $Branch=$env:BUILD_SOURCEBRANCH,
|
[string] $Branch=$env:BUILD_SOURCEBRANCH,
|
||||||
[string] $CommitSha=$env:BUILD_SOURCEVERSION,
|
[string] $CommitSha=$env:BUILD_SOURCEVERSION,
|
||||||
[string] $BuildNumber=$env:BUILD_BUILDNUMBER,
|
[string] $BuildNumber=$env:BUILD_BUILDNUMBER,
|
||||||
[string] $RunCategories="coreclr corefx",
|
[string] $RunCategories="Libraries Runtime",
|
||||||
[string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj",
|
[string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj",
|
||||||
[string] $Kind="micro",
|
[string] $Kind="micro",
|
||||||
[switch] $Internal,
|
[switch] $Internal,
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ build_number=$BUILD_BUILDNUMBER
|
||||||
internal=false
|
internal=false
|
||||||
compare=false
|
compare=false
|
||||||
kind="micro"
|
kind="micro"
|
||||||
run_categories="coreclr corefx"
|
run_categories="Libraries Runtime"
|
||||||
csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
|
csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
|
||||||
configurations=
|
configurations=
|
||||||
run_from_perf_repo=false
|
run_from_perf_repo=false
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ try {
|
||||||
ExitWithExitCode 1
|
ExitWithExitCode 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get info about which channels the build has already been promoted to
|
# Get info about which channel(s) the build has already been promoted to
|
||||||
$buildInfo = Get-MaestroBuild -BuildId $BuildId
|
$buildInfo = Get-MaestroBuild -BuildId $BuildId
|
||||||
|
|
||||||
if (!$buildInfo) {
|
if (!$buildInfo) {
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
parameters:
|
parameters:
|
||||||
|
enable: 'false' # Whether the SDL validation job should execute or not
|
||||||
overrideParameters: '' # Optional: to override values for parameters.
|
overrideParameters: '' # Optional: to override values for parameters.
|
||||||
additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
|
additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
|
||||||
# There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
|
# There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
|
||||||
|
|
@ -16,8 +17,15 @@ jobs:
|
||||||
- job: Run_SDL
|
- job: Run_SDL
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
displayName: Run SDL tool
|
displayName: Run SDL tool
|
||||||
|
condition: eq( ${{ parameters.enable }}, 'true')
|
||||||
variables:
|
variables:
|
||||||
- group: DotNet-VSTS-Bot
|
- group: DotNet-VSTS-Bot
|
||||||
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
pool:
|
pool:
|
||||||
name: Hosted VS2017
|
name: Hosted VS2017
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -28,14 +36,22 @@ jobs:
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Build Artifacts
|
displayName: Download Build Artifacts
|
||||||
inputs:
|
inputs:
|
||||||
buildType: current
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
artifactName: ${{ artifactName }}
|
artifactName: ${{ artifactName }}
|
||||||
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
|
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
|
||||||
- ${{ if eq(parameters.artifactNames, '') }}:
|
- ${{ if eq(parameters.artifactNames, '') }}:
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Build Artifacts
|
displayName: Download Build Artifacts
|
||||||
inputs:
|
inputs:
|
||||||
buildType: current
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
downloadType: specific files
|
downloadType: specific files
|
||||||
itemPattern: "**"
|
itemPattern: "**"
|
||||||
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
|
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
|
||||||
|
|
|
||||||
|
|
@ -23,9 +23,15 @@ stages:
|
||||||
- job: publish_symbols
|
- job: publish_symbols
|
||||||
displayName: Symbol Publishing
|
displayName: Symbol Publishing
|
||||||
dependsOn: setupMaestroVars
|
dependsOn: setupMaestroVars
|
||||||
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
|
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
|
||||||
variables:
|
variables:
|
||||||
- group: DotNet-Symbol-Server-Pats
|
- group: DotNet-Symbol-Server-Pats
|
||||||
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -33,7 +39,11 @@ stages:
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
inputs:
|
inputs:
|
||||||
buildType: 'current'
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
downloadType: 'specific'
|
downloadType: 'specific'
|
||||||
itemPattern: |
|
itemPattern: |
|
||||||
PDBArtifacts/**
|
PDBArtifacts/**
|
||||||
|
|
@ -79,7 +89,13 @@ stages:
|
||||||
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
|
||||||
- name: IsStableBuild
|
- name: IsStableBuild
|
||||||
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
|
||||||
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
|
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -87,7 +103,11 @@ stages:
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
inputs:
|
inputs:
|
||||||
buildType: 'current'
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
downloadType: 'specific'
|
downloadType: 'specific'
|
||||||
itemPattern: |
|
itemPattern: |
|
||||||
PackageArtifacts/**
|
PackageArtifacts/**
|
||||||
|
|
@ -146,6 +166,6 @@ stages:
|
||||||
StageLabel: '${{ parameters.stageName }}'
|
StageLabel: '${{ parameters.stageName }}'
|
||||||
JobLabel: 'AssetsPublishing'
|
JobLabel: 'AssetsPublishing'
|
||||||
|
|
||||||
- template: ../../steps/promote-build.yml
|
- template: ../../steps/add-build-to-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
ChannelId: ${{ parameters.channelId }}
|
ChannelId: ${{ parameters.channelId }}
|
||||||
|
|
|
||||||
|
|
@ -23,9 +23,15 @@ stages:
|
||||||
- job: publish_symbols
|
- job: publish_symbols
|
||||||
displayName: Symbol Publishing
|
displayName: Symbol Publishing
|
||||||
dependsOn: setupMaestroVars
|
dependsOn: setupMaestroVars
|
||||||
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} ))
|
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
|
||||||
variables:
|
variables:
|
||||||
- group: DotNet-Symbol-Server-Pats
|
- group: DotNet-Symbol-Server-Pats
|
||||||
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -33,7 +39,11 @@ stages:
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
inputs:
|
inputs:
|
||||||
buildType: 'current'
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
downloadType: 'specific'
|
downloadType: 'specific'
|
||||||
itemPattern: |
|
itemPattern: |
|
||||||
PDBArtifacts/**
|
PDBArtifacts/**
|
||||||
|
|
@ -78,7 +88,13 @@ stages:
|
||||||
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
|
||||||
- name: IsStableBuild
|
- name: IsStableBuild
|
||||||
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
|
||||||
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }}))
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
|
condition: or(contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )), eq(dependencies.setupMaestroVars.outputs['setReleaseVars.PromoteToMaestroChannelId'], ${{ parameters.channelId }}))
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -86,7 +102,11 @@ stages:
|
||||||
displayName: Download Build Assets
|
displayName: Download Build Assets
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
inputs:
|
inputs:
|
||||||
buildType: 'current'
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
downloadType: 'specific'
|
downloadType: 'specific'
|
||||||
itemPattern: |
|
itemPattern: |
|
||||||
PackageArtifacts/**
|
PackageArtifacts/**
|
||||||
|
|
@ -145,6 +165,6 @@ stages:
|
||||||
StageLabel: '${{ parameters.stageName }}'
|
StageLabel: '${{ parameters.stageName }}'
|
||||||
JobLabel: 'AssetsPublishing'
|
JobLabel: 'AssetsPublishing'
|
||||||
|
|
||||||
- template: ../../steps/promote-build.yml
|
- template: ../../steps/add-build-to-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
ChannelId: ${{ parameters.channelId }}
|
ChannelId: ${{ parameters.channelId }}
|
||||||
|
|
|
||||||
|
|
@ -26,17 +26,33 @@ stages:
|
||||||
- stage: Validate
|
- stage: Validate
|
||||||
dependsOn: ${{ parameters.validateDependsOn }}
|
dependsOn: ${{ parameters.validateDependsOn }}
|
||||||
displayName: Validate
|
displayName: Validate
|
||||||
|
variables:
|
||||||
|
- template: common-variables.yml
|
||||||
jobs:
|
jobs:
|
||||||
- ${{ if eq(parameters.enableNugetValidation, 'true') }}:
|
- template: setup-maestro-vars.yml
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
displayName: NuGet Validation
|
displayName: NuGet Validation
|
||||||
|
dependsOn: setupMaestroVars
|
||||||
|
condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
|
variables:
|
||||||
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
steps:
|
steps:
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Package Artifacts
|
displayName: Download Package Artifacts
|
||||||
inputs:
|
inputs:
|
||||||
buildType: current
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
artifactName: PackageArtifacts
|
artifactName: PackageArtifacts
|
||||||
|
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
|
|
@ -46,18 +62,29 @@ stages:
|
||||||
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
|
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
|
||||||
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
|
-ToolDestinationPath $(Agent.BuildDirectory)/Extract/
|
||||||
|
|
||||||
- ${{ if eq(parameters.enableSigningValidation, 'true') }}:
|
|
||||||
- job:
|
- job:
|
||||||
displayName: Signing Validation
|
displayName: Signing Validation
|
||||||
|
dependsOn: setupMaestroVars
|
||||||
|
condition: eq( ${{ parameters.enableSigningValidation }}, 'true')
|
||||||
variables:
|
variables:
|
||||||
- template: common-variables.yml
|
- template: common-variables.yml
|
||||||
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Package Artifacts
|
displayName: Download Package Artifacts
|
||||||
inputs:
|
inputs:
|
||||||
buildType: current
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
artifactName: PackageArtifacts
|
artifactName: PackageArtifacts
|
||||||
|
|
||||||
# This is necessary whenever we want to publish/restore to an AzDO private feed
|
# This is necessary whenever we want to publish/restore to an AzDO private feed
|
||||||
|
|
@ -86,18 +113,29 @@ stages:
|
||||||
StageLabel: 'Validation'
|
StageLabel: 'Validation'
|
||||||
JobLabel: 'Signing'
|
JobLabel: 'Signing'
|
||||||
|
|
||||||
- ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}:
|
|
||||||
- job:
|
- job:
|
||||||
displayName: SourceLink Validation
|
displayName: SourceLink Validation
|
||||||
|
dependsOn: setupMaestroVars
|
||||||
|
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
|
||||||
variables:
|
variables:
|
||||||
- template: common-variables.yml
|
- template: common-variables.yml
|
||||||
|
- name: AzDOProjectName
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
|
||||||
|
- name: AzDOPipelineId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
|
||||||
|
- name: AzDOBuildId
|
||||||
|
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Blob Artifacts
|
displayName: Download Blob Artifacts
|
||||||
inputs:
|
inputs:
|
||||||
buildType: current
|
buildType: specific
|
||||||
|
buildVersionToDownload: specific
|
||||||
|
project: $(AzDOProjectName)
|
||||||
|
pipeline: $(AzDOPipelineId)
|
||||||
|
buildId: $(AzDOBuildId)
|
||||||
artifactName: BlobArtifacts
|
artifactName: BlobArtifacts
|
||||||
|
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
|
|
@ -111,9 +149,10 @@ stages:
|
||||||
-SourcelinkCliVersion $(SourceLinkCLIVersion)
|
-SourcelinkCliVersion $(SourceLinkCLIVersion)
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
|
|
||||||
- ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}:
|
|
||||||
- template: /eng/common/templates/job/execute-sdl.yml
|
- template: /eng/common/templates/job/execute-sdl.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
enable: ${{ parameters.SDLValidationParameters.enable }}
|
||||||
|
dependsOn: setupMaestroVars
|
||||||
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
|
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
|
||||||
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
|
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
|
||||||
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
|
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
|
||||||
|
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
parameters:
|
|
||||||
ChannelId: 0
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
- job:
|
|
||||||
displayName: Promote Build
|
|
||||||
dependsOn: setupMaestroVars
|
|
||||||
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.ChannelId }}))
|
|
||||||
variables:
|
|
||||||
- name: BARBuildId
|
|
||||||
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
|
|
||||||
- name: ChannelId
|
|
||||||
value: ${{ parameters.ChannelId }}
|
|
||||||
pool:
|
|
||||||
vmImage: 'windows-2019'
|
|
||||||
steps:
|
|
||||||
- task: PowerShell@2
|
|
||||||
displayName: Add Build to Channel
|
|
||||||
inputs:
|
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1
|
|
||||||
arguments: -BuildId $(BARBuildId)
|
|
||||||
-ChannelId $(ChannelId)
|
|
||||||
-MaestroApiAccessToken $(MaestroApiAccessToken)
|
|
||||||
-MaestroApiEndPoint $(MaestroApiEndPoint)
|
|
||||||
-MaestroApiVersion $(MaestroApiVersion)
|
|
||||||
|
|
@ -1,6 +1,12 @@
|
||||||
jobs:
|
jobs:
|
||||||
- job: setupMaestroVars
|
- job: setupMaestroVars
|
||||||
displayName: Setup Maestro Vars
|
displayName: Setup Maestro Vars
|
||||||
|
variables:
|
||||||
|
- template: common-variables.yml
|
||||||
|
- name: BuildId
|
||||||
|
value: $[ coalesce(variables.BARBuildId, 0) ]
|
||||||
|
- name: PromoteToChannelId
|
||||||
|
value: $[ coalesce(variables.PromoteToMaestroChannelId, 0) ]
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-2019'
|
vmImage: 'windows-2019'
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -8,6 +14,7 @@ jobs:
|
||||||
|
|
||||||
- task: DownloadBuildArtifacts@0
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download Release Configs
|
displayName: Download Release Configs
|
||||||
|
condition: eq(variables.PromoteToChannelId, 0)
|
||||||
inputs:
|
inputs:
|
||||||
buildType: current
|
buildType: current
|
||||||
artifactName: ReleaseConfigs
|
artifactName: ReleaseConfigs
|
||||||
|
|
@ -19,6 +26,7 @@ jobs:
|
||||||
targetType: inline
|
targetType: inline
|
||||||
script: |
|
script: |
|
||||||
try {
|
try {
|
||||||
|
if ($Env:PromoteToChannelId -eq 0) {
|
||||||
$Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
|
$Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt
|
||||||
|
|
||||||
$BarId = $Content | Select -Index 0
|
$BarId = $Content | Select -Index 0
|
||||||
|
|
@ -28,9 +36,40 @@ jobs:
|
||||||
|
|
||||||
$IsStableBuild = $Content | Select -Index 2
|
$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}"
|
||||||
|
|
||||||
|
$apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]'
|
||||||
|
$apiHeaders.Add('Accept', 'application/json')
|
||||||
|
$apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}")
|
||||||
|
|
||||||
|
$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'
|
||||||
|
|
||||||
|
$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=BARBuildId;isOutput=true]$BarId"
|
||||||
Write-Host "##vso[task.setvariable variable=InitialChannels;isOutput=true]$Channels"
|
Write-Host "##vso[task.setvariable variable=InitialChannels;isOutput=true]$Channels"
|
||||||
Write-Host "##vso[task.setvariable variable=IsStableBuild;isOutput=true]$IsStableBuild"
|
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 {
|
catch {
|
||||||
Write-Host $_
|
Write-Host $_
|
||||||
|
|
@ -38,3 +77,5 @@ jobs:
|
||||||
Write-Host $_.ScriptStackTrace
|
Write-Host $_.ScriptStackTrace
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
env:
|
||||||
|
MAESTRO_API_TOKEN: $(MaestroApiAccessToken)
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ steps:
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: Add Build to Channel
|
displayName: Add Build to Channel
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/promote-build.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1
|
||||||
arguments: -BuildId $(BARBuildId)
|
arguments: -BuildId $(BARBuildId)
|
||||||
-ChannelId ${{ parameters.ChannelId }}
|
-ChannelId ${{ parameters.ChannelId }}
|
||||||
-MaestroApiAccessToken $(MaestroApiAccessToken)
|
-MaestroApiAccessToken $(MaestroApiAccessToken)
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Yarn.MSBuild": "1.15.2",
|
"Yarn.MSBuild": "1.15.2",
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20074.6",
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20101.2",
|
||||||
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20074.6"
|
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20101.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue