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

Generate zips for SharedHost and SharedFramework

Browse source
This commit is contained in:
Matt Ellis 2016-03-08 21:52:34 -08:00
parent e6bcfee4a4
commit 92edb36e5b
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/dotnet-cli-build/MsiTargets.cs
View file

@ -102,7 +102,7 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
[Target(nameof(SharedFrameworkTargets.PublishSharedHost))] [Target]
[BuildPlatforms(BuildPlatform.Windows)] [BuildPlatforms(BuildPlatform.Windows)]
public static BuildTargetResult GenerateDotnetSharedHostMsi(BuildTargetContext c) public static BuildTargetResult GenerateDotnetSharedHostMsi(BuildTargetContext c)
{ {
@ -124,7 +124,7 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
[Target(nameof(SharedFrameworkTargets.PublishSharedFramework))] [Target]
[BuildPlatforms(BuildPlatform.Windows)] [BuildPlatforms(BuildPlatform.Windows)]
public static BuildTargetResult GenerateDotnetSharedFrameworkMsi(BuildTargetContext c) public static BuildTargetResult GenerateDotnetSharedFrameworkMsi(BuildTargetContext c)
{ {

22
scripts/dotnet-cli-build/PackageTargets.cs
View file

@ -22,6 +22,8 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(PrepareTargets.Init), [Target(nameof(PrepareTargets.Init),
nameof(PackageTargets.InitPackage), nameof(PackageTargets.InitPackage),
nameof(PackageTargets.GenerateVersionBadge), nameof(PackageTargets.GenerateVersionBadge),
nameof(SharedFrameworkTargets.PublishSharedHost),
nameof(SharedFrameworkTargets.PublishSharedFramework),
nameof(PackageTargets.GenerateCompressedFile), nameof(PackageTargets.GenerateCompressedFile),
nameof(InstallerTargets.GenerateInstaller), nameof(InstallerTargets.GenerateInstaller),
nameof(PackageTargets.GenerateNugetPackages))] nameof(PackageTargets.GenerateNugetPackages))]
@ -55,14 +57,10 @@ namespace Microsoft.DotNet.Cli.Build
[BuildPlatforms(BuildPlatform.Windows)] [BuildPlatforms(BuildPlatform.Windows)]
public static BuildTargetResult GenerateZip(BuildTargetContext c) public static BuildTargetResult GenerateZip(BuildTargetContext c)
{ {
var zipFile = c.BuildContext.Get<string>("SdkCompressedFile"); CreateZipFromDirectory(c.BuildContext.Get<string>("SharedHostPublishRoot"), c.BuildContext.Get<string>("SharedHostCompressedFile"));
CreateZipFromDirectory(c.BuildContext.Get<string>("SharedFrameworkPublishRoot"), c.BuildContext.Get<string>("SharedFrameworkCompressedFile"));
CreateZipFromDirectory(Dirs.Stage2, c.BuildContext.Get<string>("SdkCompressedFile"));
if (File.Exists(zipFile))
{
File.Delete(zipFile);
}
ZipFile.CreateFromDirectory(Dirs.Stage2, zipFile, CompressionLevel.Optimal, false);
return c.Success(); return c.Success();
} }
@ -134,5 +132,15 @@ namespace Microsoft.DotNet.Cli.Build
return env; return env;
} }
private static void CreateZipFromDirectory(string directory, string artifactPath)
{
if (File.Exists(artifactPath))
{
File.Delete(artifactPath);
}
ZipFile.CreateFromDirectory(directory, artifactPath, CompressionLevel.Optimal, false);
}
} }
} }