From 454567bc71935476de6964c6f2284fa2d0540b1b Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 31 May 2018 23:02:14 +0000
Subject: [PATCH 1/3] Updating submodule(s)

KestrelHttpServer => d1416e679bcc6604fd86d7a34015fddcf2ef5480

[auto-updated: submodules]
---
 modules/KestrelHttpServer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index 5ec7bacdfe..d1416e679b 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit 5ec7bacdfea4e44217d2fc29d6b31ebfa83e8e07
+Subproject commit d1416e679bcc6604fd86d7a34015fddcf2ef5480

From a5981cb09fd19c0f652f3486a649dd818bba818b Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Thu, 31 May 2018 16:45:15 -0700
Subject: [PATCH 2/3] Updating submodule(s)

KestrelHttpServer => e4d290b601ef646c5e02b5819012b49ad54f5a4e

[auto-updated: submodules]
---
 modules/KestrelHttpServer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer
index d1416e679b..e4d290b601 160000
--- a/modules/KestrelHttpServer
+++ b/modules/KestrelHttpServer
@@ -1 +1 @@
-Subproject commit d1416e679bcc6604fd86d7a34015fddcf2ef5480
+Subproject commit e4d290b601ef646c5e02b5819012b49ad54f5a4e

From 5f0b4e1322696bd12bd5ae57fc47d549613d4cf1 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 31 May 2018 17:48:54 -0700
Subject: [PATCH 3/3] Refactor property names for computing .deb/.rpm file
 names and dependencies

---
 build/SharedFx.props            |  8 ++------
 build/SharedFxInstaller.targets | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/build/SharedFx.props b/build/SharedFx.props
index 1176ef7828..7d2ccaf754 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -37,12 +37,8 @@
     <!-- In an orchestrated build, this may be overriden to other Azure feeds. -->
     <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">$(PublicCoreFeedPrefix)</DotNetAssetRootUrl>
 
-    <DotnetRuntimePackageName>dotnet-runtime</DotnetRuntimePackageName>
-    <DotnetRuntimeInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerPrefix>
-    <MicrosoftNETCoreApp21IdVersion>2.1</MicrosoftNETCoreApp21IdVersion>
-    <MicrosoftNETCoreApp21InstallerVersion>$(MicrosoftNETCoreApp21PackageVersion.Split('-')[0])</MicrosoftNETCoreApp21InstallerVersion>
-    <DotnetRuntimeInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21IdVersion)</DotnetRuntimeInstallerPrefix>
-    <RuntimeArchiveLinkPrefix>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerPrefix)</RuntimeArchiveLinkPrefix>
+    <DotnetRuntimeFileNamePrefix>dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)</DotnetRuntimeFileNamePrefix>
+    <RuntimeArchiveLinkPrefix>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppPackageVersion)/$(DotnetRuntimeFileNamePrefix)</RuntimeArchiveLinkPrefix>
 
     <SharedFxIntermediateArchiveFilePrefix>$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)</SharedFxIntermediateArchiveFilePrefix>
 
diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets
index cddf29df0f..2aaf3d3cc8 100644
--- a/build/SharedFxInstaller.targets
+++ b/build/SharedFxInstaller.targets
@@ -25,12 +25,12 @@
     <MakeDir Directories="$(_InstallerSourceDir)" />
     <KoreBuild.Tasks.DownloadFile
       Uri="$(RuntimeArchiveLinkPrefix)-%(WindowsSharedFxRIDs.Identity).zip$(DotNetAssetRootAccessTokenSuffix)"
-      DestinationPath="$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-%(WindowsSharedFxRIDs.Identity).zip"
-      Condition="!Exists('$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-%(WindowsSharedFxRIDs.Identity).zip')" />
+      DestinationPath="$(_InstallerSourceDir)$(DotnetRuntimeFileNamePrefix)-%(WindowsSharedFxRIDs.Identity).zip"
+      Condition="!Exists('$(_InstallerSourceDir)$(DotnetRuntimeFileNamePrefix)-%(WindowsSharedFxRIDs.Identity).zip')" />
     <KoreBuild.Tasks.DownloadFile
       Uri="$(RuntimeArchiveLinkPrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz$(DotNetAssetRootAccessTokenSuffix)"
-      DestinationPath="$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz"
-      Condition="!Exists('$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz')" />
+      DestinationPath="$(_InstallerSourceDir)$(DotnetRuntimeFileNamePrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz"
+      Condition="!Exists('$(_InstallerSourceDir)$(DotnetRuntimeFileNamePrefix)-%(NonWindowsSharedFxRIDs.Identity).tar.gz')" />
   </Target>
 
   <Target Name="_GenerateCumulativeArchive">
@@ -48,14 +48,14 @@
       Command="tar -xzf $(SharedFxIntermediateArchiveFilePrefix)-$(SharedFxPlatform)$(ArchiveExtension) -C $(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.tar.gz'"/>
     <Exec
-      Command="tar -xzf $(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-$(SharedFxPlatform)$(ArchiveExtension) -C $(_WorkRoot)"
+      Command="tar -xzf $(_InstallerSourceDir)$(DotnetRuntimeFileNamePrefix)-$(SharedFxPlatform)$(ArchiveExtension) -C $(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.tar.gz'"/>
     <UnzipArchive
       File="$(SharedFxIntermediateArchiveFilePrefix)-$(SharedFxPlatform)$(ArchiveExtension)"
       Destination="$(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.zip'" />
     <UnzipArchive
-      File="$(_InstallerSourceDir)$(DotnetRuntimeInstallerPrefix)-$(SharedFxPlatform)$(ArchiveExtension)"
+      File="$(_InstallerSourceDir)$(DotnetRuntimeFileNamePrefix)-$(SharedFxPlatform)$(ArchiveExtension)"
       Destination="$(_WorkRoot)"
       Condition="'$(ArchiveExtension)' == '.zip'" />
 
@@ -142,13 +142,15 @@
       <Image>rhel.7</Image>
       <RpmVendor>.NET Foundation</RpmVendor>
       <RHInstallRoot>/opt/rh/rh-dotnet20/root/usr/lib64/dotnet</RHInstallRoot>
+      <Rpm_DotnetRuntimeDependencyId>dotnet-runtime-$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</Rpm_DotnetRuntimeDependencyId>
+      <Rpm_DotnetRuntimeDependencyVersion>$(MicrosoftNETCoreAppPackageVersion.Split('-')[0])</Rpm_DotnetRuntimeDependencyVersion>
     </PropertyGroup>
 
     <!-- Build Docker Image -->
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_BuildDockerImage" Properties="Image=$(Image)" />
 
     <ItemGroup>
-      <RpmSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(MicrosoftNETCoreApp21InstallerVersion)" />
+      <RpmSharedFxDependencies Include="$(Rpm_DotnetRuntimeDependencyId)" Version="$(Rpm_DotnetRuntimeDependencyVersion)" />
       <RpmRHSharedFxDirectories Include="$(RHInstallRoot)/shared" />
       <RpmGenericSharedFxDirectories Include="$(InstallRoot)/shared" />
     </ItemGroup>
@@ -245,14 +247,15 @@
   </Target>
 
   <Target Name="GenerateDebs" DependsOnTargets="_EnsureInstallerPrerequisites">
-    <PropertyGroup>
-      <NETCoreApp21DebVersion>$(MicrosoftNETCoreApp21PackageVersion)</NETCoreApp21DebVersion>
+  <PropertyGroup>
+      <Deb_DotnetRuntimeDependencyId>dotnet-runtime-$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</Deb_DotnetRuntimeDependencyId>
+      <Deb_DotnetRuntimeDependencyVersion>$(MicrosoftNETCoreAppPackageVersion)</Deb_DotnetRuntimeDependencyVersion>
       <!-- Needed some creativity to convert the PackageVersion M.N.P-Build to the installer version M.N.P~Build, The conditional handles stabilized builds -->
-      <NETCoreApp21DebVersion Condition="$(NETCoreApp21DebVersion.Contains('-'))">$(NETCoreApp21DebVersion.Substring(0, $(NETCoreApp21DebVersion.IndexOf('-'))))~$(NETCoreApp21DebVersion.Substring($([MSBuild]::Add($(NETCoreApp21DebVersion.IndexOf('-')), 1))))</NETCoreApp21DebVersion>
+      <Deb_DotnetRuntimeDependencyVersion Condition="$(Deb_DotnetRuntimeDependencyVersion.Contains('-'))">$(Deb_DotnetRuntimeDependencyVersion.Substring(0, $(Deb_DotnetRuntimeDependencyVersion.IndexOf('-'))))~$(Deb_DotnetRuntimeDependencyVersion.Substring($([MSBuild]::Add($(Deb_DotnetRuntimeDependencyVersion.IndexOf('-')), 1))))</Deb_DotnetRuntimeDependencyVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <_DebSharedFxDependencies Include="$(DotnetRuntimeInstallerPrefix)" Version="$(NETCoreApp21DebVersion)"/>
+      <_DebSharedFxDependencies Include="$(Deb_DotnetRuntimeDependencyId)" Version="$(Deb_DotnetRuntimeDependencyVersion)"/>
     </ItemGroup>
 
     <PropertyGroup>