From 3a49af80627ea59ef7974ece94f38690366d0bd0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 10 Nov 2021 19:49:57 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20211108.5 (#12630)
[release/6.0.1xx] Update dependencies from dotnet/arcade
---
NuGet.config | 22 -------------------
eng/Version.Details.xml | 12 +++++-----
eng/Versions.props | 2 +-
eng/common/templates/job/execute-sdl.yml | 2 +-
eng/common/templates/job/onelocbuild.yml | 2 +-
.../templates/job/source-index-stage1.yml | 2 +-
eng/common/templates/jobs/jobs.yml | 4 ++--
global.json | 4 ++--
8 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index de42f9ad5..b995dca0c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,38 +7,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6dfe53685..99237e507 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
-
+
https://github.com/dotnet/arcade
- 85f3aa16d8797b5020f1fda11df1a958feb5f8df
+ 8ebefe290f57089d60100465111e78f223ee91db
https://github.com/dotnet/source-build-reference-packages
diff --git a/eng/Versions.props b/eng/Versions.props
index b0eda23fd..d29adc000 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
- 6.0.0-beta.21519.3
+ 6.0.0-beta.21558.5
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 69eb67849..4882dd931 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -62,7 +62,7 @@ jobs:
pool:
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
- name: Hosted VS2017
+ vmImage: windows-2019
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
vmImage: windows-2019
steps:
diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml
index e8bc77d2e..2b55a567f 100644
--- a/eng/common/templates/job/onelocbuild.yml
+++ b/eng/common/templates/job/onelocbuild.yml
@@ -4,7 +4,7 @@ parameters:
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index 1cc0c29e4..d8990549e 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -6,7 +6,7 @@ parameters:
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
condition: ''
dependsOn: ''
diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml
index a1f8fce96..90015a7e5 100644
--- a/eng/common/templates/jobs/jobs.yml
+++ b/eng/common/templates/jobs/jobs.yml
@@ -83,7 +83,7 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
dependsOn:
- Asset_Registry_Publish
pool:
- vmImage: vs2017-win2016
+ vmImage: windows-2019
diff --git a/global.json b/global.json
index 4f5a20ba8..4e1426906 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3",
- "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21519.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21558.5",
+ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21558.5"
}
}