diff options
| author | Eric St. John <ericstj@microsoft.com> | 2017-04-05 02:09:44 +0300 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2017-04-05 02:09:44 +0300 |
| commit | 145762c865b67f0bf1292b4fa30ce1c0142e742f (patch) | |
| tree | 558429b4657d562348d4a7553dcaf105df806e12 /dir.targets | |
| parent | 2277db969616a5ad4fd9f4a8118a3b4030ff62d3 (diff) | |
Update ILLinkTrimAssembly condition
Make it so that we don't set ILLinkTrimAssembly if its already set.
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dir.targets b/dir.targets index 902a6c17dd..7ad0a7881b 100644 --- a/dir.targets +++ b/dir.targets @@ -60,8 +60,8 @@ <PackageFileRefPath Condition="'$(IsNETCoreAppRef)' == 'true'">$(NETCoreAppPackageRefPath)</PackageFileRefPath> <PackageFileRuntimePath>$(NETCoreAppPackageRuntimePath)</PackageFileRuntimePath> <RuntimePath Condition="'$(BinPlaceNETCoreAppPackage)' == 'true'">$(NETCoreAppPackageRuntimePath)\..\runtime</RuntimePath> - <!-- enable trimming for any project that's part of the shared framework --> - <SetProperties Condition="'$(IsRuntimeAssembly)' == 'true'">ILLinkTrimAssembly=true</SetProperties> + <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly --> + <SetProperties Condition="'$(BinPlaceRuntime)' == 'true' AND '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties> </BinPlaceConfiguration> <BinPlaceConfiguration Condition="'$(IsUAP)' == 'true' AND '$(BuildingUAPVertical)' == 'true'" Include="uap-$(_bc_OSGroup)"> <PackageFileRefPath Condition="'$(IsUAPRef)'=='true'">$(UAPPackageRefPath)</PackageFileRefPath> |