From 9a17a343cc308fde854088e46a0913d492440036 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Tue, 27 Feb 2018 20:22:19 +0000
Subject: [PATCH] Ensure Microsoft.AspNetCore.Blazor.Build is packed in a
 post-publish form so it's cross-plat compatible

---
 build/aspnetci-build.ps1                      |  1 -
 .../Microsoft.AspNetCore.Blazor.Build.csproj  | 24 ++++++++++++++-----
 .../Microsoft.AspNetCore.Blazor.Build.nuspec  |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/build/aspnetci-build.ps1 b/build/aspnetci-build.ps1
index 7a705aa986..29839d7b30 100644
--- a/build/aspnetci-build.ps1
+++ b/build/aspnetci-build.ps1
@@ -1,5 +1,4 @@
 Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1' -OutFile .\build\dotnet-install.ps1
 .\build\dotnet-install.ps1 -channel Current -version 2.1.3 -InstallDir dotnetsdk
-Get-Command dotnet | Format-List source
 dotnet --version
 dotnet pack Blazor.sln --configuration Release
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
index 9548254768..ecdf6366d3 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -1,18 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <OutDir>tools</OutDir>
+    <OutDir>tools</OutDir> <!-- So we can use the tool from source within the repo without having to pack -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-  <Target Name="SetPackageProperties" BeforeTargets="_IntermediatePack">
+  <!-- Pack settings -->
+  <PropertyGroup>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NuspecFile>Microsoft.AspNetCore.Blazor.Build.nuspec</NuspecFile>
+    <IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
+    <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
+  </PropertyGroup>
+
+  <!-- Executes /t:Publish for all target frameworks before packing-->
+  <Target Name="PublishAll" BeforeTargets="_IntermediatePack">
     <PropertyGroup>
-      <NoPackageAnalysis>true</NoPackageAnalysis>
-      <NuspecFile>Microsoft.AspNetCore.Blazor.Build.nuspec</NuspecFile>
-      <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
+      <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+      <NuspecProperties>version=$(PackageVersion);publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
     </PropertyGroup>
+    <ItemGroup>
+      <_TargetFramework Include="$(TargetFrameworks)" />
+    </ItemGroup>
+    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
   </Target>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
index b4b819f3e7..4ab560422b 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
@@ -10,6 +10,6 @@
     <file src="_._" target="lib/netstandard1.0/" />
     <file src="build\**" target="build" />
     <file src="targets\**" target="targets" />
-    <file src="tools\**" target="tools" />
+    <file src="$publishdir$\netcoreapp2.0\**\*" target="tools/" />
   </files>
 </package>