diff options
author | Eric Mellino <erme@microsoft.com> | 2017-03-23 01:36:41 +0300 |
---|---|---|
committer | Eric Mellino <erme@microsoft.com> | 2017-03-24 21:52:40 +0300 |
commit | 782e4c9be70071a157fd15628ac6911365b82c5a (patch) | |
tree | 65c1cb36470c54cf6604f9787d273b5154298019 /Tools-Override | |
parent | cebb23cc5358e04d0739c851483479f2310fd28e (diff) |
Set default value for EnableBinplacing in FrameworkTargeting.targets
* Reorder some things in dir.targets to accomodate that.
Diffstat (limited to 'Tools-Override')
-rw-r--r-- | Tools-Override/FrameworkTargeting.targets | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tools-Override/FrameworkTargeting.targets b/Tools-Override/FrameworkTargeting.targets index 5aeafb5890..7afbceec57 100644 --- a/Tools-Override/FrameworkTargeting.targets +++ b/Tools-Override/FrameworkTargeting.targets @@ -218,13 +218,14 @@ <!-- Binplacing targets and properties --> <PropertyGroup> <BinPlaceUseHardlinksIfPossible Condition="'$(BinPlaceUseHardlinksIfPossible)' == ''">true</BinPlaceUseHardlinksIfPossible> + <EnableBinPlacing Condition="'$(EnableBinPlacing)' == '' AND ('$(BinPlaceRef)' == 'true' OR '$(BinPlaceRuntime)' == 'true')">true</EnableBinPlacing> </PropertyGroup> <Target Name="BinPlace" DependsOnTargets="GetBinPlaceDirs;BinPlaceFiles;BinPlaceProps" AfterTargets="CopyFilesToOutputDirectory" Condition="'$(EnableBinPlacing)' == 'true'" /> - + <Target Name="BinPlaceFiles" Condition="'@(BinPlaceDir)' != ''" DependsOnTargets="GetBinPlaceItems" > |