Skip to content

Commit d62199d

Browse files
authored
Remove ILCompiler package reference (#107583)
It doesn't look like we need the newest version of the package anymore. This configuration (using the package instead of the SDK version) can be dangerous because it causes a split between the version built against vs. the version AOT'd against.
1 parent a833cfb commit d62199d

File tree

5 files changed

+9
-18
lines changed

5 files changed

+9
-18
lines changed

eng/Version.Details.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@
304304
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
305305
<SourceBuild RepoName="runtime" ManagedOnly="false" />
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="9.0.0-rc.1.24410.5">
308-
<Uri>https://github.com/dotnet/runtime</Uri>
309-
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
310-
</Dependency>
311307
<Dependency Name="System.Reflection.Metadata" Version="9.0.0-rc.1.24410.5">
312308
<Uri>https://github.com/dotnet/runtime</Uri>
313309
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>

eng/Versions.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@
212212
<MicrosoftPrivateIntellisenseVersion>8.0.0-preview-20230918.1</MicrosoftPrivateIntellisenseVersion>
213213
<!-- Mono Cecil -->
214214
<MicrosoftDotNetCecilVersion>0.11.5-alpha.24460.1</MicrosoftDotNetCecilVersion>
215-
<!-- ILCompiler -->
216-
<MicrosoftDotNetILCompilerVersion>9.0.0-rc.1.24410.5</MicrosoftDotNetILCompilerVersion>
217215
<!-- ICU -->
218216
<MicrosoftNETCoreRuntimeICUTransportVersion>10.0.0-alpha.1.24459.2</MicrosoftNETCoreRuntimeICUTransportVersion>
219217
<!-- MsQuic -->

eng/liveBuilds.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@
5858
<SingleFileHostSourcePath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', 'corehost', 'singlefilehost$(ExeSuffix)'))</SingleFileHostSourcePath>
5959
</PropertyGroup>
6060

61+
<!-- Not a live build, but allow overriding the LKG ILCompiler package with a specific version. -->
62+
<PropertyGroup Condition="'$(UseNativeAotForComponents)' == 'true' and '$(PublishAot)' == 'true' and '$(MicrosoftDotNetILCompilerVersion)' != ''">
63+
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
64+
</PropertyGroup>
65+
<ItemGroup Condition="'$(UseNativeAotForComponents)' == 'true' and '$(PublishAot)' == 'true' and '$(MicrosoftDotNetILCompilerVersion)' != ''">
66+
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
67+
<PackageReference Include="runtime.$(ToolsRID).Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
68+
</ItemGroup>
69+
6170
<Target Name="ResolveRuntimeFilesFromLocalBuild">
6271
<Error Condition="!Exists('$(CoreCLRArtifactsPath)') and '$(RuntimeFlavor)' == 'CoreCLR'"
6372
Text="The CoreCLR artifacts path does not exist '$(CoreCLRArtifactsPath)'. The 'clr' subset must be built before building this project. Configuration: '$(CoreCLRConfiguration)'. To use a different configuration, specify the 'RuntimeConfiguration' property." />

src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@
1515
<PublishReadyToRun Condition="'$(UseNativeAotForComponents)' != 'true'">true</PublishReadyToRun>
1616
<PublishSingleFile Condition="'$(UseNativeAotForComponents)' != 'true'">true</PublishSingleFile>
1717
<PublishTrimmed Condition="'$(UseNativeAotForComponents)' != 'true'">true</PublishTrimmed>
18-
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
1918
</PropertyGroup>
2019

21-
<ItemGroup Condition="'$(UseNativeAotForComponents)' == 'true'">
22-
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
23-
<PackageReference Include="runtime.$(ToolsRID).Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
24-
</ItemGroup>
25-
2620
<!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
2721
<Target Name="_FixIlcTargetTriple"
2822
AfterTargets="SetupOSSpecificProps"

src/native/managed/native-library.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
the same way as eng/native/functions.cmake strip_symbols
77
-->
88
<StripSymbols>false</StripSymbols>
9-
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
109
<ControlFlowGuard>Guard</ControlFlowGuard>
1110
</PropertyGroup>
1211

@@ -34,9 +33,4 @@
3433
<!-- passed by compile-native.proj to set - -gcc-toolchain=$(ROOTFS_DIR)/usr -->
3534
<CustomLinkerArg Condition="'$(CustomLinkerArgToolchainArg)' != ''" Include="$(CustomLinkerArgToolchainArg)" />
3635
</ItemGroup>
37-
38-
<ItemGroup>
39-
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
40-
<PackageReference Include="runtime.$(ToolsRID).Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
41-
</ItemGroup>
4236
</Project>

0 commit comments

Comments
 (0)