From a63556c19905333fae27998a2d10eb8ab2e12eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 12 Dec 2025 19:02:37 +0100 Subject: [PATCH 1/2] Bump to macos-14 build image (#1517) (cherry picked from commit 5cc4180040d3ca67a7070e2a439ee6ffa1c58562) --- eng/azure-pipelines-public.yml | 2 +- eng/azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/azure-pipelines-public.yml b/eng/azure-pipelines-public.yml index a170ef82bf..3c08f565d9 100644 --- a/eng/azure-pipelines-public.yml +++ b/eng/azure-pipelines-public.yml @@ -37,7 +37,7 @@ stages: displayName: macOS timeoutInMinutes: 120 pool: - vmImage: macOS-13 + vmImage: macOS-14 strategy: matrix: x64: diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index bb175816e9..cad887a88f 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -15,7 +15,7 @@ variables: - name: WindowsImage value: windows.vs2022.amd64 - name: MacImage - value: macOS-13 + value: macOS-14 - name: CheckNuGetSizesScript value: >- $nupkgs_large=(Get-ChildItem artifacts/packages/$(_BuildConfig)/Shipping -recurse -include "*.nupkg" | Select-Object Name,Length | Where-Object { $_.Length -gt 250*1MB }); From da7afc4a474321285376824845554c836e14def5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Dec 2025 19:06:20 +0100 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20251127.5 (#1515) On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.25562.4 -> To Version 9.0.0-beta.25577.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 +++++++++---------- eng/Versions.props | 8 ++--- .../core-templates/job/source-build.yml | 2 +- .../core-templates/steps/source-build.yml | 2 +- global.json | 4 +-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adc14289f0..8cfcc18317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,38 +207,38 @@ https://github.com/dotnet/llvm-project 55fbf5793d3f255f5525ae7cb57736ab71270a52 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 + 0890ca08513391dafe556fb326c73c6c5c6cb329 diff --git a/eng/Versions.props b/eng/Versions.props index cdf0a77988..6e8c7b3697 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,10 +51,10 @@ release - 9.0.0-beta.25562.4 - 9.0.0-beta.25562.4 - 9.0.0-beta.25562.4 - 9.0.0-beta.25562.4 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 1.1.87-gba258badda diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 5baedac1e0..1037ccedcb 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -65,7 +65,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ 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: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 0718e4ba90..7846584d2a 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -41,7 +41,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 78c4cb0594..4449b6f30c 100644 --- a/global.json +++ b/global.json @@ -6,8 +6,8 @@ "dotnet": "9.0.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25562.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25562.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5", "Microsoft.Build.Traversal": "3.4.0" } }