diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 442f99b01..ecab8f9f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f4bb3872c..6e8ab2e83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22102.3 + 6.0.0-beta.22107.2 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5023d36dc..5cd5325d7 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/global.json b/global.json index 641ac3ef3..8d9bc761f 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.22102.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22102.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22107.2" } }