diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-04-27 00:17:54 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-04-28 05:08:23 +0300 |
| commit | cd39114da83c2e87cc2dc293f5e2e05aa9894a5b (patch) | |
| tree | 8fb27044c251c25fbda1eb757c8fe7ca047cbdce /dir.targets | |
| parent | f65618f1b973cf057ae782f2d0402db185a72c14 (diff) | |
Move local corefx targets/tasks to BuildTools
This change mostly deals with moving Tools-Override and CoreFxTools
task library to BuildTools and consuming them from there instead.
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dir.targets b/dir.targets index 242fa6cb10..932113dd7d 100644 --- a/dir.targets +++ b/dir.targets @@ -13,10 +13,9 @@ <Target Name="RebuildAndTest" DependsOnTargets="Rebuild;Test" /> <Target Name="Test" /> - <!-- build vertical requires the FindBestConfiguration task which is currently in CoreFx.Tools.dll --> - <Import Project="buildvertical.targets" Condition="Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" /> + <Import Project="buildvertical.targets" /> - <Target Name="UndefineTestTFM" + <Target Name="UndefineTestTFM" BeforeTargets="AssignProjectConfiguration"> <ItemGroup> <!-- @@ -66,7 +65,7 @@ <BinPlaceConfiguration Condition="'$(IsUAP)' == 'true' AND '$(BuildingUAPAOTVertical)' == 'true'" Include="uapaot-$(_bc_OSGroup)"> <PackageFileRuntimePath>$(UAPAOTPackageRuntimePath)</PackageFileRuntimePath> </BinPlaceConfiguration> - <BinPlaceConfiguration Condition="('$(IsNetFxNETStandard)' == 'true' OR '$(IsNetFxNETStandardRef)' == 'true') AND '$(BuildingNETFxVertical)' == 'true'" + <BinPlaceConfiguration Condition="('$(IsNetFxNETStandard)' == 'true' OR '$(IsNetFxNETStandardRef)' == 'true') AND '$(BuildingNETFxVertical)' == 'true'" Include="netfx-$(_bc_OSGroup);net462-$(_bc_OSGroup);net47-$(_bc_OSGroup)"> <PackageFileRefPath Condition="'$(IsNetFxNETStandardRef)'=='true'">$(NetFxPackageRefPath)</PackageFileRefPath> <PackageFileRuntimePath Condition="'$(IsNetFxNETStandard)'=='true'">$(NetFxPackageRuntimePath)</PackageFileRuntimePath> @@ -129,7 +128,7 @@ <SuppressPackageTargetFrameworkCompatibility Include="uap10.1" /> </ItemGroup> - <Target Name="ProducesPackageId" + <Target Name="ProducesPackageId" Returns="@(PackageIds)"> <ItemGroup> <PackageIds Include="$(Id)" /> |