diff --git a/NuGet.config b/NuGet.config
index 67c3b97e8..a9d212f77 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,20 +8,27 @@
+
+
+
+
-
+
+
+
+
@@ -42,16 +49,21 @@
+
+
-
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index eab44951d..4ebd2b87a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
-
+
https://github.com/dotnet/arcade
- e438144bbffb29ed5d7c113dc4947b51650344dc
+ bd9b4590681e602535ed414e98a17e6ba121dca4
-
+
https://github.com/dotnet/arcade
- e438144bbffb29ed5d7c113dc4947b51650344dc
+ bd9b4590681e602535ed414e98a17e6ba121dca4
-
+
https://github.com/dotnet/arcade
- e438144bbffb29ed5d7c113dc4947b51650344dc
+ bd9b4590681e602535ed414e98a17e6ba121dca4
https://github.com/dotnet/source-build-reference-packages
diff --git a/eng/Versions.props b/eng/Versions.props
index 8700722af..bec80a72c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
- 6.0.0-beta.24176.9
+ 6.0.0-beta.24204.4
diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml
index e0e9a4bc5..08df56375 100644
--- a/eng/common/templates-official/job/onelocbuild.yml
+++ b/eng/common/templates-official/job/onelocbuild.yml
@@ -43,7 +43,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
variables:
diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml
index 96be5e6e1..f5fa09f41 100644
--- a/eng/common/templates-official/job/source-build.yml
+++ b/eng/common/templates-official/job/source-build.yml
@@ -50,7 +50,7 @@ jobs:
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-mariner-2-pt
+ image: 1es-mariner-2
os: linux
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml
index 3d8b0b966..e96ec3cbe 100644
--- a/eng/common/templates-official/job/source-index-stage1.yml
+++ b/eng/common/templates-official/job/source-index-stage1.yml
@@ -7,7 +7,7 @@ parameters:
binlogPath: artifacts/log/Debug/Build.binlog
pool:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
condition: ''
dependsOn: ''
diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml
index 669ccd48f..c124aa995 100644
--- a/eng/common/templates-official/jobs/jobs.yml
+++ b/eng/common/templates-official/jobs/jobs.yml
@@ -92,7 +92,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
runAsPublic: ${{ parameters.runAsPublic }}
diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml
index 96048b1ba..fce0d0bf5 100644
--- a/eng/common/templates-official/post-build/post-build.yml
+++ b/eng/common/templates-official/post-build/post-build.yml
@@ -103,7 +103,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
@@ -143,7 +143,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
@@ -206,7 +206,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
@@ -258,7 +258,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Svc-Internal
- image: 1es-windows-2022-pt
+ image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml
index babc2757d..12527b80e 100644
--- a/eng/common/templates-official/steps/component-governance.yml
+++ b/eng/common/templates-official/steps/component-governance.yml
@@ -3,7 +3,7 @@ parameters:
steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+ - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml
index babc2757d..12527b80e 100644
--- a/eng/common/templates/steps/component-governance.yml
+++ b/eng/common/templates/steps/component-governance.yml
@@ -3,7 +3,7 @@ parameters:
steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
+ - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
diff --git a/global.json b/global.json
index dd968ea93..ab4fa5d59 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.24176.9",
- "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24176.9"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
+ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24204.4"
}
}