diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1af3d83470e76..d412e985e50583 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -314,6 +314,10 @@ https://github.com/dotnet/runtime 8470b87bcb366cc06486c6f7aa23ae6de3259eba + + https://github.com/dotnet/runtime + 5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c + https://github.com/dotnet/xharness 437aa378e900dbfd179b5552e71b81bc99e1e746 diff --git a/eng/Versions.props b/eng/Versions.props index 442a8e44ae08aa..153d05421d1a16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,6 +212,8 @@ 8.0.0-rc.1.23381.1 0.11.4-alpha.23374.2 + + 8.0.0-rc.1.23374.1 8.0.0-rc.1.23377.1 diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index b56f65ef76ce52..cf9ba83ac47334 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -147,11 +147,8 @@ jobs: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal. - ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}: - vmImage: 'macos-11' - - ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: + # OSX Build Pool (we don't have on-prem OSX BuildPool). + ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}: vmImage: 'macos-12' # Official Build Windows Pool diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 88ac4511df658b..e264588ee78c91 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -56,7 +56,7 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - OSX.1200.Amd64.Iphone.Open + - OSX.13.Amd64.Iphone.Open # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 49115a447951c9..72d8d53cd94ddd 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -113,7 +113,7 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - OSX.1200.Amd64.Iphone.Open + - OSX.13.Amd64.Iphone.Open # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj index 564a02b632bfbd..7122c81034ff31 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj @@ -19,8 +19,18 @@ true true true + true + + <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')))) + <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1)))) + <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant) + <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler + + + +