diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3d20a55cc24..d8b39a6250a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -75,25 +75,25 @@
-
+
https://github.com/dotnet/arcade
- 0c6a8fa272455f7f363d986d4077455353e5fe7c
+ 670231b2034b040c42af651d4c34d679784f0318
-
+
https://github.com/dotnet/arcade
- 0c6a8fa272455f7f363d986d4077455353e5fe7c
+ 670231b2034b040c42af651d4c34d679784f0318
-
+
https://github.com/dotnet/arcade
- 0c6a8fa272455f7f363d986d4077455353e5fe7c
+ 670231b2034b040c42af651d4c34d679784f0318
-
+
https://github.com/dotnet/arcade
- 0c6a8fa272455f7f363d986d4077455353e5fe7c
+ 670231b2034b040c42af651d4c34d679784f0318
-
+
https://github.com/dotnet/arcade
- 0c6a8fa272455f7f363d986d4077455353e5fe7c
+ 670231b2034b040c42af651d4c34d679784f0318
diff --git a/eng/Versions.props b/eng/Versions.props
index 1a865e2aea4..7f9dc300d9c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,9 +37,9 @@
- 7.0.0-beta.21553.3
- 7.0.0-beta.21553.3
- 7.0.0-beta.21553.3
+ 7.0.0-beta.21554.4
+ 7.0.0-beta.21554.4
+ 7.0.0-beta.21554.4
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index 5023d36dcb3..5cd5325d7b4 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -31,11 +31,6 @@ parameters:
# container and pool.
platform: {}
- # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
- # source-build builds run in Docker, including the default managed platform.
- defaultContainerHostPool:
- vmImage: ubuntu-20.04
-
jobs:
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
displayName: Source-Build (${{ parameters.platform.name }})
@@ -47,7 +42,15 @@ jobs:
container: ${{ parameters.platform.container }}
${{ if eq(parameters.platform.pool, '') }}:
- pool: ${{ parameters.defaultContainerHostPool }}
+ # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
+ # source-build builds run in Docker, including the default managed platform.
+ pool:
+ ${{ if eq(variables['System.TeamProject'], 'public') }}:
+ name: NetCore1ESPool-Public
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+ ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml
index ae85a99a853..4af724eb1a9 100644
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@@ -5,8 +5,6 @@ parameters:
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
- pool:
- vmImage: 'windows-2019'
condition: ''
dependsOn: ''
@@ -24,7 +22,13 @@ jobs:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: source-dot-net stage1 variables
- pool: ${{ parameters.pool }}
+ pool:
+ ${{ if eq(variables['System.TeamProject'], 'public') }}:
+ name: NetCore1ESPool-Public
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
+ ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+ name: NetCore1ESPool-Internal
+ demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- ${{ each preStep in parameters.preSteps }}:
- ${{ preStep }}
diff --git a/global.json b/global.json
index d7a7f5c4f44..8b52e92759d 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21553.3",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21553.3"
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21554.4",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21554.4"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"