From d5df2acd455c603ee78b21b047c1e4dab5d8388b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 17 Oct 2017 17:56:31 -0700
Subject: [PATCH] Put installers into artifacts/installers/ and the lzma into
 artifacts/lzma/

---
 build/PackageArchive.targets        | 7 ++++---
 build/RuntimeStoreInstaller.targets | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets
index 0d9af52cb4..e7819859d8 100644
--- a/build/PackageArchive.targets
+++ b/build/PackageArchive.targets
@@ -45,7 +45,8 @@
 
     <PropertyGroup>
       <FallbackStagingDir>$(_WorkRoot)obj\$(OutputPackageName)</FallbackStagingDir>
-      <FallbackOutputArchive>$(RepositoryRoot)artifacts\$(OutputPackageName).lzma</FallbackOutputArchive>
+      <FallbackOutputDir>$(ArtifactsDir)lzma\</FallbackOutputDir>
+      <FallbackOutputPath>$(FallbackOutputDir)$(OutputPackageName).lzma</FallbackOutputPath>
       <GeneratedFallbackRestoreSourcesPropsPath>$(_WorkRoot)restoresources.$(OutputPackageName).props</GeneratedFallbackRestoreSourcesPropsPath>
     </PropertyGroup>
 
@@ -59,7 +60,7 @@
       OutputPath="$(GeneratedFallbackRestoreSourcesPropsPath)" />
 
     <!-- Create the Staging Dir -->
-    <MakeDir Directories="$(FallbackStagingDir)" />
+    <MakeDir Directories="$(FallbackStagingDir);$(FallbackOutputDir)" />
 
     <!-- Restore the target project -->
     <MSBuild
@@ -68,6 +69,6 @@
       Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true" />
 
     <!-- Create the archive -->
-    <Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" />
+    <Exec Command="$(ArchiverPath) -a $(FallbackOutputPath) $(FallbackStagingDir)" />
   </Target>
 </Project>
diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets
index bbeb93a645..8e8ac07495 100644
--- a/build/RuntimeStoreInstaller.targets
+++ b/build/RuntimeStoreInstaller.targets
@@ -11,6 +11,7 @@
     <_WorkLayoutDir>$(_WorkRoot).l\</_WorkLayoutDir>
     <_WorkOutputDir>$(_WorkRoot).o\</_WorkOutputDir>
     <_DockerRootDirectory>/opt/code/</_DockerRootDirectory>
+    <InstallersOutputDir>$(ArtifactsDir)installers\</InstallersOutputDir>
 
     <RSInstallerName>aspnetcore-store</RSInstallerName>
     <HostingInstallerName>dotnet-hosting</HostingInstallerName>
@@ -69,7 +70,7 @@
     <Exec Command="tar -xzf $(RuntimeArchive) -C $(_WorkRoot)" />
 
     <!-- Create Aspnet Hosting Bundle tar.gz -->
-    <Exec Command="tar -czvf $(ArtifactsDir)$(HostingArchiveName) ." WorkingDirectory="$(_WorkRoot)"/>
+    <Exec Command="tar -czvf $(InstallersOutputDir)$(HostingArchiveName) ." WorkingDirectory="$(_WorkRoot)"/>
   </Target>
 
   <Target Name="GenerateTargzs" DependsOnTargets="_EnsureInstallerPrerequisites;_DownloadCoreInstallers">
@@ -143,7 +144,7 @@
         -s dir
         -t rpm
         -n $(RPMInstallerPrefix)-$(RPMVersion)
-        -p $(_DockerRootDirectory)artifacts/$(RPMInstallerPrefix)-$(RPMVersion)-$(RPMFileSuffix)
+        -p $(_DockerRootDirectory)artifacts/installers/$(RPMInstallerPrefix)-$(RPMVersion)-$(RPMFileSuffix)
         -v $(RPMVersion)
         --iteration $(RPMRevision)
         -a amd64
@@ -355,7 +356,7 @@
     <Error Text="@(GeneratedDebFiles->Count()) deb installer files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
 
     <Copy
-      DestinationFiles="$(ArtifactsDir)$(DebPrefix)-$(DebVersion)-$(Image)-x64.deb"
+      DestinationFiles="$(InstallersOutputDir)$(DebPrefix)-$(DebVersion)-$(Image)-x64.deb"
       SourceFiles="@(GeneratedDebFiles)"
       OverwriteReadOnlyFiles="True"
       SkipUnchangedFiles="False"