From 54c8bc82db68248aa37d8612af6eef70296853b2 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Wed, 27 Dec 2017 16:49:01 -0800
Subject: [PATCH] Fix #1874 (#1879)

* Fix #1874

The tools and tasks were missing from the package.

Also added some hardening to the targets so we can detect regressions.
---
 NuGetPackageVerifier.json                           |  8 ++++++++
 .../Microsoft.AspNetCore.Razor.Design.csproj        | 13 +++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 1ec6f7c986..9c532a1121 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -8,6 +8,14 @@
       "RazorPageGenerator": {}
     }
   },
+  "razor-design": { // this is a 'fat' package that contains some assets we don't own
+    "rules": [
+      // Don't run any rules (temporary, tracked by #1887)
+    ],
+    "packages": {
+      "Microsoft.AspNetCore.Razor.Design": {}
+    }
+  },
   "Default": { // Rules to run for packages not listed in any other set.
     "rules": [
       "DefaultCompositeRule"
diff --git a/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
index af022ebf2b..6f98881739 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
@@ -49,7 +49,7 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_BuildDependencyProjects</GenerateNuspecDependsOn>
+    <GenerateNuspecDependsOn>_BuildDependencyProjects;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
     <BuildDependsOn>_BuildDependencyProjects;$(BuildDependsOn)</BuildDependsOn>
   </PropertyGroup>
 
@@ -91,6 +91,9 @@
       <None Include="@(TaskAssemblyNetStandard)" PackagePath="tasks\netstandard2.0\" Pack="true"/>
     </ItemGroup>
 
+    <Error Text="TaskAssemblyNet46 is empty. This is a bug" Condition="'@(TaskAssemblyNet46)'==''"/>
+    <Error Text="TaskAssemblyNetStandard is empty. This is a bug" Condition="'@(TaskAssemblyNetStandard)'==''"/>
+
     <!--
       Next we need to build the netcoreapp2.0 tools. In this case we need to do a publish, because we need
       all of the output to put in the package. 
@@ -103,7 +106,13 @@
       Targets="Publish"/>
 
     <ItemGroup>
-      <None Include="$(OutputPath)tools\**\*" Exclude="$(OutputPath)tools\**\*.xml;$(OutputPath)tools\**\*.pdb" PackagePath="tools\" Pack="true"/>      
+      <_RazorTool Include="$(OutputPath)tools\**\*" Exclude="$(OutputPath)tools\**\*.xml;$(OutputPath)tools\**\*.pdb" />
     </ItemGroup>
+
+    <ItemGroup>
+      <None Include="@(_RazorTool)" PackagePath="tools\" Pack="true"/>      
+    </ItemGroup>
+
+    <Error Text="_RazorTool is empty. This is a bug" Condition="'@(_RazorTool)'==''"/>
   </Target>
 </Project>
\ No newline at end of file