Create zip file for WindowsDesktop sfx (dotnet/core-setup#5816)

Commit migrated from https://github.com/dotnet/core-setup/commit/c80a9630e016c3517fe6dce784f7f344b744ba1b

diff --git a/src/installer/pkg/packaging-tools/framework.packaging.targets b/src/installer/pkg/packaging-tools/framework.packaging.targets
index 71951fa..c94e124 100644 (file)
--- a/src/installer/pkg/packaging-tools/framework.packaging.targets
+++ b/src/installer/pkg/packaging-tools/framework.packaging.targets
@@ -13,12 +13,14 @@
             GenerateDeb;
             GenerateRpm;
             GenerateMsi;
-            GeneratePkg" />
+            GeneratePkg;
+            GenerateCompressedArchive" />
 
   <Target Name="GenerateDeb" DependsOnTargets="TestDebuild;CreateDeb" Condition="'$(BuildDebPackage)' == 'true'"/>
   <Target Name="GenerateRpm" DependsOnTargets="TestFPMTool;CreateRpm" Condition="'$(BuildRpmPackage)' == 'true'"/>
   <Target Name="GenerateMsi" DependsOnTargets="CreateMsi" Condition="'$(GenerateMSI)' == 'true'"/>
   <Target Name="GeneratePkg" DependsOnTargets="CreatePkg" Condition="'$(GeneratePkg)' == 'true'"/>
+  <Target Name="GenerateCompressedArchive" DependsOnTargets="CreateCompressedArchive" Condition="'$(GenerateCompressedArchive)' == 'true'"/>
 
   <!--
     Create Debian package.
@@ -146,6 +148,21 @@
     <Message Text="Created '$(InstallerFile)'" Importance="High" />
   </Target>
 
+  <Target Name="CreateCompressedArchive"
+          DependsOnTargets="
+            GetInstallerProperties;
+            GenerateZip"/>
+
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
+
+  <Target Name="GenerateZip"
+          Condition="'$(OSGroup)' == 'Windows_NT'">
+    <ZipFileCreateFromDirectory
+      SourceDirectory="$(SharedFrameworkLayoutDir)"
+      DestinationArchive="$(CompressedArchiveFile)"
+      OverwriteDestination="true" />
+  </Target>
+
   <!--
     Create macOS pkg installer.
   -->

diff --git a/src/installer/pkg/packaging-tools/packaging-tools.targets b/src/installer/pkg/packaging-tools/packaging-tools.targets
index f131b66..0939929 100644 (file)
--- a/src/installer/pkg/packaging-tools/packaging-tools.targets
+++ b/src/installer/pkg/packaging-tools/packaging-tools.targets
@@ -53,6 +53,7 @@
       <!-- Location to place the installer, in bin. -->
       <InstallerFileNameWithoutExtension>$(InstallerName)-$(InstallerBuildPart)</InstallerFileNameWithoutExtension>
       <InstallerFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(InstallerExtension)</InstallerFile>
+      <CompressedArchiveFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension)</CompressedArchiveFile>
     </PropertyGroup>
   </Target>
 

diff --git a/src/installer/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj b/src/installer/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
index cfdcef8..a4838b9 100644 (file)
--- a/src/installer/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
+++ b/src/installer/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
@@ -10,6 +10,8 @@
 
     <GenerateSharedFramework>true</GenerateSharedFramework>
     <GenerateNetCoreAppRuntimeConfig>true</GenerateNetCoreAppRuntimeConfig>
+
+    <GenerateCompressedArchive>true</GenerateCompressedArchive>
   </PropertyGroup>
 
   <!-- Identity / Reference package content -->