diff --git a/NuGet.config b/NuGet.config index fcd7cf5e7c4..4fd546a0296 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 64e8d5a8358..bf3e7cd86c5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.4-servicing.26102.102 + 10.0.0-beta.26104.101 + 10.0.0-beta.26104.101 + 10.0.0-beta.26104.101 + 10.0.0-beta.26104.101 + 10.0.4-servicing.26104.101 10.0.4 - 10.0.4-servicing.26102.102 - 10.0.4-servicing.26102.102 + 10.0.4-servicing.26104.101 + 10.0.4-servicing.26104.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.4 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26102.102 + 10.0.4-servicing.26104.101 10.0.4 10.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d298e4ef50..6b3b41b7f0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 337271a70fe3313419232a25ca26f815aece50c1 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 0f90da2ccf0..7c30fc233fc 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26102.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26102.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26104.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26104.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {