diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 202b5f6692b..bb59c782c5a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -24,8 +24,8 @@ This file should be imported by eng/Versions.props 10.0.1 10.0.1 - 10.0.0-beta.26066.3 - 10.0.0-beta.26066.3 + 10.0.0-beta.26080.4 + 10.0.0-beta.26080.4 7.4.0-rc.18 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 558ef529098..6ee98b49be9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -106,9 +106,9 @@ - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 https://github.com/nuget/nuget.client @@ -118,9 +118,9 @@ https://github.com/dotnet/roslyn bdf7c2666c7f3fe949f9f591272b23decf6d6be8 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad0..4cb769473f7 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,7 +60,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals Azure-Linux-3-Amd64-Public ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] image: Azure-Linux-3-Amd64 @@ -69,10 +69,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + demands: ImageOverride -equals Azure-Linux-3-Amd64-Public ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 + demands: ImageOverride -equals Azure-Linux-3-Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index 51cb65efcf4..fcc32e90e26 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ "xcopy-msbuild": "18.0.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26066.3" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.4" } }