From 206fddaeca0c6f00772fd19858d05fff536e0cdb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 25 Jan 2022 13:52:23 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20220124.13 (#5985)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++-----
eng/Versions.props | 6 +--
eng/common/templates/job/execute-sdl.yml | 10 ++++-
eng/common/templates/job/onelocbuild.yml | 19 ++++++---
eng/common/templates/jobs/jobs.yml | 10 ++++-
.../templates/post-build/post-build.yml | 42 +++++++++++++++----
.../post-build/setup-maestro-vars.yml | 1 +
global.json | 4 +-
8 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 179d68de5..336bb2053 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
+ b6483cac5832aa5207692517f9a49ce1741a3041
-
+
https://github.com/dotnet/arcade
- e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
+ b6483cac5832aa5207692517f9a49ce1741a3041
-
+
https://github.com/dotnet/arcade
- e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
+ b6483cac5832aa5207692517f9a49ce1741a3041
-
+
https://github.com/dotnet/arcade
- e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
+ b6483cac5832aa5207692517f9a49ce1741a3041
-
+
https://github.com/dotnet/arcade
- e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
+ b6483cac5832aa5207692517f9a49ce1741a3041
diff --git a/eng/Versions.props b/eng/Versions.props
index d5f655da0..9cb10e6a1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,9 +37,9 @@
- 7.0.0-beta.22071.6
- 7.0.0-beta.22071.6
- 7.0.0-beta.22071.6
+ 7.0.0-beta.22074.13
+ 7.0.0-beta.22074.13
+ 7.0.0-beta.22074.13
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index a4837c32c..24cec0424 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -47,8 +47,14 @@ jobs:
- name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- checkout: self
clean: true
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index 0b93fd5b4..9d1e3042d 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -3,10 +3,8 @@ parameters:
dependsOn: ''
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
- pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
-
+ pool: ''
+
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
@@ -32,7 +30,18 @@ jobs:
displayName: OneLocBuild
- pool: ${{ parameters.pool }}
+ ${{ if ne(parameters.pool, '') }}:
+ pool: ${{ parameters.pool }}
+ ${{ if eq(parameters.pool, '') }}:
+ pool:
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
variables:
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index dafa603dc..554e71cfc 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -83,8 +83,14 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 9583d27db..2f176571f 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -94,8 +94,14 @@ stages:
displayName: NuGet Validation
condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
@@ -125,8 +131,14 @@ stages:
displayName: Signing Validation
condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
parameters:
@@ -179,8 +191,14 @@ stages:
displayName: SourceLink Validation
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
parameters:
@@ -230,14 +248,22 @@ stages:
displayName: Publish Using Darc
timeoutInMinutes: 120
pool:
- name: NetCore1ESPool-Internal
- demands: ImageOverride -equals Build.Server.Amd64.VS2019
+ # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+ name: VSEngSS-MicroBuild2022-1ES
+ demands: Cmd
+ # If it's not devdiv, it's dnceng
+ ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- template: setup-maestro-vars.yml
parameters:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
+ - task: NuGetAuthenticate@0
+
- task: PowerShell@2
displayName: Publish Using Darc
inputs:
diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml
index 826d3ed5f..0c87f149a 100644
--- a/eng/common/templates/post-build/setup-maestro-vars.yml
+++ b/eng/common/templates/post-build/setup-maestro-vars.yml
@@ -16,6 +16,7 @@ steps:
displayName: Set Release Configs Vars
inputs:
targetType: inline
+ pwsh: true
script: |
try {
if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
diff --git a/global.json b/global.json
index 595eae6cf..b7ab09ba2 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22071.6",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22071.6"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22074.13",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22074.13"
},
"sdk": {
"version": "7.0.100-alpha.1.22053.1"
--
GitLab