From 7390af168177d23bb000ded0419bf7e340b1cbdf Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Wed, 13 Dec 2017 11:10:41 +0000
Subject: [PATCH] Make the BuildTools project consumable either as a NuGet
 package or locally by importing a .proj

---
 .../HostedInAspNet.Client.csproj              |  5 +++--
 .../MonoSanityClient/MonoSanityClient.csproj  |  4 ++--
 samples/StandaloneApp/StandaloneApp.csproj    | 20 ++++++-------------
 .../Microsoft.Blazor.Browser.csproj           |  5 ++---
 src/Microsoft.Blazor.BuildTools/.gitignore    |  1 +
 .../BlazorBuild.targets                       | 13 ------------
 .../{ => Commands}/CheckNodeJsInstalled.cs    |  7 +++++--
 .../{ => Cli}/Program.cs                      |  6 ++++--
 .../Microsoft.Blazor.BuildTools.csproj        |  9 +++++++++
 .../Microsoft.Blazor.BuildTools.nuspec        | 15 ++++++++++++++
 .../ReferenceFromSource.props                 | 19 ++++++++++++++++++
 src/Microsoft.Blazor.BuildTools/_._           |  1 +
 .../Microsoft.Blazor.BuildTools.targets       |  3 +++
 src/Microsoft.Blazor.BuildTools/local.props   |  7 -------
 .../targets/All.targets                       | 17 ++++++++++++++++
 15 files changed, 87 insertions(+), 45 deletions(-)
 create mode 100644 src/Microsoft.Blazor.BuildTools/.gitignore
 delete mode 100644 src/Microsoft.Blazor.BuildTools/BlazorBuild.targets
 rename src/Microsoft.Blazor.BuildTools/Cli/{ => Commands}/CheckNodeJsInstalled.cs (91%)
 rename src/Microsoft.Blazor.BuildTools/{ => Cli}/Program.cs (74%)
 create mode 100644 src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.nuspec
 create mode 100644 src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props
 create mode 100644 src/Microsoft.Blazor.BuildTools/_._
 create mode 100644 src/Microsoft.Blazor.BuildTools/build/netstandard1.0/Microsoft.Blazor.BuildTools.targets
 delete mode 100644 src/Microsoft.Blazor.BuildTools/local.props
 create mode 100644 src/Microsoft.Blazor.BuildTools/targets/All.targets

diff --git a/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj
index 0353426122..e92f53de16 100644
--- a/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj
+++ b/samples/HostedInAspNet.Client/HostedInAspNet.Client.csproj
@@ -4,10 +4,11 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
-  <!-- In real apps, the following items would come from the Microsoft.Blazor package -->
-  <Import Project="..\..\src\Microsoft.Blazor.BuildTools\BlazorBuild.targets" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Blazor\Microsoft.Blazor.csproj" />
   </ItemGroup>
 
+  <!-- Local alternative to <PackageReference Include="Microsoft.Blazor.BuildTools" /> -->
+  <Import Project="..\..\src\Microsoft.Blazor.BuildTools\ReferenceFromSource.props" />
+
 </Project>
diff --git a/samples/MonoSanityClient/MonoSanityClient.csproj b/samples/MonoSanityClient/MonoSanityClient.csproj
index 25118beeae..d0452838d1 100644
--- a/samples/MonoSanityClient/MonoSanityClient.csproj
+++ b/samples/MonoSanityClient/MonoSanityClient.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
-  <!-- In real apps, the following items would come from the Microsoft.Blazor package -->
-  <Import Project="..\..\src\Microsoft.Blazor.BuildTools\BlazorBuild.targets" />
+  <!-- Local alternative to <PackageReference Include="Microsoft.Blazor.BuildTools" /> -->
+  <Import Project="..\..\src\Microsoft.Blazor.BuildTools\ReferenceFromSource.props" />
 
 </Project>
diff --git a/samples/StandaloneApp/StandaloneApp.csproj b/samples/StandaloneApp/StandaloneApp.csproj
index bee8b11b96..b80bb49f90 100644
--- a/samples/StandaloneApp/StandaloneApp.csproj
+++ b/samples/StandaloneApp/StandaloneApp.csproj
@@ -2,24 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+
+    <!-- Local alternative to <RunArguments>blazor serve</RunArguments> -->
+    <RunArguments>run --project ..\..\src\Microsoft.Blazor.DevHost serve</RunArguments>
   </PropertyGroup>
 
-  <!--
-    The following is an alternative to referencing Microsoft.Blazor.DevHost as
-    a <DotNetCliToolReference>. This is so that Microsoft.Blazor.DevHost gets
-    compiled from source.
-  -->
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.Blazor.DevHost\Microsoft.Blazor.DevHost.csproj" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <PropertyGroup>
-    <RunArguments>run --project ..\..\src\Microsoft.Blazor.DevHost --no-build serve</RunArguments>
-  </PropertyGroup>
-
-  <!-- In real apps, the following items would come from the Microsoft.Blazor package -->
-  <Import Project="..\..\src\Microsoft.Blazor.BuildTools\BlazorBuild.targets" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Blazor\Microsoft.Blazor.csproj" />
   </ItemGroup>
 
+  <!-- Local alternative to <PackageReference Include="Microsoft.Blazor.BuildTools" /> -->
+  <Import Project="..\..\src\Microsoft.Blazor.BuildTools\ReferenceFromSource.props" />
+
 </Project>
diff --git a/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj b/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj
index f506a70c31..666d9f2cd8 100644
--- a/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj
+++ b/src/Microsoft.Blazor.Browser/Microsoft.Blazor.Browser.csproj
@@ -16,13 +16,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Blazor.BuildTools\Microsoft.Blazor.BuildTools.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\Microsoft.Blazor.Common\Microsoft.Blazor.Common.csproj" />
   </ItemGroup>
-  <Import Project="..\Microsoft.Blazor.BuildTools\local.props" />
+  <Import Project="..\Microsoft.Blazor.BuildTools\ReferenceFromSource.props" />
 
   <Target Name="EnsureNpmRestored" Condition="!Exists('node_modules')">
-    <Exec Command="$(BlazorBuildTools) checknodejs -v 8.3.0" />
+    <Exec Command="$(BlazorBuildToolsExe) checknodejs -v 8.3.0" />
     <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
     <Exec Command="npm install" />
   </Target>
diff --git a/src/Microsoft.Blazor.BuildTools/.gitignore b/src/Microsoft.Blazor.BuildTools/.gitignore
new file mode 100644
index 0000000000..b4a53f7bea
--- /dev/null
+++ b/src/Microsoft.Blazor.BuildTools/.gitignore
@@ -0,0 +1 @@
+/tools/
diff --git a/src/Microsoft.Blazor.BuildTools/BlazorBuild.targets b/src/Microsoft.Blazor.BuildTools/BlazorBuild.targets
deleted file mode 100644
index dd1e0a8417..0000000000
--- a/src/Microsoft.Blazor.BuildTools/BlazorBuild.targets
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-    <Target Name="GenerateBlazorMetadataFile" BeforeTargets="GetCopyToOutputDirectoryItems">
-        <PropertyGroup>
-            <BlazorMetadataFileName>$(AssemblyName).blazor.config</BlazorMetadataFileName>
-            <BlazorMetadataFilePath>$(TargetDir)$(BlazorMetadataFileName)</BlazorMetadataFilePath>
-        </PropertyGroup>
-        <WriteLinesToFile File="$(BlazorMetadataFilePath)" Lines="$(MSBuildProjectFullPath)" Overwrite="true" Encoding="Unicode"/>
-        <WriteLinesToFile File="$(BlazorMetadataFilePath)" Lines="$(OutDir)$(AssemblyName).dll" Overwrite="false" Encoding="Unicode"/>
-        <ItemGroup>
-            <ContentWithTargetPath Include="$(BlazorMetadataFilePath)" TargetPath="$(BlazorMetadataFileName)" CopyToOutputDirectory="PreserveNewest" />
-        </ItemGroup>
-    </Target>
-</Project>
diff --git a/src/Microsoft.Blazor.BuildTools/Cli/CheckNodeJsInstalled.cs b/src/Microsoft.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalled.cs
similarity index 91%
rename from src/Microsoft.Blazor.BuildTools/Cli/CheckNodeJsInstalled.cs
rename to src/Microsoft.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalled.cs
index a3c7dc0bcb..b2152d7623 100644
--- a/src/Microsoft.Blazor.BuildTools/Cli/CheckNodeJsInstalled.cs
+++ b/src/Microsoft.Blazor.BuildTools/Cli/Commands/CheckNodeJsInstalled.cs
@@ -1,9 +1,12 @@
-using Microsoft.Extensions.CommandLineUtils;
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.CommandLineUtils;
 using System;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.Blazor.BuildTools.Cli
+namespace Microsoft.Blazor.BuildTools.Cli.Commands
 {
     class CheckNodeJsInstalled
     {
diff --git a/src/Microsoft.Blazor.BuildTools/Program.cs b/src/Microsoft.Blazor.BuildTools/Cli/Program.cs
similarity index 74%
rename from src/Microsoft.Blazor.BuildTools/Program.cs
rename to src/Microsoft.Blazor.BuildTools/Cli/Program.cs
index 15f04c04fb..9c2f3e6beb 100644
--- a/src/Microsoft.Blazor.BuildTools/Program.cs
+++ b/src/Microsoft.Blazor.BuildTools/Cli/Program.cs
@@ -1,6 +1,8 @@
-using Microsoft.Blazor.BuildTools.Cli;
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Blazor.BuildTools.Cli.Commands;
 using Microsoft.Extensions.CommandLineUtils;
-using System;
 
 namespace Microsoft.Blazor.BuildTools
 {
diff --git a/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj b/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj
index d0d4f56387..c909827da6 100644
--- a/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj
+++ b/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.csproj
@@ -3,8 +3,17 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
+    <OutDir>tools</OutDir>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NuspecFile>Microsoft.Blazor.BuildTools.nuspec</NuspecFile>
+    <PackageVersion>0.0.1</PackageVersion>
+    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="tools\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
   </ItemGroup>
diff --git a/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.nuspec b/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.nuspec
new file mode 100644
index 0000000000..04049dc32d
--- /dev/null
+++ b/src/Microsoft.Blazor.BuildTools/Microsoft.Blazor.BuildTools.nuspec
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.Blazor.BuildTools</id>
+    <version>$version$</version>
+    <authors>Microsoft</authors>
+    <description>Build tools for Blazor applications.</description>
+  </metadata>
+  <files>
+    <file src="_._" target="lib/netstandard1.0/" />
+    <file src="build\**" target="build" />
+    <file src="targets\**" target="targets" />
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props b/src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props
new file mode 100644
index 0000000000..6de063b310
--- /dev/null
+++ b/src/Microsoft.Blazor.BuildTools/ReferenceFromSource.props
@@ -0,0 +1,19 @@
+<Project>
+  <!--
+  Importing this file is equivalent to having:
+    <PackageDependency Include="Microsoft.Blazor.BuildTools" />
+  ... except it's much more convenient when working in this repo, because it consumes the
+  BuildTools targets/exe directly without needing BuildTools to be packed into a .nupkg.
+  
+  This is only intended for use by other projects in this repo.
+  -->
+  
+  <Import Project="$(MSBuildThisFileDirectory)targets\All.targets" />
+
+  <ItemGroup>
+    <!-- Ensures BuildTools itself is built before the consuming project, but without
+         adding a runtime dependency on the .dll (to be equivalent to a <PackageDependency>
+         given that the packed version of BuildTools wouldn't add a .dll reference) -->
+    <ProjectReference Include="$(MSBuildThisFileDirectory)Microsoft.Blazor.BuildTools.csproj" ReferenceOutputAssembly="false" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/src/Microsoft.Blazor.BuildTools/_._ b/src/Microsoft.Blazor.BuildTools/_._
new file mode 100644
index 0000000000..5f282702bb
--- /dev/null
+++ b/src/Microsoft.Blazor.BuildTools/_._
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Microsoft.Blazor.BuildTools/build/netstandard1.0/Microsoft.Blazor.BuildTools.targets b/src/Microsoft.Blazor.BuildTools/build/netstandard1.0/Microsoft.Blazor.BuildTools.targets
new file mode 100644
index 0000000000..35115b33b3
--- /dev/null
+++ b/src/Microsoft.Blazor.BuildTools/build/netstandard1.0/Microsoft.Blazor.BuildTools.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\All.targets" />
+</Project>
diff --git a/src/Microsoft.Blazor.BuildTools/local.props b/src/Microsoft.Blazor.BuildTools/local.props
deleted file mode 100644
index 901679b7a6..0000000000
--- a/src/Microsoft.Blazor.BuildTools/local.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- To avoid repeatedly running up-to-date checks, rely on the project already being built. -->
-    <!-- For this to work, consumers will need to have a project reference to this project. -->
-    <BlazorBuildTools>dotnet run --no-build --project $(MSBuildThisFileDirectory)</BlazorBuildTools>
-  </PropertyGroup>
-</Project>
diff --git a/src/Microsoft.Blazor.BuildTools/targets/All.targets b/src/Microsoft.Blazor.BuildTools/targets/All.targets
new file mode 100644
index 0000000000..46b7f19d04
--- /dev/null
+++ b/src/Microsoft.Blazor.BuildTools/targets/All.targets
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <BlazorBuildToolsExe>dotnet $(MSBuildThisFileDirectory)..\tools\Microsoft.Blazor.BuildTools.dll</BlazorBuildToolsExe>
+  </PropertyGroup>
+
+  <Target Name="GenerateBlazorMetadataFile" BeforeTargets="GetCopyToOutputDirectoryItems">
+    <PropertyGroup>
+      <BlazorMetadataFileName>$(AssemblyName).blazor.config</BlazorMetadataFileName>
+      <BlazorMetadataFilePath>$(TargetDir)$(BlazorMetadataFileName)</BlazorMetadataFilePath>
+    </PropertyGroup>
+    <WriteLinesToFile File="$(BlazorMetadataFilePath)" Lines="$(MSBuildProjectFullPath)" Overwrite="true" Encoding="Unicode"/>
+    <WriteLinesToFile File="$(BlazorMetadataFilePath)" Lines="$(OutDir)$(AssemblyName).dll" Overwrite="false" Encoding="Unicode"/>
+    <ItemGroup>
+      <ContentWithTargetPath Include="$(BlazorMetadataFilePath)" TargetPath="$(BlazorMetadataFileName)" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
+  </Target>
+</Project>