From ec797e5b5b8af6ddefb00ec96a898259620f12ef Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 28 Jul 2023 18:51:38 +0000 Subject: [PATCH 1/5] Use latest ILC to AOT-compile ILC --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 2 ++ src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06d9e1d4f9757b..f6907ddbc1b533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -314,6 +314,10 @@ https://github.com/dotnet/runtime 5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c + + https://github.com/dotnet/runtime + 5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c + https://github.com/dotnet/xharness 915e9ec9a3ab13c70da8286ddb9a5c238a22d98e diff --git a/eng/Versions.props b/eng/Versions.props index bc9bfb96e1f388..5fbfdce0e3562c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,6 +212,8 @@ 8.0.0-rc.1.23374.1 0.11.4-alpha.23374.2 + + 8.0.0-rc.1.23374.1 8.0.0-rc.1.23377.1 diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj index 564a02b632bfbd..4b453e85ca3592 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj @@ -19,8 +19,12 @@ true true true + true + + + Date: Sat, 29 Jul 2023 00:05:02 +0000 Subject: [PATCH 2/5] Try to fix cross-builds --- src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj index 4b453e85ca3592..7122c81034ff31 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj @@ -20,10 +20,16 @@ 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 + From a35b3b8779d8d4574ee65b5727bee205fa63c271 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 28 Jul 2023 17:05:13 -0700 Subject: [PATCH 3/5] Update eng/Version.Details.xml Co-authored-by: Jeremy Koritzinsky --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6907ddbc1b533..d5578ce06884db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -314,7 +314,7 @@ https://github.com/dotnet/runtime 5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c - + https://github.com/dotnet/runtime 5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c From 5cfb2f7bbc287642f47c823a5f21b1dfc2490943 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Mon, 31 Jul 2023 11:53:43 -0700 Subject: [PATCH 4/5] Switch to macOS 12 pool --- eng/pipelines/common/xplat-setup.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 From ee8c5e3bb28d8b3dd1810e49b8c09bb7f6803593 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Tue, 1 Aug 2023 00:56:38 +0000 Subject: [PATCH 5/5] Update helix queues for osx-arm64 run --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 2 +- eng/pipelines/libraries/helix-queues-setup.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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') }}: