Skip to content

Commit 8c0dbf1

Browse files
committed
Work around ProcessFrameworkReferences bug
1 parent 59be5c3 commit 8c0dbf1

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

eng/illink.targets

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
<PropertyGroup>
44
<IsTrimmable Condition="'$(IsTrimmable)' == ''">true</IsTrimmable>
5-
<!-- Don't use SDK's trimming functionality.
6-
TODO: Remove this once we build using preview 6 SDK. -->
7-
<_IsTrimmingEnabled>false</_IsTrimmingEnabled>
8-
<!-- Same fix for preview 6 SDK. -->
5+
<!-- Don't use SDK's trimming functionality.
6+
Once we have an SDK with
7+
https://github.com/dotnet/sdk/commit/bdce224bba472ccad4bade07b757ac5275040c0e
8+
and
9+
https://github.com/dotnet/sdk/commit/f051b536cc12190488231f3a889df44214c1bc2e,
10+
we might be able to use built-in functionality instead of a packagereference.
11+
-->
912
<_RequiresILLinkPack>false</_RequiresILLinkPack>
1013
<PrepareResourcesDependsOn>_EmbedILLinkXmls;$(PrepareResourcesDependsOn)</PrepareResourcesDependsOn>
1114
<TargetsTriggeredByCompilation Condition="'$(DesignTimeBuild)' != 'true'">$(TargetsTriggeredByCompilation);ILLinkTrimAssembly</TargetsTriggeredByCompilation>
@@ -40,6 +43,11 @@
4043
<GenerateResourcesSubstitutions Condition="'$(GenerateResourcesSubstitutions)' == '' and '$(StringResourcesPath)' != ''">true</GenerateResourcesSubstitutions>
4144
</PropertyGroup>
4245

46+
<!-- Use ILLink.Tasks version matching the SDK used to build. See comment about _RequiresILLinkPack. -->
47+
<ItemGroup>
48+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="$(BundledNETCoreAppPackageVersion)" PrivateAssets="all" />
49+
</ItemGroup>
50+
4351
<ItemGroup>
4452
<ILLinkSuppressionsXmls Include="$(ILLinkSuppressionsXmlFile)"
4553
Condition="Exists('$(ILLinkSuppressionsXmlFile)')" />

0 commit comments

Comments
 (0)