From 2f9515785e635a80a61af6f2669283b1a53327a4 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 26 Feb 2018 16:22:06 +0000
Subject: [PATCH] Fixes for Microsoft.AspNetCore.Blazor.Build package layout

---
 .../Microsoft.AspNetCore.Blazor.Build.csproj                 | 5 ++---
 .../Microsoft.AspNetCore.Blazor.Build.nuspec                 | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

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 0b9bbb9e2a..916968fa23 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -6,11 +6,10 @@
     <OutDir>tools</OutDir>
   </PropertyGroup>
 
-  <Target Name="SetPackageProperties" BeforeTargets="Pack">
+  <Target Name="SetPackageProperties" BeforeTargets="_IntermediatePack">
     <PropertyGroup>
       <NoPackageAnalysis>true</NoPackageAnalysis>
-      <NuspecFile>Microsoft.AspNetCore.Blazor.BuildTools.nuspec</NuspecFile>
-      <PackageVersion>0.0.1</PackageVersion>
+      <NuspecFile>Microsoft.AspNetCore.Blazor.Build.nuspec</NuspecFile>
       <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
     </PropertyGroup>
   </Target>
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..7429d76ba2 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Microsoft.AspNetCore.Blazor.Build.nuspec
@@ -11,5 +11,6 @@
     <file src="build\**" target="build" />
     <file src="targets\**" target="targets" />
     <file src="tools\**" target="tools" />
+    <file src="tools\Microsoft.AspNetCore.Blazor.Build.dll"  target="tools\blazor.dll" />
   </files>
 </package>