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

Merge pull request #4608 from livarcocc/fix_archiver_build

Browse source 
Switching the archiver to be a portable app
This commit is contained in:
Livar 2016-11-03 18:16:06 -07:00 • committed by GitHub
commit e1584f7dc4
2 changed files with 7 additions and 6 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)"
WorkingDirectory="$(RepoRoot)/tools/Archiver"
Output="$(ToolsOutputDirectory)"
Configuration="$(Configuration)"
Runtime="$(CoreCLRRid)" />
Configuration="$(Configuration)" />
<Exec Command="$(ArchiverExe) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
<Exec Command="$(DotnetStage0) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
<Copy SourceFiles="$(IntermediateArchive)" DestinationFiles="$(FinalArchive)" />
</Target>
@ -41,7 +40,7 @@
<PropertyGroup>
<NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
<NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
<ArchiverExe>$(ToolsOutputDirectory)/Archiver</ArchiverExe>
<ArchiverDll>$(ToolsOutputDirectory)/Archiver.dll</ArchiverDll>
<IntermediateArchive>$(IntermediateDirectory)/nuGetPackagesArchive.lzma</IntermediateArchive>
<FinalArchive>$(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma</FinalArchive>
</PropertyGroup>

6
src/dotnet/project.json
View file

@ -12,7 +12,8 @@
"commands/dotnet-new/CSharp_Web.zip",
"commands/dotnet-new/CSharp_nunittest.zip",
"commands/dotnet-new/FSharp_Console.zip",
"commands/dotnet-new/FSharp_Lib.zip"
"commands/dotnet-new/FSharp_Lib.zip",
"commands/dotnet-new/CSharp_Mstest.zip"
]
},
"compile": {
@ -24,7 +25,8 @@
"commands/dotnet-new/CSharp_MSBuild/**",
"commands/dotnet-new/FSharp_Lib/**",
"commands/dotnet-new/CSharp_xunittest/**",
"commands/dotnet-new/CSharp_nunittest/**"
"commands/dotnet-new/CSharp_nunittest/**",
"commands/dotnet-new/CSharp_Mstest/**",
]
}
},