mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixup dotnet-sdk-debug layout

Browse source
This commit is contained in:
Bryan Thornbury 2016-07-12 16:32:59 -07:00
parent 7d10620c6d
commit e9d97ea7bd
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/package/Microsoft.DotNet.Cli.Layout.targets
View file

@ -6,6 +6,11 @@
<Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" > <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
<PropertyGroup> <PropertyGroup>
<LayoutDirectory>$(IntermediateDirectory)/layouts</LayoutDirectory> <LayoutDirectory>$(IntermediateDirectory)/layouts</LayoutDirectory>
<SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
<SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
<CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
<CombinedFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk)</CombinedFrameworkSdkOutputDirectory>
</PropertyGroup> </PropertyGroup>
<!-- Set up Items with Layout Input Files --> <!-- Set up Items with Layout Input Files -->
@ -23,7 +28,7 @@
<Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" /> <Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
</MakeRelative> </MakeRelative>
<MakeRelative <MakeRelative
Path1="$(OutputDirectory)" Path1="$(Stage2SymbolsDirectory)"
Path2="%(SdkDebugLayoutInput.Identity)" > Path2="%(SdkDebugLayoutInput.Identity)" >
<Output TaskParameter="RelativePath" ItemName="SdkDebugRelativeOutputFiles" /> <Output TaskParameter="RelativePath" ItemName="SdkDebugRelativeOutputFiles" />
</MakeRelative> </MakeRelative>
@ -38,13 +43,6 @@
<Output TaskParameter="RelativePath" ItemName="CombinedFrameworkSdkOutputFiles" /> <Output TaskParameter="RelativePath" ItemName="CombinedFrameworkSdkOutputFiles" />
</MakeRelative> </MakeRelative>
<PropertyGroup>
<SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
<SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
<CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
<CombinedFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk)</CombinedFrameworkSdkOutputDirectory>
</PropertyGroup>
<!-- Set up Items Defining Layouts for easy change --> <!-- Set up Items Defining Layouts for easy change -->
<ItemGroup> <ItemGroup>
<LayoutDefinition Include="Sdk"> <LayoutDefinition Include="Sdk">