Missed a few more places where _LinkMode was used
This commit is contained in:
Родитель
d67523d437
Коммит
a14002ad53
|
@ -389,8 +389,8 @@
|
||||||
|
|
||||||
<!-- TrimMode specifies what the linker will do with framework assemblies -->
|
<!-- TrimMode specifies what the linker will do with framework assemblies -->
|
||||||
<TrimMode Condition="'$(_LinkMode)' == 'None'">copy</TrimMode> <!-- Don't use 'copyused', because that might still end up saving some assemblies, and if that's the platform assembly, it may break the partial static registrar -->
|
<TrimMode Condition="'$(_LinkMode)' == 'None'">copy</TrimMode> <!-- Don't use 'copyused', because that might still end up saving some assemblies, and if that's the platform assembly, it may break the partial static registrar -->
|
||||||
<TrimMode Condition="'$(_LinkMode)' == 'SdkOnly' Or '$(_LinkMode)' == 'Full'">link</TrimMode>
|
<TrimMode Condition="'$(_LinkMode)' == 'SdkOnly'">partial</TrimMode>
|
||||||
<!-- For Full link mode we also need to set TrimMode for all non-framework assemblies. This is done further below -->
|
<TrimMode Condition="'$(_LinkMode)' == 'Full'">full</TrimMode>
|
||||||
|
|
||||||
<!-- Verbose output, so that we get something to stdout when something goes wrong -->
|
<!-- Verbose output, so that we get something to stdout when something goes wrong -->
|
||||||
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose</_ExtraTrimmerArgs>
|
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose</_ExtraTrimmerArgs>
|
||||||
|
@ -429,14 +429,6 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Mark all assemblies to be linked if we're linking all assemblies -->
|
|
||||||
<ResolvedFileToPublish
|
|
||||||
Update="@(ResolvedFileToPublish)"
|
|
||||||
Condition="'$(_LinkMode)' == 'Full' And '%(ResolvedFileToPublish.Extension)' == '.dll' And '%(ResolvedFileToPublish.AssetType)' != 'native'"
|
|
||||||
>
|
|
||||||
<TrimMode>link</TrimMode>
|
|
||||||
</ResolvedFileToPublish>
|
|
||||||
|
|
||||||
<!-- Mark our entry assembly as a root assembly. -->
|
<!-- Mark our entry assembly as a root assembly. -->
|
||||||
<TrimmerRootAssembly Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.Filename)' == '$(AssemblyName)' And '%(ResolvedFileToPublish.Extension)' == '.dll'" />
|
<TrimmerRootAssembly Include="@(ResolvedFileToPublish)" Condition="'%(ResolvedFileToPublish.Filename)' == '$(AssemblyName)' And '%(ResolvedFileToPublish.Extension)' == '.dll'" />
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче