diff --git a/NuGet.config b/NuGet.config index 3aa7c0a506097f..08dc60061e2a4b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + - 5.0.0-2.26102.102 - 5.0.0-2.26102.102 - 5.0.0-2.26102.102 + 5.0.0-2.26110.124 + 5.0.0-2.26110.124 + 5.0.0-2.26110.124 10.0.104 10.0.104 - 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.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 0.11.5-alpha.26102.102 - 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.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 10.0.0-beta.26102.102 - 2.9.3-beta.26102.102 - 2.9.3-beta.26102.102 - 10.0.0-beta.26102.102 - 5.0.0-2.26102.102 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 0.11.5-alpha.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 10.0.0-beta.26110.124 + 2.9.3-beta.26110.124 + 2.9.3-beta.26110.124 + 10.0.0-beta.26110.124 + 5.0.0-2.26110.124 10.0.4 - 10.0.104-servicing.26102.102 + 10.0.104-servicing.26110.124 10.0.4 10.0.4 - 7.0.2-rc.10302 - 7.0.2-rc.10302 - 7.0.2-rc.10302 - 7.0.2-rc.10302 + 7.0.2-rc.11124 + 7.0.2-rc.11124 + 7.0.2-rc.11124 + 7.0.2-rc.11124 10.0.4 2.0.4 10.0.4 @@ -109,14 +109,14 @@ This file should be imported by eng/Versions.props 10.0.0-alpha.0.25479.2 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 - 10.0.0-alpha.1.26076.1 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 + 10.0.0-alpha.1.26104.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c9a655245d185..771770c09da4b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -43,89 +43,89 @@ https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/runtime-assets @@ -265,31 +265,31 @@ https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 31e0b8e08f57890f7b7004b93361d69cd4b21079 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 3910cd6230be3d4d283edd6a52bff27f549dd675 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,53 +365,53 @@ - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/dotnet - 52be957329989783be8d83769123a17e3c251da0 + 9d0c3bebf9d368ad51c0b9a7b954219d192cd9d6 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 - + https://github.com/dotnet/node - da47e69a0a26e9564cdeb2d2891ee96edbc9f07a + b5b12333513e92a6b5bfbdf6db94667a6cc99cc1 https://github.com/dotnet/runtime-assets diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad036a..1997c2ae00d76a 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 build.ubuntu.2004.amd64 + 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 Build.Ubuntu.2204.Amd64.Open + 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 Build.Ubuntu.2204.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 4eddf903942622..d14a6ab17e0a0f 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "10.0.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26102.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26102.102", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.26102.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.124", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26110.124", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.26110.124", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.4"