diff --git a/NuGet.config b/NuGet.config index b97189fecfa..fdae8114cd4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e90d9780382..2ec23a84845 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26109.113 - 10.0.0-beta.26109.113 - 10.0.0-beta.26109.113 + 10.0.0-beta.26110.106 + 10.0.0-beta.26110.106 + 10.0.0-beta.26110.106 10.0.4 10.0.4 10.0.4 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26109.113 + 10.0.4-servicing.26110.106 10.0.4 10.0.4 - 10.0.4-servicing.26109.113 + 10.0.4-servicing.26110.106 10.0.4 10.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cb233d7642..e555543d608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 - + https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 - + https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 - + https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 - + https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 - + https://github.com/dotnet/dotnet - 77682011166986a06fe5ad024536202551c1db39 + 36281576f371e437e9fafe7ac0732979a2c2ba30 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 4cb769473f7..1997c2ae00d 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,19 +60,19 @@ 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 Azure-Linux-3-Amd64-Public + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ 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 + image: build.azurelinux.3.amd64 os: linux ${{ else }}: 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 Azure-Linux-3-Amd64-Public + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ 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 Azure-Linux-3-Amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index a2ff1f049e8..8480ab1192c 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26109.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26109.113" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26110.106" } }