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

Adding trailing slash back to OutputDirectory that I accidently removed when merging and improving the inputs for GenerateNuGetPackagesArchiveInputs to take into account the c# template and the dotnet-archive and Microsoft.Dotnet.Archive codes.

Browse source
This commit is contained in:
Livar Cunha 2016-07-01 20:46:54 -07:00
parent 3c789c8230
commit f66ec9a789
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -36,7 +36,7 @@
<Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory> <Stage2Directory>$(BaseOutputDirectory)/stage2</Stage2Directory>
<Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory> <Stage2SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</Stage2SymbolsDirectory>
<DotnetStage2>$(Stage2Directory)/dotnet.exe</DotnetStage2> <DotnetStage2>$(Stage2Directory)/dotnet.exe</DotnetStage2>
<OutputDirectory>$(Stage2Directory)</OutputDirectory> <OutputDirectory>$(Stage2Directory)/</OutputDirectory>
<Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory> <Stage2CompilationDirectory>$(BaseOutputDirectory)/stage2compilation</Stage2CompilationDirectory>
<IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory> <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
<PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory> <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>

12
build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
View file

@ -2,7 +2,7 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="GenerateNuGetPackagesArchive" <Target Name="GenerateNuGetPackagesArchive"
DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs" DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs"
Inputs="$(_DotNetNewFolder)/CSharp_Console/**/*" Inputs="@(GenerateNuGetPackagesArchiveInputs)"
Outputs="$(FinalArchive)"> Outputs="$(FinalArchive)">
<ItemGroup> <ItemGroup>
<FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" /> <FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" />
@ -37,5 +37,15 @@
<IntermediateArchive>$(IntermediateDirectory)/nuGetPackagesArchive.lzma</IntermediateArchive> <IntermediateArchive>$(IntermediateDirectory)/nuGetPackagesArchive.lzma</IntermediateArchive>
<FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive> <FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<GenerateNuGetPackagesArchiveInputs Include="$(_DotNetNewFolder)/CSharp_Console/**/*" />
<GenerateNuGetPackagesArchiveInputs Include="$(SrcDirectory)/dotnet-archive/**/*"
Exclude="$(SrcDirectory)/dotnet-archive/**/bin/**/*;
$(SrcDirectory)/dotnet-archive/**/obj/**/*" />
<GenerateNuGetPackagesArchiveInputs Include="$(SrcDirectory)/Microsoft.DotNet.Archive/**/*"
Exclude="$(SrcDirectory)/Microsoft.DotNet.Archive/**/bin/**/*;
$(SrcDirectory)/Microsoft.DotNet.Archive/**/obj/**/*" />
</ItemGroup>
</Target> </Target>
</Project> </Project>