diff --git a/.vsts-ci.yml b/.vsts-ci.yml index df58ec2eb3aa..a97bb95ae13c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -202,9 +202,9 @@ extends: image: macOS-latest os: macOS ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.15.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.15.Amd64 variables: - name: _BuildConfig value: Release diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 783d97e908ab..cde01569a074 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -52,10 +52,10 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: 'windows-2019' + vmImage: 'windows-2022' ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration @@ -119,10 +119,10 @@ stages: agentOs: Windows_NT_TestAsTools pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: 'windows-2019' + vmImage: 'windows-2022' ${{ if ne(variables['System.TeamProject'], 'public') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 strategy: matrix: Build_Debug: @@ -157,9 +157,9 @@ stages: pool: vmImage: 'macOS-latest' ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.15.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.15.Amd64 strategy: matrix: Build_Release: diff --git a/eng/Versions.props b/eng/Versions.props index 542ad0071292..4f304e8beda2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.123 + 8.0.124 true release diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 352421de7803..5c3682cf801c 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -48,7 +48,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"];