File tree Expand file tree Collapse file tree 3 files changed +12
-17
lines changed
testing/linker/SupportFiles Expand file tree Collapse file tree 3 files changed +12
-17
lines changed Original file line number Diff line number Diff line change 11<Project >
2-
3- <PropertyGroup >
4- <!-- Used to silence the warning caused by the workaround for https://github.com/dotnet/runtime/issues/81382 -->
5- <SuppressGenerateILCompilerExplicitPackageReferenceWarning >true</SuppressGenerateILCompilerExplicitPackageReferenceWarning >
6- </PropertyGroup >
7-
8- <!-- needed to reference a specific version of NetCoreApp. Workaround https://github.com/dotnet/runtime/issues/81382 -->
92 <ItemGroup >
103 <FrameworkReference Update =" Microsoft.NETCore.App"
114 RuntimeFrameworkVersion =" $(MicrosoftNETCoreAppRefVersion)" />
125
13- <PackageReference Include =" Microsoft.DotNet.ILCompiler"
14- Version =" $(MicrosoftNETCoreAppRefVersion)" />
15-
166 <!-- Workaround when there is no vNext SDK available; copy known packs info from 9.0. -->
177 <KnownAppHostPack Include =" @(KnownAppHostPack->WithMetadataValue('TargetFramework', 'net9.0'))"
188 TargetFramework =" $(TargetFramework)"
6454 <AppHostRuntimeIdentifiers Condition =" '$(DotNetBuildSourceOnly)' == 'true' " >$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers >
6555 </KnownRuntimePack >
6656
57+ <KnownILCompilerPack Update =" Microsoft.DotNet.ILCompiler" >
58+ <ILCompilerPackVersion >$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion >
59+ </KnownILCompilerPack >
60+
61+ <KnownILLinkPack Update =" Microsoft.NET.ILLink.Tasks" >
62+ <ILLinkPackVersion >$(MicrosoftNETCoreAppRefVersion)</ILLinkPackVersion >
63+ </KnownILLinkPack >
6764 </ItemGroup >
6865
6966 <!--
Original file line number Diff line number Diff line change 44 <ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
55 <TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
66 <LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
7-
8- <!-- Temporarily hardcoded to true -->
9- <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
107 </PropertyGroup>
118</Project>
Original file line number Diff line number Diff line change 5656 Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' "
5757 RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}"
5858 TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" />
59-
60- <PackageReference Include="Microsoft.DotNet.ILCompiler"
61- Condition=" '$(PublishAot)' == 'true' "
62- Version="${MicrosoftNETCoreAppRefVersion}" />
6359 </ItemGroup>
6460
6561 <ItemGroup>
118114 Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</ILLinkPackVersion>
119115 </KnownILLinkPack>
120116
117+ <KnownILCompilerPack Update="Microsoft.DotNet.ILCompiler">
118+ <ILCompilerPackVersion
119+ Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'">$(MicrosoftNETCoreAppRefVersion)</ILCompilerPackVersion>
120+ </KnownILCompilerPack>
121+
121122 <!-- Use the just-built ASP.NET Core shared framework if available except when building product code in servicing. -->
122123 <KnownFrameworkReference Update="Microsoft.AspNetCore.App" Condition=" $(UpdateAspNetCoreKnownFramework) ">
123124 <LatestRuntimeFrameworkVersion
You can’t perform that action at this time.
0 commit comments