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

Switching the archiver to be a portable app to get around runtime specific issues with having two stage0.

Browse source
This commit is contained in:
Livar Cunha 2016-11-03 16:28:21 -07:00
parent de5da5870f
commit a03eac7e1b
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,10 +28,9 @@
<DotNetPublish ToolPath="$(Stage0Directory)" <DotNetPublish ToolPath="$(Stage0Directory)"
WorkingDirectory="$(RepoRoot)/tools/Archiver" WorkingDirectory="$(RepoRoot)/tools/Archiver"
Output="$(ToolsOutputDirectory)" Output="$(ToolsOutputDirectory)"
Configuration="$(Configuration)" Configuration="$(Configuration)" />
Runtime="$(CoreCLRRid)" />
<Exec Command="$(ArchiverExe) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" /> <Exec Command="$(DotnetStage0) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
<Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" /> <Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" />
</Target> </Target>
@ -41,7 +40,7 @@
<PropertyGroup> <PropertyGroup>
<NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject> <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
<NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder> <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
<ArchiverExe>$(ToolsOutputDirectory)/Archiver</ArchiverExe> <ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
<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>