From 65fcbdb8c814975e9aa0f570ac113ca591d3f278 Mon Sep 17 00:00:00 2001
From: = <jt.luo@mail.utoronto.ca>
Date: Wed, 18 Oct 2017 10:14:50 -0700
Subject: [PATCH] Installer generation updates

---
 build/RuntimeStoreInstaller.targets           | 35 ++++++++++++++++---
 .../packaging/hosting_debian_config.json      |  2 +-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets
index f615133e54..8cb848ca85 100644
--- a/build/RuntimeStoreInstaller.targets
+++ b/build/RuntimeStoreInstaller.targets
@@ -11,7 +11,7 @@
     <_WorkLayoutDir>$(_WorkRoot).l\</_WorkLayoutDir>
     <_WorkOutputDir>$(_WorkRoot).o\</_WorkOutputDir>
     <_DockerRootDirectory>/opt/code/</_DockerRootDirectory>
-    <InstallersOutputDir>$(ArtifactsDir)installers\</InstallersOutputDir>
+    <_InstallersOutputDir>$(ArtifactsDir)installers\</_InstallersOutputDir>
 
     <RSInstallerName>aspnetcore-store</RSInstallerName>
     <HostingInstallerName>dotnet-hosting</HostingInstallerName>
@@ -26,10 +26,10 @@
     <TimestampFreeRSArchive>$(_TimestampFreeRSSource)aspnetcore-store-$(PackageVersionNoTimestamp)-linux-x64.tar.gz</TimestampFreeRSArchive>
   </PropertyGroup>
 
-  <Target Name="BuildInstallers" DependsOnTargets="GenerateTargzs;GenerateRpms;GenerateDebs" />
+  <Target Name="BuildInstallers" DependsOnTargets="GenerateTargzs;GenerateRpms;GenerateDebs;GenerateRelabledInstallers" />
 
   <Target Name="_EnsureInstallerPrerequisites">
-    <MakeDir Directories="$(InstallersOutputDir)" />
+    <MakeDir Directories="$(_InstallersOutputDir)" />
 
     <!-- Check Docker server OS -->
     <Exec Command="docker version -f &quot;{{.Server.Os}}&quot;" StandardOutputImportance="Normal" ConsoleToMSBuild="true">
@@ -67,7 +67,7 @@
     <Exec Command="tar -xzf $(RuntimeArchive) -C $(_WorkRoot)" />
 
     <!-- Create Aspnet Hosting Bundle tar.gz -->
-    <Exec Command="tar -czvf $(InstallersOutputDir)$(HostingArchiveName) ." WorkingDirectory="$(_WorkRoot)"/>
+    <Exec Command="tar -czvf $(_InstallersOutputDir)$(HostingArchiveName) ." WorkingDirectory="$(_WorkRoot)"/>
   </Target>
 
   <Target Name="GenerateTargzs" DependsOnTargets="_EnsureInstallerPrerequisites;_DownloadCoreInstallers">
@@ -127,8 +127,10 @@
     <!-- Update Date, Maintainer, Version, Revision and Changelog Message -->
     <RepoTasks.ReplaceInFile Filename="$(_WorkRoot)templates/changelog" Items="@(ChangelogItems)" />
 
+    <!-- Update Maintainer and Summary -->
     <PropertyGroup>
       <RPMMaintainer>$(MaintainerName) &lt;$(MaintainerEmail)&gt;</RPMMaintainer>
+      <RPMSummary>$(RPMSummary.Replace('DEB_VERSION','$(RPMVersion)'))</RPMSummary>
     </PropertyGroup>
 
     <!-- Run RPM -->
@@ -353,7 +355,7 @@
     <Error Text="@(GeneratedDebFiles->Count()) deb installer files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
 
     <Copy
-      DestinationFiles="$(InstallersOutputDir)$(DebPrefix)-$(DebVersion)-$(Image)-x64.deb"
+      DestinationFiles="$(_InstallersOutputDir)$(DebPrefix)-$(DebVersion)-$(Image)-x64.deb"
       SourceFiles="@(GeneratedDebFiles)"
       OverwriteReadOnlyFiles="True"
       SkipUnchangedFiles="False"
@@ -410,4 +412,27 @@
       Command="dotnet deb-tool -i $(_WorkLayoutDir) -o $(_WorkOutputDir) -n $(INSTALLER_NAME) -v $(INSTALLER_VERSION)"
       WorkingDirectory="$(_DebToolDir)" />
   </Target>
+
+  <Target Name="GenerateRelabledInstallers">
+    <ItemGroup>
+      <Debian8Installers Include="$(_InstallersOutputDir)*debian.8*" />
+      <Ubuntu1604Installers Include="$(_InstallersOutputDir)*ubuntu.16.04*" />
+    </ItemGroup>
+
+    <!-- Create debian.9 installers by renaming debian.8 installers -->
+    <Copy
+      SourceFiles="%(Debian8Installers.FullPath)"
+      DestinationFiles="$([System.String]::Copy('%(Debian8Installers.FullPath)').Replace('debian.8','debian.9'))"
+      OverwriteReadOnlyFiles="True"
+      SkipUnchangedFiles="False"
+      UseHardlinksIfPossible="False" />
+
+    <!-- Create ubuntu.17.04 installers by renaming ubuntu.16.04 installers -->
+    <Copy
+      SourceFiles="%(Ubuntu1604Installers.FullPath)"
+      DestinationFiles="$([System.String]::Copy('%(Ubuntu1604Installers.FullPath)').Replace('ubuntu.16.04','ubuntu.17.04'))"
+      OverwriteReadOnlyFiles="True"
+      SkipUnchangedFiles="False"
+      UseHardlinksIfPossible="False" />
+  </Target>
 </Project>
diff --git a/build/tools/packaging/hosting_debian_config.json b/build/tools/packaging/hosting_debian_config.json
index cfdd83e74a..92c825e901 100644
--- a/build/tools/packaging/hosting_debian_config.json
+++ b/build/tools/packaging/hosting_debian_config.json
@@ -6,7 +6,7 @@
     "install_root": "/usr/share/dotnet",
 
     "short_description": "Microsoft .NET Core DEB_VERSION Linux Server Hosting",
-    "long_description": "Microsoft .NET Core DEB_VERSION Linux Server Hosting enables hosting of ASP.NET Core applications and contains the ASP.NET Core Runtime Package Store and .NET Core Runtime. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/aspnet/home). We happily accept issues and PRs.",
+    "long_description": "Microsoft .NET Core Linux Server Hosting enables hosting of ASP.NET Core applications and contains the ASP.NET Core Runtime Package Store and .NET Core Runtime. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/aspnet/home). We happily accept issues and PRs.",
     "homepage": "https://www.asp.net/",
 
     "release":{