Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .vsts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>
<!-- Repo Version Information -->
<PropertyGroup>
<VersionPrefix>8.0.123</VersionPrefix>
<VersionPrefix>8.0.124</VersionPrefix>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
Loading