From 2233481d341d3ca36c2ded9f0a8894ad93f86e1b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 1 Feb 2018 10:24:07 -0800
Subject: [PATCH] Ensure all packages are included in ArtifactInfo

---
 build/Publish.targets       |  9 +++++++--
 build/SharedFx.targets      | 18 ++++++++++++++++++
 build/Templating.targets    | 32 ++++++++++++++++++++++++--------
 src/Directory.Build.targets | 11 +++++++++++
 4 files changed, 60 insertions(+), 10 deletions(-)
 create mode 100644 src/Directory.Build.targets

diff --git a/build/Publish.targets b/build/Publish.targets
index 6b35b0ccb5..1c8cb52bed 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -55,7 +55,7 @@
       Value="$(PackageVersion)" />
   </Target>
 
-  <Target Name="GetFilesToPublish" DependsOnTargets="ResolveRepoInfo;GeneratePublishFiles">
+  <Target Name="GetFilesToPublish" DependsOnTargets="GetArtifactInfo;GeneratePublishFiles">
     <PropertyGroup>
       <BlobBasePath>Runtime/$(PackageVersion)/</BlobBasePath>
       <AliasBlobBasePath>Runtime/$(SharedFxCliBlobChannel)/</AliasBlobBasePath>
@@ -133,7 +133,12 @@
       <Output TaskParameter="JoinResult" ItemName="PackagesToPublish" />
     </RepoTasks.JoinItems>
 
-    <Message Text="@(FilesToPublish -> '%(FullPath) -> %(RelativeBlobPath)','%0A')" />
+    <ItemGroup>
+      <_MissingPackages Include="@(PackageArtifact)" />
+      <_MissingPackages Remove="%(PackagesToPublish.PackageId)" />
+    </ItemGroup>
+
+    <Error Text="Missing expected packages from PackagesToPublish: %0A - @(_MissingPackages, '%0A - ')" Condition="@(_MissingPackages->Count()) != 0" />
   </Target>
 
   <Target Name="_CheckFilesToPublish">
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index e99488ad7c..a6aca1bbb0 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -2,10 +2,28 @@
   <Import Project="common.props" />
   <Import Project="SharedFx.props" />
 
+  <PropertyGroup>
+    <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetMetapackageArtifactInfo</GetArtifactInfoDependsOn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
   </PropertyGroup>
 
+  <Target Name="GetMetapackageArtifactInfo">
+    <ItemGroup>
+      <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" />
+      <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" />
+      <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" />
+    </ItemGroup>
+
+    <MSBuild Projects="@(_MetapackageProject)"
+      Targets="GetArtifactInfo"
+      Properties="PackageOutputPath=$(BuildDir);BuildNumber=$(BuildNumber);DesignTimeBuild=true;IsFinalBuild=$(IsFinalBuild)">
+      <Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
+    </MSBuild>
+  </Target>
+
   <Target Name="_BuildMetapackage" DependsOnTargets="ResolveRepoInfo">
     <PropertyGroup>
       <MetapackageSource>$(_MetapackageSrcRoot)$(MetapackageName)\</MetapackageSource>
diff --git a/build/Templating.targets b/build/Templating.targets
index c199b1c775..8ef7591a43 100644
--- a/build/Templating.targets
+++ b/build/Templating.targets
@@ -1,24 +1,40 @@
 <Project>
   <PropertyGroup>
     <TemplatingProjectRoot>$(MSBuildThisFileDirectory)..\modules\Templating\</TemplatingProjectRoot>
+    <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetTemplateArtifactInfo</GetArtifactInfoDependsOn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <TemplateProjProperties>
+      RepositoryRoot=$(TemplatingProjectRoot);
+      BuildNumber=$(BuildNumber);
+      Configuration=$(Configuration);
+      IsFinalBuild=$(IsFinalBuild);
+    </TemplateProjProperties>
+  </PropertyGroup>
+
+  <Target Name="GetTemplateArtifactInfo">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+      Targets="GetArtifactInfo"
+      Properties="$(TemplateProjProperties);DesignTimeBuild=true">
+      <Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
+    </MSBuild>
+  </Target>
+
   <Target Name="BuildTemplates" DependsOnTargets="GeneratePropsFiles">
     <PropertyGroup>
-      <TemplateProjProperties>
-        RepositoryRoot=$(TemplatingProjectRoot);
+      <_BuildTemplateProjProperties>
+        $(TemplateProjProperties);
+        SkipAspNetCoreRuntimeInstall=true;
         DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath);
         DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
-        BuildNumber=$(BuildNumber);
-        Configuration=$(Configuration);
-        IsFinalBuild=$(IsFinalBuild);
-        SkipAspNetCoreRuntimeInstall=true;
-      </TemplateProjProperties>
+        SkipTests=true;
+      </_BuildTemplateProjProperties>
     </PropertyGroup>
 
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="CleanArtifacts;Build"
-             Properties="$(TemplateProjProperties);SkipTests=true" />
+             Properties="$(_BuildTemplateProjProperties)" />
 
     <ItemGroup>
       <TemplateArtifacts Include="$(TemplatingProjectRoot)artifacts\build\*" />
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
new file mode 100644
index 0000000000..db9b73869a
--- /dev/null
+++ b/src/Directory.Build.targets
@@ -0,0 +1,11 @@
+<Project>
+  <Target Name="GetArtifactInfo" Returns="@(ArtifactInfo)">
+    <ItemGroup>
+      <ArtifactInfo Include="$(PackageOutputPath)$(PackageId).$(PackageVersion).nupkg">
+        <ArtifactType>NuGetPackage</ArtifactType>
+        <PackageId>$(PackageId)</PackageId>
+        <Version>$(PackageVersion)</Version>
+      </ArtifactInfo>
+    </ItemGroup>
+  </Target>
+</Project>