Skip to content

Commit f051b53

Browse files
authored
Add back _RequiresILLinkPack override (#34429)
bdce224 removed the ability to download the ILLink pack by setting `_RequiresILLinkPack`. This is needed for macios scenarios where the ILLink pack should be restored, but it's not known ahead-of-time whether trimming will be enabled. See dotnet/macios#17227 for more context. This adds back the ability to set `_RequiresILLinkPack` to download the ILLink pack even if none of the other relevant settings are enabled.
1 parent 5f9bc3b commit f051b53

18 files changed

+180
-112
lines changed

src/Tasks/Common/Resources/Strings.resx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -876,10 +876,8 @@ You may need to build the project on another operating system or architecture, o
876876
<value>NETSDK1194: The "--output" option isn't supported when building a solution. Specifying a solution-level output path results in all projects copying outputs to the same directory, which can lead to inconsistent builds.</value>
877877
<comment>{StrBegin="NETSDK1194: "}{Locked="--output"}</comment>
878878
</data>
879-
<data name="IsTrimmableUnsupported" xml:space="preserve">
880-
<value>NETSDK1195: IsTrimmable is not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example:
881-
&lt;IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))"&gt;true&lt;/IsTrimmable&gt;
882-
For more information, see https://aka.ms/netsdk1195</value>
879+
<data name="ILLinkNoValidRuntimePackageError" xml:space="preserve">
880+
<value>NETSDK1195: Trimming, or code compatibility analysis for trimming, single-file deployment, or ahead-of-time compilation is not supported for the target framework. For more information, see https://aka.ms/netsdk1195</value>
883881
<comment>{StrBegin="NETSDK1195: "}</comment>
884882
</data>
885883
<data name="AotNotSupported" xml:space="preserve">
@@ -949,5 +947,10 @@ For more information, see https://aka.ms/netsdk1195</value>
949947
&lt;EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))"&gt;true&lt;/EnableSingleFileAnalyzer&gt;</value>
950948
<comment>{StrBegin="NETSDK1211: "}</comment>
951949
</data>
952-
<!-- The latest message added is EnableSingleFileAnalyzerUnsupported. Please update this value with each PR to catch parallel PRs both adding a new message -->
950+
<data name="IsTrimmableUnsupported" xml:space="preserve">
951+
<value>NETSDK1212: IsTrimmable is not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example:
952+
&lt;IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))"&gt;true&lt;/IsTrimmable&gt;</value>
953+
<comment>{StrBegin="NETSDK1212: "}</comment>
954+
</data>
955+
<!-- The latest message added is IsTrimmableUnsupported. Please update this value with each PR to catch parallel PRs both adding a new message -->
953956
</root>

src/Tasks/Common/Resources/xlf/Strings.cs.xlf

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.de.xlf

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.es.xlf

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.fr.xlf

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/Common/Resources/xlf/Strings.it.xlf

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)