diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a317f836..161797e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 - + https://github.com/dotnet/arcade - 8425453874961a7d7d2379e3f39c104f9ad0a0bd + 8e2ccde11b70936d8254669a4a74653c580a1340 https://github.com/dotnet/arcade-services diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 4af724eb..c2d51098 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -7,6 +7,7 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog condition: '' dependsOn: '' + pool: '' jobs: - job: SourceIndexStage1 @@ -22,13 +23,17 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables - 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 + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(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 f4428f79..63b45f79 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22218.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22220.6" } }