diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a33f0adc1e59..c7560d072e46 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -273,7 +273,7 @@ extends: name: Azure Pipelines image: macOS-latest os: macOS - helixTargetQueue: osx.13.amd64 + helixTargetQueue: osx.15.amd64 oneESCompat: templateFolderName: templates-official publishTaskPrefix: 1ES. diff --git a/.vsts-pr.yml b/.vsts-pr.yml index f325d966f28a..290fb18f8860 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -57,7 +57,7 @@ stages: name: Azure Pipelines vmImage: macOS-latest os: macOS - helixTargetQueue: osx.13.amd64.open + helixTargetQueue: osx.15.amd64.open ############### SOURCE BUILD ############### - template: /eng/common/templates/job/source-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..051401ba0fa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 + 16c380d1ce5fa0b24e232251c31cb013bbf3365f diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..5deac64e28a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 13 + 14 diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 713a2bab116f..e6e916381d5a 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -49,7 +49,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") .And.NotHaveStdErrContaining("warning") - .And.NotHaveStdOutContaining("warning"); + .And.NotHaveStdOutContaining("warning", new[] { "ld: warning: -ld_classic is deprecated and will be removed in a future release" }); var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework); var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"];