From d65a31030384e89dabb05a2496306c685c3b4017 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 00:17:14 +0000 Subject: [PATCH 1/7] Merged PR 46811: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319 - **Build**: 20250116.9 - **Date Produced**: January 16, 2025 11:17:27 PM UTC - **Commit**: eba546b0f0d448e0176a2222548fd7a2fbf464c0 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.3][2] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][1] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.12 to 8.0.13][1] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.12 to 8.0.13][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.12 to 8.0.13][1] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.12 to 8.0.13][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.12 to 8.0.13][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][1] - **Microsoft.NETCore.Platforms**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) --- NuGet.config | 10 ++++++++-- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3990b0eb030f..afc198e5e145 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,12 @@ + + + - + @@ -30,10 +33,13 @@ + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef77de844478..5300a76cb8e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -137,9 +137,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://github.com/dotnet/source-build-externals @@ -275,17 +275,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -316,22 +316,22 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 836a56d5ca03..d571a4ec4a42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12-servicing.24603.5 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13-servicing.25066.9 8.0.0 8.0.1 8.0.0 @@ -93,11 +93,11 @@ 8.0.0 8.0.0 8.0.0 - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.9 8.0.1 8.0.1 8.0.1 - 8.0.2 + 8.0.3 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.9 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.9 - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.9 8.0.0 8.0.1 From 009e1ccafde4086ea52999e878f6e7aa5a7c4ccf Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 06:05:49 +0000 Subject: [PATCH 2/7] Merged PR 46821: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e179a2a7-bc5d-4498-2467-08dbd53ba9ce - **Build**: 20250116.4 - **Date Produced**: January 17, 2025 1:15:08 AM UTC - **Commit**: 1bdfaaeddf567214d363aa2396fd4874abf204cc - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.12 to 8.0.13][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 8.0.12 to 8.0.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC10196376f4843cbbf180ec6ab2ce7d34ceec2fab&targetVersion=GC1bdfaaeddf567214d363aa2396fd4874abf204cc&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index afc198e5e145..fc0223c67220 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,7 @@ - - - - + @@ -33,10 +30,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5300a76cb8e0..c65d291b0c2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 10196376f4843cbbf180ec6ab2ce7d34ceec2fab + 1bdfaaeddf567214d363aa2396fd4874abf204cc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d571a4ec4a42..6f7e8ca85634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,14 +143,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 - 8.0.12 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 + 8.0.13 4.8.0-7.24574.2 4.8.0-7.24574.2 From cb1b8b96159035141b7d523895e0bda1746a9f7d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 11 Feb 2025 13:51:28 -0800 Subject: [PATCH 3/7] Update baseline, SDK, nuget.config --- NuGet.config | 2 - eng/Baseline.Designer.props | 474 ++++++++++++++++++------------------ eng/Baseline.xml | 212 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 +- 5 files changed, 346 insertions(+), 348 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc0223c67220..a58bd9272df2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 9db2ec00437b..af5cc98a0d47 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -120,138 +120,138 @@ - 8.0.12 + 8.0.13 - - + + - - + + - - + + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - - - + + + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + @@ -259,83 +259,83 @@ - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - + - + - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - - + + - + - - + + - + - - + + - + @@ -343,58 +343,58 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 @@ -403,7 +403,7 @@ - 8.0.12 + 8.0.13 @@ -411,71 +411,71 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - - + + - - + + - - + + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 @@ -491,27 +491,27 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 @@ -520,79 +520,79 @@ - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - - + + - - + + - 8.0.12 + 8.0.13 - - + + - - + + - - + + - - + + @@ -600,83 +600,83 @@ - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - - - - + + + + - 8.0.12 + 8.0.13 @@ -685,64 +685,64 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -764,29 +764,29 @@ - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 @@ -802,48 +802,48 @@ - 8.0.12 + 8.0.13 - + - + - + - + - + - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - - + + + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -853,7 +853,7 @@ - 8.0.12 + 8.0.13 @@ -862,79 +862,79 @@ - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - + - + - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + @@ -943,7 +943,7 @@ - + @@ -951,17 +951,17 @@ - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -979,18 +979,18 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 7de065eab47a..9efbb290ef60 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index d85a8c86a629..f5d9b4c5daed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 14 - false + true 7.1.2 7.* - - From 125dbaeca7976b0058e9709becb62b1aa940c2ab Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 14:53:10 -0800 Subject: [PATCH 5/7] Update to mac 15 --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index fbe60b3e7964..124223ed17bf 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -106,7 +106,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-13 + vmImage: macOS-15 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: vmImage: ubuntu-20.04 @@ -320,7 +320,7 @@ jobs: pool: ${{ if eq(parameters.agentOs, 'macOS') }}: name: Azure Pipelines - image: macOS-13 + image: macOS-15 os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) From b7c2eef2e2caf5f021b814a3500c0a96cab7f0d3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 15:07:57 -0800 Subject: [PATCH 6/7] Update macOS build to use XCode 16.1.0 --- .azure/pipelines/jobs/default-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 124223ed17bf..e82181c651aa 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -164,8 +164,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer - displayName: Use XCode 15.2.0 + - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer + displayName: Use XCode 16.1.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -382,8 +382,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer - displayName: Use XCode 15.2.0 + - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer + displayName: Use XCode 16.1.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: From c6dbf8cb6a07923e2858b0220497721bd1a52a2d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 16:43:49 -0800 Subject: [PATCH 7/7] Update macOS image and XCode version --- .azure/pipelines/jobs/default-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index e82181c651aa..fbe60b3e7964 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -106,7 +106,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-15 + vmImage: macOS-13 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: vmImage: ubuntu-20.04 @@ -164,8 +164,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer - displayName: Use XCode 16.1.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -320,7 +320,7 @@ jobs: pool: ${{ if eq(parameters.agentOs, 'macOS') }}: name: Azure Pipelines - image: macOS-15 + image: macOS-13 os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) @@ -382,8 +382,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer - displayName: Use XCode 16.1.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: