From 7bbfd2dcade7596e5615105952d7e1ad6cb035d5 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 5 Jan 2018 16:34:39 -0800
Subject: [PATCH] Rename intermediate sharedfx archive to avoid conflicts with
 final file (#755)

---
 build/SharedFx.props            | 9 ++++++++-
 build/SharedFx.targets          | 2 +-
 build/SharedFxInstaller.targets | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/build/SharedFx.props b/build/SharedFx.props
index 49498b8f7d..3e9c4cb65e 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -17,6 +17,12 @@
 
     <!-- installers -->
     <SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>
+    <!--
+      This is named aspnetcore-runtime-internal because it only includes Microsoft.AspNetCore.All and is an intermediate file passed off to signing, installer generation, etc.
+      Subsequent build steps will combine this with Microsoft.NETCore.App and produce final tarballs/zips.
+    -->
+    <SharedFxIntermediateArchiveBaseName>$(SharedFxInstallerName)-internal</SharedFxIntermediateArchiveBaseName>
+
     <DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile>
 
     <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>
@@ -26,7 +32,8 @@
     <DotnetRuntimeInstallerName>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerName>
     <DotnetRuntimeInstallerArchiveName>$(DotnetRuntimeInstallerName)-linux-x64.tar.gz</DotnetRuntimeInstallerArchiveName>
     <RuntimeTargzLink>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerArchiveName)</RuntimeTargzLink>
-    <SharedFxLinuxArchiveFilePath>$(_SharedFxSourceDir)$(SharedFxInstallerName)-$(PackageVersion)-linux-x64.tar.gz</SharedFxLinuxArchiveFilePath>
+
+    <SharedFxLinuxIntermediateArchiveFilePath>$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)-linux-x64.tar.gz</SharedFxLinuxIntermediateArchiveFilePath>
 
     <!-- installer metadata -->
     <MaintainerName>Microsoft</MaintainerName>
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 74bf172878..d29fe48b0d 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -292,7 +292,7 @@
 
     <!-- Create archive -->
     <ZipArchive
-      File="$(SharedFxOutputPath)$(SharedFxInstallerName)-$(PackageVersion)-$(SharedFxRID).zip"
+      File="$(SharedFxOutputPath)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)-$(SharedFxRID).zip"
       SourceFiles="@(OutputZipFiles)"
       WorkingDirectory="$(SharedFxIntermediateOutputPath)"
       Overwrite="true"/>
diff --git a/build/SharedFxInstaller.targets b/build/SharedFxInstaller.targets
index 2dfb8112b2..0822275e8c 100644
--- a/build/SharedFxInstaller.targets
+++ b/build/SharedFxInstaller.targets
@@ -10,7 +10,7 @@
     </Exec>
 
     <Error Text="Docker host must be using Linux containers." Condition="'$(DockerHostOS)' != 'linux'"/>
-    <Error Text="Linux archive not found at $(SharedFxLinuxArchiveFilePath)." Condition="!Exists('$(SharedFxLinuxArchiveFilePath)')" />
+    <Error Text="Linux archive not found at $(SharedFxLinuxIntermediateArchiveFilePath)." Condition="!Exists('$(SharedFxLinuxIntermediateArchiveFilePath)')" />
   </Target>
 
   <Target Name="_DownloadInstallers">
@@ -29,7 +29,7 @@
     <MakeDir Directories="$(_WorkRoot)" />
 
     <!-- Create layout: Aspnet Runtime  -->
-    <Exec Command="tar -xzf $(SharedFxLinuxArchiveFilePath) -C $(_WorkRoot)" />
+    <Exec Command="tar -xzf $(SharedFxLinuxIntermediateArchiveFilePath) -C $(_WorkRoot)" />
     <Exec Command="tar -xzf $(_InstallerSourceDir)$(DotnetRuntimeInstallerArchiveName) -C $(_WorkRoot)" />
 
     <!-- Create Aspnet Runtime tar.gz -->