diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-03-22 03:06:11 +0300 |
|---|---|---|
| committer | Eric Mellino <erme@microsoft.com> | 2017-03-24 21:52:40 +0300 |
| commit | 870a13da3b30d7166cc07a5053c03df4dc45ca4b (patch) | |
| tree | 44b35b90d32604b3a7e9fc8de800c44635e821d5 /Tools-Override | |
| parent | 33c665c2ccbd87bdad7ead85fd4e70561502214a (diff) | |
Address PR feedback
* Cleaner separation of corefx concepts from stuff in FrameworkTargeting.targets
* Fix the value of AdditionalCleanDirectories (unrelated cleanup).
Diffstat (limited to 'Tools-Override')
| -rw-r--r-- | Tools-Override/FrameworkTargeting.targets | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Tools-Override/FrameworkTargeting.targets b/Tools-Override/FrameworkTargeting.targets index a835bbe570..41e8fb58d2 100644 --- a/Tools-Override/FrameworkTargeting.targets +++ b/Tools-Override/FrameworkTargeting.targets @@ -219,7 +219,7 @@ <Target Name="BinPlace" DependsOnTargets="GetBinPlaceDirs;BinPlaceFiles;BinPlaceProps" AfterTargets="CopyFilesToOutputDirectory" - Condition="'$(BinPlaceRef)' == 'true' OR '$(BinPlaceRuntime)' == 'true'" /> + Condition="'$(EnableBinPlacing)' == 'true'" /> <Target Name="BinPlaceFiles" Condition="'@(BinPlaceDir)' != ''" @@ -278,6 +278,7 @@ </ItemGroup> </Target> + <UsingTask TaskName="FindBestConfigurations" AssemblyFile="$(CoreFxToolsTaskDir)CoreFx.Tools.dll"/> <Target Name="GetBinPlaceDirs" DependsOnTargets="GetBuildConfigurations"> <!-- find which, if any, build configuration of this project is best for each binplace configuration --> @@ -299,10 +300,6 @@ </ItemGroup> </Target> - <ItemGroup> - <AdditionalCleanDirectories Include="$(BinDir)netcoreapp" /> - </ItemGroup> - <!-- Incremental clean only cleans paths under Intermediate or OutDir, handle additional paths --> <Target Name="_CleanGetCurrentAdditionalFileWrites" BeforeTargets="_CleanGetCurrentAndPriorFileWrites"> <!-- find files under paths we care about and add them to _CleanCurrentFileWrites to ensure they are written to the file list --> @@ -311,6 +308,11 @@ </FindUnderPath> </Target> + <ItemGroup> + <AdditionalCleanDirectories Include="%(BinPlaceConfiguration.RefPath)" /> + <AdditionalCleanDirectories Include="%(BinPlaceConfiguration.RuntimePath)" /> + </ItemGroup> + <Target Name="IncrementalCleanAdditionalDirectories" BeforeTargets="IncrementalClean"> <ItemGroup> <_CleanOrphanAdditionalFileWrites Include="@(_CleanPriorFileWrites)" Exclude="@(_CleanCurrentFileWrites)" /> |