未验证 提交 a6d10a50 编写于 作者: S Sven Boemer 提交者: GitHub

Use latest ILC to AOT-compile ILC (#89655)

We need to build with a recent enough ILC that has the fix from
b78345e5. This sets up a
dependency on the runtime -> runtime package flow to build using
the latest ILC package.

The macOS builds have been updated to machines with XCode 14 that
is required to link against nativeaot framework libraries that
were built using XCode 14 on the official build machines.
---------
Co-authored-by: NJeremy Koritzinsky <jkoritzinsky@gmail.com>
上级 b5834a0b
......@@ -314,6 +314,10 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
......
......@@ -212,6 +212,8 @@
<MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
<!-- Mono Cecil -->
<MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
<!-- ILCompiler -->
<MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
......
......@@ -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
......
......@@ -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') }}:
......
......@@ -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') }}:
......
......@@ -19,8 +19,18 @@
<PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
<PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
<PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
<!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
<_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
<_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
<_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
<_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
</PropertyGroup>
<ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
<PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
</ItemGroup>
<!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
<Target Name="_FixIlcTargetTriple"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册