From 0554b12109e32e5bcc192fec4218c05412e84ae5 Mon Sep 17 00:00:00 2001
From: = <jt.luo@mail.utoronto.ca>
Date: Tue, 12 Dec 2017 02:22:33 -0800
Subject: [PATCH] Delay building metapackage to after runtime store generation

Wait for all manifests to be generated
---
 build/PackageArchive.targets |  5 +++++
 build/RuntimeStore.targets   | 27 ++++++---------------------
 build/repo.targets           |  2 +-
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets
index 7688976518..a9b247cf29 100644
--- a/build/PackageArchive.targets
+++ b/build/PackageArchive.targets
@@ -34,6 +34,11 @@
     <!-- Copy the archive template -->
     <Copy SourceFiles="$(_TemplatesDirectory)Archive\Archive.csproj" DestinationFiles="$(_WorkRoot)Archive.csproj" />
 
+    <!-- Add .All metapacakge to PackageArtifact for LZMA generation -->
+    <ItemGroup>
+      <PackageArtifact Include="Microsoft.AspNetCore.All" LZMA="true" />
+    </ItemGroup>
+
     <!-- Copy the archive template -->
     <RepoTasks.AddArchiveReferences
       ReferencePackagePath="$(_WorkRoot)Archive.csproj"
diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets
index 89a0e289b1..18d79a1ae9 100644
--- a/build/RuntimeStore.targets
+++ b/build/RuntimeStore.targets
@@ -28,11 +28,17 @@
     </PropertyGroup>
     <ItemGroup>
       <AllMetapackageFiles Include="$(_AllMetapackageDirectory)**\*" />
+      <ManifestFiles Include="$(ArtifactsDir)*.xml" />
     </ItemGroup>
 
     <Copy SourceFiles="@(AllMetapackageFiles)" DestinationFolder="$(MetapackageWorkDirectory)\%(RecursiveDir)" />
     <Copy SourceFiles="$(_SrcDirectory)Directory.Build.props" DestinationFolder="$(_WorkRoot)" />
 
+    <!-- Create a consolidated manifest and place in metapackage -->
+    <RepoTasks.ConsolidateManifests
+      Manifests="@(ManifestFiles)"
+      ManifestDestination="$(MetapackageWorkDirectory)build\aspnetcore-store-$(PackageVersion).xml"/>
+
     <!-- Add references to project -->
     <RepoTasks.AddMetapackageReferences
       ReferencePackagePath="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
@@ -224,25 +230,4 @@
       NewManifests="$(ArtifactsDir)$(CommonManifestFileName)"
       ManifestDestination="$(ArtifactsDir)$(CommonManifestFileName)"/>
   </Target>
-
-  <Target Name="AddManifestsToMetapackage">
-    <ItemGroup>
-      <MetaPackageNupkg Include="$(_DependencyBuildDirectory)Microsoft.AspNetCore.All.*.nupkg" />
-      <ManifestFiles Include="$(ArtifactsDir)*.xml"/>
-    </ItemGroup>
-
-    <RemoveDir Directories="$(_WorkRoot)" />
-    <UnzipArchive File="%(MetaPackageNupkg.FullPath)" Destination="$(_WorkRoot)" />
-
-    <!-- Create a consolidated manifest and place in metapackage -->
-    <RepoTasks.ConsolidateManifests
-      Manifests="@(ManifestFiles)"
-      ManifestDestination="$(_WorkRoot)\build\aspnetcore-store-$(PackageVersion).xml"/>
-
-    <ItemGroup>
-      <ArchiveFiles Include="$(_WorkRoot)**\*" />
-    </ItemGroup>
-
-    <ZipArchive File="$(ArtifactsDir)%(MetaPackageNupkg.FileName)%(MetaPackageNupkg.Extension)" SourceFiles="@(ArchiveFiles)" WorkingDirectory="$(_WorkRoot)" Overwrite="true" />
-  </Target>
 </Project>
diff --git a/build/repo.targets b/build/repo.targets
index 59ffa75e74..788f91ad93 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -24,7 +24,7 @@
     <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
     <RestoreDependsOn>$(RestoreDependsOn);RestoreExternalDependencies</RestoreDependsOn>
     <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
-    <PackageDependsOn>$(PackageDependsOn);BuildAllMetapackage;BuildTemplates;SplitPackages</PackageDependsOn>
+    <PackageDependsOn>$(PackageDependsOn);BuildTemplates;SplitPackages</PackageDependsOn>
     <VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn>
   </PropertyGroup>