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

Removed the CompileCliSdkAndGenerateNuGetPackagesArchive method from CompileTargets and replaced with CompileCliSDk. Also used stage1 to generate the archive for stage2.

Browse source
This commit is contained in:
Livar Cunha 2016-06-10 19:52:37 -07:00
parent d8c590e4ce
commit 686e09d5e9
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
build_projects/dotnet-cli-build/CompileTargets.cs
View file

@ -107,10 +107,10 @@ namespace Microsoft.DotNet.Cli.Build
} }
Directory.CreateDirectory(Dirs.Stage2); Directory.CreateDirectory(Dirs.Stage2);
var result = CompileCliSdkAndGenerateNuGetPackagesArchive(c, var result = CompileCliSdk(c,
dotnet: DotNetCli.Stage1, dotnet: DotNetCli.Stage1,
rootOutputDirectory: Dirs.Stage2, rootOutputDirectory: Dirs.Stage2,
currentDotnet: DotNetCli.Stage2); generateNugetPackagesArchive: true);
if (!result.Success) if (!result.Success)
{ {
@ -158,22 +158,11 @@ namespace Microsoft.DotNet.Cli.Build
FS.RmFilesInDirRecursive(directory, "*.pdb"); FS.RmFilesInDirRecursive(directory, "*.pdb");
} }
private static BuildTargetResult CompileCliSdkAndGenerateNuGetPackagesArchive(
BuildTargetContext c,
DotNetCli dotnet,
string rootOutputDirectory,
DotNetCli currentDotnet)
{
CompileCliSdk(c, dotnet, rootOutputDirectory, currentDotnet);
return c.Success();
}
private static BuildTargetResult CompileCliSdk( private static BuildTargetResult CompileCliSdk(
BuildTargetContext c, BuildTargetContext c,
DotNetCli dotnet, DotNetCli dotnet,
string rootOutputDirectory, string rootOutputDirectory,
DotNetCli dotnetToGenerateNuGetPackagesArchive = null) bool generateNugetPackagesArchive = false)
{ {
var configuration = c.BuildContext.Get<string>("Configuration"); var configuration = c.BuildContext.Get<string>("Configuration");
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion"); var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
@ -276,9 +265,9 @@ namespace Microsoft.DotNet.Cli.Build
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content);
if(dotnetToGenerateNuGetPackagesArchive != null) if(generateNugetPackagesArchive)
{ {
GenerateNuGetPackagesArchive(c, dotnetToGenerateNuGetPackagesArchive, sdkOutputDirectory); GenerateNuGetPackagesArchive(c, dotnet, sdkOutputDirectory);
} }
return c.Success(); return c.Success();