From a6a5e4ea10b72b4502975af6314645da0690bb63 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 20 Apr 2018 18:56:17 -0700
Subject: [PATCH] Simplify building Microsoft.AspNetCore.Razor.Design

---
 .../Microsoft.AspNetCore.Razor.Design.csproj  | 109 +++++-------------
 .../Microsoft.AspNetCore.Razor.Design.nuspec  |   4 +-
 .../Microsoft.AspNetCore.Razor.Tasks.csproj   |   2 +
 .../AppWithP2PReference.csproj                |   2 +-
 .../testapps/ClassLibrary/ClassLibrary.csproj |   2 +-
 .../ClassLibrary2/ClassLibrary2.csproj        |   2 +-
 test/testapps/SimpleMvc/SimpleMvc.csproj      |   2 +-
 .../SimpleMvcFSharp/SimpleMvcFSharp.fsproj    |   2 +-
 test/testapps/SimplePages/SimplePages.csproj  |   2 +-
 9 files changed, 41 insertions(+), 86 deletions(-)

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 13ab584df8..f1a883c4bf 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
@@ -1,14 +1,12 @@
-<Project>
-
-  <!-- Using explicit SDK imports here because the default way conflicts with the AfterBuild target -->
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains MSBuild support for Razor.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
 
     <!-- This project doesn't have any code, so don't include it in the .nupkg -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
   </PropertyGroup>
@@ -20,84 +18,27 @@
     We then need to include the output of those projects in our output directory (where it will be used
     by tests) and in the nukpg.
   -->
-
-  <!-- This is the tasks project that needs to be included in the package. -->
-  <ItemGroup>
-    <TaskProject Include="..\Microsoft.AspNetCore.Razor.Tasks\Microsoft.AspNetCore.Razor.Tasks.csproj" />
-  </ItemGroup>
-
   <!-- These are tools that need to be included in the package. -->
-  <ItemGroup>
-    <ToolProject Include="..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj" />
-  </ItemGroup>
-
-  <!-- Using explicit SDK imports here because the default way conflicts with the AfterBuild target -->
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <GenerateNuspecDependsOn>_BuildDependencyProjects;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
-    <BuildDependsOn>_BuildDependencyProjects;$(BuildDependsOn)</BuildDependsOn>
+    <ToolProject>..\Microsoft.AspNetCore.Razor.Tools\Microsoft.AspNetCore.Razor.Tools.csproj</ToolProject>
+    <TaskProject>Microsoft.AspNetCore.Razor.Tasks</TaskProject>
   </PropertyGroup>
 
-  <Target Name="_BuildDependencyProjects">
-    <!-- 
-      The Microsoft.AspNetCore.Razor.Tasks package needs to support both net46 and netstandard2.0 for desktop vs
-      coreclr MSBuild - so we have to build it twice.
+  <ItemGroup>
+    <ProjectReference Include="..\$(TaskProject)\$(TaskProject).csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="$(ToolProject)" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='netcoreapp2.0'" />
+  </ItemGroup>
 
-      We're careful here to avoid setting properties when building the other projects. This can create problems
-      with concurrency.
-
-      First, build the project, then copy it to the ouput directory, then add it as packable content.
-    -->
-    <MSBuild Projects="@(TaskProject)" />
-
-    <MSBuild Projects="@(TaskProject)" Properties="TargetFramework=net46" Targets="BuiltProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="TaskAssemblyNet46" />
-    </MSBuild>
-
-    <MSBuild Projects="@(TaskProject)" Properties="TargetFramework=net46" Targets="DebugSymbolsProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="TaskSymbolNet46" />
-    </MSBuild>
-
-    <MSBuild Projects="@(TaskProject)" Properties="TargetFramework=netstandard2.0" Targets="BuiltProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="TaskAssemblyNetStandard" />
-    </MSBuild>
-
-    <MSBuild Projects="@(TaskProject)" Properties="TargetFramework=netstandard2.0" Targets="DebugSymbolsProjectOutputGroup">
-      <Output TaskParameter="TargetOutputs" ItemName="TaskSymbolNetStandard" />
-    </MSBuild>
-
-    <Copy SourceFiles="@(TaskAssemblyNet46)" DestinationFolder="$(OutputPath)\tasks\net46\">
-      <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
-    </Copy>
-    <Copy SourceFiles="@(TaskAssemblyNetStandard)" DestinationFolder="$(OutputPath)\tasks\netstandard2.0\">
-      <Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
-    </Copy>
-
-    <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. 
-    -->
-    <RemoveDir Directories="tools\" />
-    <MSBuild Projects="@(ToolProject)" />
-    <MSBuild Projects="@(ToolProject)" Properties="PublishDir=$(MSBuildProjectDirectory)\$(OutputPath)tools\" Targets="Publish" />
-
-    <ItemGroup>
-      <_RazorTool Include="$(OutputPath)tools\**\*" />
-    </ItemGroup>
-
-    <Error Text="_RazorTool is empty. This is a bug" Condition="'@(_RazorTool)'==''" />
-  </Target>
-
-  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;_BuildDependencyProjects">
+  <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec">
 
     <PropertyGroup>
       <!-- Make sure we create a symbols.nupkg. -->
       <IncludeSymbols>true</IncludeSymbols>
 
+      <!-- RepositoryCommit is only available when "build" runs, but not during dotnet pack -->
+      <RepositoryCommit Condition="'$(RepositoryCommit)' == ''">unknown</RepositoryCommit>
+
       <NuspecProperties>
         id=$(PackageId);
         version=$(PackageVersion);
@@ -112,14 +53,26 @@
         copyright=$(Copyright);
 
         <!-- Include the assembly and symbols from the tasks project -->
-        TaskAssemblyNet46=@(TaskAssemblyNet46);
-        TaskSymbolNet46=@(TaskSymbolNet46);
-        TaskAssemblyNetStandard=@(TaskAssemblyNetStandard);
-        TaskSymbolNetStandard=@(TaskSymbolNetStandard);
+        TaskAssemblyNet46=$(OutputPath)tasks\net46\$(TaskProject).dll;
+        TaskSymbolNet46=$(OutputPath)tasks\net46\$(TaskProject).pdb;
+        TaskAssemblyNetStandard=$(OutputPath)tasks\netstandard2.0\$(TaskProject).dll;
+        TaskSymbolNetStandard=$(OutputPath)tasks\netstandard2.0\$(TaskProject).pdb;
 
         <!-- Include the assembly and symbols from the tools project -->
-        ToolAssembly=$(OutputPath)tools\**\*;
+        ToolFiles=$(OutputPath)tools\**\*;
       </NuspecProperties>
     </PropertyGroup>
   </Target>
+
+  <Target Name="LayoutDependencies" AfterTargets="Build" BeforeTargets="PopulateNuspec" Condition="'$(IsInnerBuild)'!='true'">
+    <RemoveDir Directories="$(OutputPath)tools\" />
+    <MSBuild Projects="$(ToolProject)" Properties="PublishDir=$(MSBuildProjectDirectory)\$(OutputPath)tools\;TargetFramework=netcoreapp2.0" Targets="Publish" />
+
+    <ItemGroup>
+      <_RazorTool Include="$(OutputPath)tools\**\*" />
+    </ItemGroup>
+
+    <Error Text="_RazorTool is empty. This is a bug" Condition="'@(_RazorTool)'==''" />
+  </Target>
+
 </Project>
diff --git a/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec
index 687b5cf1d8..47d16cd554 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec
+++ b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.nuspec
@@ -26,6 +26,6 @@
     <file src="$TaskSymbolNet46$" target="tasks\net46\" />
     <file src="$TaskAssemblyNetStandard$" target="tasks\netstandard2.0\" />
     <file src="$TaskSymbolNetStandard$" target="tasks\netstandard2.0\" />
-    <file src="$ToolAssembly$" target="tools\" exclude="**\*.xml" />
+    <file src="$ToolFiles$" target="tools\" exclude="**\*.xml" />
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj b/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj
index 79eefc909b..c39999ba4c 100644
--- a/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Tasks/Microsoft.AspNetCore.Razor.Tasks.csproj
@@ -9,6 +9,8 @@
     <!-- This is not a package, it is part of Microsoft.AspNetCore.Razor.Design. -->
     <IsPackable>false</IsPackable>
     <EnableApiCheck>false</EnableApiCheck>
+
+    <OutputPath>..\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\tasks\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj b/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
index b0ca8cfd76..aa525839e7 100644
--- a/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
+++ b/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
+    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
   </PropertyGroup>
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
 
diff --git a/test/testapps/ClassLibrary/ClassLibrary.csproj b/test/testapps/ClassLibrary/ClassLibrary.csproj
index 93f2b997a9..fc5b647326 100644
--- a/test/testapps/ClassLibrary/ClassLibrary.csproj
+++ b/test/testapps/ClassLibrary/ClassLibrary.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
+    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
   </PropertyGroup>
 
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
diff --git a/test/testapps/ClassLibrary2/ClassLibrary2.csproj b/test/testapps/ClassLibrary2/ClassLibrary2.csproj
index 86cbd96b61..110d5df467 100644
--- a/test/testapps/ClassLibrary2/ClassLibrary2.csproj
+++ b/test/testapps/ClassLibrary2/ClassLibrary2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
+    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
   </PropertyGroup>
 
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
diff --git a/test/testapps/SimpleMvc/SimpleMvc.csproj b/test/testapps/SimpleMvc/SimpleMvc.csproj
index 21ea1afc3c..289aa1f146 100644
--- a/test/testapps/SimpleMvc/SimpleMvc.csproj
+++ b/test/testapps/SimpleMvc/SimpleMvc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
+    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
   </PropertyGroup>
 
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
diff --git a/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj b/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
index 4e469df733..21531d14bc 100644
--- a/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
+++ b/test/testapps/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
+    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
   </PropertyGroup>
 
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />
diff --git a/test/testapps/SimplePages/SimplePages.csproj b/test/testapps/SimplePages/SimplePages.csproj
index 2928d33d45..ba3fcfe487 100644
--- a/test/testapps/SimplePages/SimplePages.csproj
+++ b/test/testapps/SimplePages/SimplePages.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\netstandard2.0\</_RazorMSBuildRoot>
+    <_RazorMSBuildRoot>$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\bin\$(Configuration)\</_RazorMSBuildRoot>
   </PropertyGroup>
 
   <Import Project="$(SolutionRoot)src\Microsoft.AspNetCore.Razor.Design\build\netstandard2.0\Microsoft.AspNetCore.Razor.Design.props" />