Add npm-shrinkwrap.json files for all templates

- declare explict @types/react-router version
- update to newer aspnet-webpack-react that doesn't include the hacky
workaround since it's not needed if you have the correct
@types/react-router version

In a subsequent commit, will also shrinkwrap to pin all dependency
versions. This isn't strictly required right now, but is the right thing
for long-term stability.

NuGet.config

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
+    <clear />
+    <add key="AspNetCorePreview2Final" value="https://dotnet.myget.org/F/dotnet-2-0-0-preview2-final/api/v3/index.json" />
+    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-release/api/v3/index.json" />
     <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>

build.ps1

@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP

build.sh

@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi

build/common.props

@@ -16,7 +16,8 @@
     <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
     <PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" />
+    <PackageReference Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
   </ItemGroup>
 </Project>

build/dependencies.props

@@ -1,11 +1,12 @@
 <Project>
   <PropertyGroup>
-    <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
+    <AspNetCoreVersion>2.0.0-preview2-*</AspNetCoreVersion>
     <AutoMapperVersion>5.0.2</AutoMapperVersion>
-    <CoreFxVersion>4.3.0</CoreFxVersion>
     <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
     <JsonNetVersion>10.0.1</JsonNetVersion>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
+    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
+    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
     <ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
   </PropertyGroup>
 </Project>

build/repo.targets

@@ -1,12 +0,0 @@
-<Project>
-  <Target Name="NpmRestore" AfterTargets="Restore" Condition="'$(PreflightRestore)' != 'true'">
-    <ItemGroup>
-      <NpmModules Include="$(RepositoryRoot)**\package.json"
-        Exclude="$(RepositoryRoot)**\node_modules\**\*" />
-    </ItemGroup>
-
-    <Message Text="Restoring NPM modules for: %0A - @(NpmModules -> '%(FullPath)','%0A - ')" Importance="high" />
-
-    <Exec Command="npm install" WorkingDirectory="%(NpmModules.RootDir)%(Directory)" />
-  </Target>
-</Project>

samples/misc/LatencyTest/LatencyTest.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\..\build\dependencies.props" />
+  <Import Project="..\..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <OutputType>exe</OutputType>
   </PropertyGroup>

samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\build\dependencies.props" />
+  <Import Project="..\..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

samples/misc/Webpack/ActionResults/PrerenderResult.cs

@@ -27,6 +27,7 @@ namespace Webpack.ActionResults
         {
             var nodeServices = context.HttpContext.RequestServices.GetRequiredService<INodeServices>();
             var hostEnv = context.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>();
+            var applicationLifetime = context.HttpContext.RequestServices.GetRequiredService<IApplicationLifetime>();
             var applicationBasePath = hostEnv.ContentRootPath;
             var request = context.HttpContext.Request;
             var response = context.HttpContext.Response;
@@ -34,6 +35,7 @@ namespace Webpack.ActionResults
             var prerenderedHtml = await Prerenderer.RenderToString(
                 applicationBasePath,
                 nodeServices,
+                applicationLifetime.ApplicationStopping,
                 _moduleExport,
                 request.GetEncodedUrl(),
                 request.Path + request.QueryString.Value,

samples/misc/Webpack/Webpack.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <Import Project="..\..\..\build\dependencies.props" />
+  <Import Project="..\..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
@@ -15,14 +15,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Microsoft.Tpl.Dataflow" Version="$(MicrosoftDataflowVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="System.IO.Pipes" Version="$(CoreFxVersion)" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(ThreadingDataflowVersion)" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs

@@ -18,11 +18,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
                 PipeDirection.InOut,
                 PipeOptions.Asynchronous);
 
-#if NET451
-            _namedPipeClientStream.Connect();
-#else
             await _namedPipeClientStream.ConnectAsync().ConfigureAwait(false);
-#endif
 
             return _namedPipeClientStream;
         }

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs

@@ -11,9 +11,6 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
 
         public static StreamConnection Create()
         {
-#if NET451
-            return new NamedPipeConnection();
-#else
             var useNamedPipes = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
                 System.Runtime.InteropServices.OSPlatform.Windows);
             if (useNamedPipes)
@@ -24,7 +21,6 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
             {
                 return new UnixDomainSocketConnection();
             }
-#endif
         }
     }
 }

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs

@@ -10,16 +10,6 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
         private NetworkStream _networkStream;
         private Socket _socket;
 
-#if NET451
-        public override Task<Stream> Open(string address)
-        {
-            // The 'null' assignments avoid the compiler warnings about unassigned fields.
-            // Note that this whole class isn't supported on .NET 4.5.1, since that's not cross-platform.
-            _networkStream = null;
-            _socket = null;
-            throw new System.PlatformNotSupportedException();
-        }
-#else
         public override async Task<Stream> Open(string address)
         {
             var endPoint = new UnixDomainSocketEndPoint("/tmp/" + address);
@@ -28,7 +18,6 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
             _networkStream = new NetworkStream(_socket);
             return _networkStream;
         }
-#endif
 
         public override void Dispose()
         {

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs

@@ -59,11 +59,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.PhysicalConnections
             }
             else
             {
-#if NET451
-                _encodedPath = new byte[0];
-#else
                 _encodedPath = Array.Empty<byte>();
-#endif
                 _path = string.Empty;
             }
         }

src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs

@@ -49,6 +49,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
                 options.ProjectPath,
                 options.WatchFileExtensions,
                 MakeNewCommandLineOptions(socketAddress),
+                options.ApplicationStoppingToken,
                 options.NodeInstanceOutputLogger,
                 options.EnvironmentVariables,
                 options.InvocationTimeoutMilliseconds,

src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs

@@ -12,11 +12,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections
     /// </summary>
     internal class VirtualConnection : Stream
     {
-#if NET451
-        private readonly static Task CompletedTask = Task.FromResult((object)null);
-#else
         private readonly static Task CompletedTask = Task.CompletedTask;
-#endif
         private VirtualConnectionClient _host;
         private readonly BufferBlock<byte[]> _receivedDataQueue = new BufferBlock<byte[]>();
         private ArraySegment<byte> _receivedDataNotYetUsed;

src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using Microsoft.AspNetCore.NodeServices.HostingModels;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
@@ -42,6 +43,12 @@ namespace Microsoft.AspNetCore.NodeServices
                 EnvironmentVariables["NODE_ENV"] = hostEnv.IsDevelopment() ? "development" : "production"; // De-facto standard values for Node
             }
 
+            var applicationLifetime = serviceProvider.GetService<IApplicationLifetime>();
+            if (applicationLifetime != null)
+            {
+                ApplicationStoppingToken = applicationLifetime.ApplicationStopping;
+            }
+
             // If the DI system gives us a logger, use it. Otherwise, set up a default one.
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
             NodeInstanceOutputLogger = loggerFactory != null
@@ -93,5 +100,10 @@ namespace Microsoft.AspNetCore.NodeServices
         /// Specifies the maximum duration, in milliseconds, that your .NET code should wait for Node.js RPC calls to return.
         /// </summary>
         public int InvocationTimeoutMilliseconds { get; set; }
+
+        /// <summary>
+        /// A token that indicates when the host application is stopping.
+        /// </summary>
+        public CancellationToken ApplicationStoppingToken { get; set; }
     }
 }

src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs

@@ -42,6 +42,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
                 options.ProjectPath,
                 options.WatchFileExtensions,
                 MakeCommandLineOptions(port),
+                options.ApplicationStoppingToken,
                 options.NodeInstanceOutputLogger,
                 options.EnvironmentVariables,
                 options.InvocationTimeoutMilliseconds,

src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs

@@ -45,6 +45,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
         /// <param name="projectPath">The root path of the current project. This is used when resolving Node.js module paths relative to the project root.</param>
         /// <param name="watchFileExtensions">The filename extensions that should be watched within the project root. The Node instance will automatically shut itself down if any matching file changes.</param>
         /// <param name="commandLineArguments">Additional command-line arguments to be passed to the Node.js instance.</param>
+        /// <param name="applicationStoppingToken">A token that indicates when the host application is stopping.</param>
         /// <param name="nodeOutputLogger">The <see cref="ILogger"/> to which the Node.js instance's stdout/stderr (and other log information) should be written.</param>
         /// <param name="environmentVars">Environment variables to be set on the Node.js process.</param>
         /// <param name="invocationTimeoutMilliseconds">The maximum duration, in milliseconds, to wait for RPC calls to complete.</param>
@@ -55,6 +56,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
             string projectPath,
             string[] watchFileExtensions,
             string commandLineArguments,
+            CancellationToken applicationStoppingToken,
             ILogger nodeOutputLogger,
             IDictionary<string, string> environmentVars,
             int invocationTimeoutMilliseconds,
@@ -67,7 +69,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
             }
 
             OutputLogger = nodeOutputLogger;
-            _entryPointScript = new StringAsTempFile(entryPointScript);
+            _entryPointScript = new StringAsTempFile(entryPointScript, applicationStoppingToken);
             _invocationTimeoutMilliseconds = invocationTimeoutMilliseconds;
             _launchWithDebugging = launchWithDebugging;
 
@@ -315,11 +317,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
 
         private static void SetEnvironmentVariable(ProcessStartInfo startInfo, string name, string value)
         {
-#if NET451
-            startInfo.EnvironmentVariables[name] = value;
-#else
             startInfo.Environment[name] = value;
-#endif
         }
 
         private static Process LaunchNodeProcess(ProcessStartInfo startInfo)
@@ -383,12 +381,6 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
                     {
                         OutputLogger.LogWarning(evt.Data);
                     }
-                    else if (!initializationIsCompleted)
-                    {
-                        _connectionIsReadySource.SetException(
-                            new InvalidOperationException("The Node.js process failed to initialize: " + evt.Data));
-                        initializationIsCompleted = true;
-                    }
                     else
                     {
                         OnErrorDataReceived(UnencodeNewlines(evt.Data));
@@ -402,9 +394,11 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
 
         private static bool IsDebuggerMessage(string message)
         {
-            return message.StartsWith("Debugger attached", StringComparison.OrdinalIgnoreCase) ||
-                message.StartsWith("Debugger listening ", StringComparison.OrdinalIgnoreCase) ||
-                message.StartsWith("To start debugging", StringComparison.OrdinalIgnoreCase) ||
+            return message.StartsWith("Debugger attached", StringComparison.Ordinal) ||
+                message.StartsWith("Debugger listening ", StringComparison.Ordinal) ||
+                message.StartsWith("To start debugging", StringComparison.Ordinal) ||
+                message.Equals("Warning: This is an experimental feature and could change at any time.", StringComparison.Ordinal) ||
+                message.Equals("For help see https://nodejs.org/en/docs/inspector", StringComparison.Ordinal) ||
                 message.Contains("chrome-devtools:");
         }
 

src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj

@@ -4,9 +4,10 @@
 
   <PropertyGroup>
     <Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,12 +20,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="System.Diagnostics.Process" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.IO.FileSystem.Watcher" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)" />
-  </ItemGroup>
-
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js" />

src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 
 namespace Microsoft.AspNetCore.NodeServices
 {
@@ -11,27 +12,21 @@ namespace Microsoft.AspNetCore.NodeServices
         private bool _disposedValue;
         private bool _hasDeletedTempFile;
         private object _fileDeletionLock = new object();
+        private IDisposable _applicationLifetimeRegistration;
 
         /// <summary>
         /// Create a new instance of <see cref="StringAsTempFile"/>.
         /// </summary>
         /// <param name="content">The contents of the temporary file to be created.</param>
-        public StringAsTempFile(string content)
+        /// <param name="applicationStoppingToken">A token that indicates when the host application is stopping.</param>
+        public StringAsTempFile(string content, CancellationToken applicationStoppingToken)
         {
             FileName = Path.GetTempFileName();
             File.WriteAllText(FileName, content);
 
             // Because .NET finalizers don't reliably run when the process is terminating, also
             // add event handlers for other shutdown scenarios.
-#if NET451
-            AppDomain.CurrentDomain.ProcessExit += HandleProcessExit;
-            AppDomain.CurrentDomain.DomainUnload += HandleProcessExit;
-#else
-            // Note that this still doesn't capture SIGKILL (at least on macOS) - there doesn't
-            // appear to be a way of doing that. So in that case, the temporary file will be
-            // left behind.
-            System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += HandleAssemblyUnloading;
-#endif
+            _applicationLifetimeRegistration = applicationStoppingToken.Register(EnsureTempFileDeleted);
         }
 
         /// <summary>
@@ -55,12 +50,7 @@ namespace Microsoft.AspNetCore.NodeServices
                 if (disposing)
                 {
                     // Dispose managed state
-#if NET451
-                    AppDomain.CurrentDomain.ProcessExit -= HandleProcessExit;
-                    AppDomain.CurrentDomain.DomainUnload -= HandleProcessExit;
-#else
-                    System.Runtime.Loader.AssemblyLoadContext.Default.Unloading -= HandleAssemblyUnloading;
-#endif
+                    _applicationLifetimeRegistration.Dispose();
                 }
 
                 EnsureTempFileDeleted();
@@ -81,18 +71,6 @@ namespace Microsoft.AspNetCore.NodeServices
             }
         }
 
-#if NET451
-        private void HandleProcessExit(object sender, EventArgs args)
-        {
-            EnsureTempFileDeleted();
-        }
-#else
-        private void HandleAssemblyUnloading(System.Runtime.Loader.AssemblyLoadContext context)
-        {
-            EnsureTempFileDeleted();
-        }
-#endif
-
         /// <summary>
         /// Implements the finalization part of the IDisposable pattern by calling Dispose(false).
         /// </summary>

src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj

@@ -4,15 +4,17 @@
 
   <PropertyGroup>
     <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Content\**\*" />
     <ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">

src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http.Features;
@@ -24,6 +25,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
         private static INodeServices _fallbackNodeServices; // Used only if no INodeServices was registered with DI
 
         private readonly string _applicationBasePath;
+        private readonly CancellationToken _applicationStoppingToken;
         private readonly INodeServices _nodeServices;
 
         /// <summary>
@@ -35,6 +37,9 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
             var hostEnv = (IHostingEnvironment) serviceProvider.GetService(typeof(IHostingEnvironment));
             _nodeServices = (INodeServices) serviceProvider.GetService(typeof(INodeServices)) ?? _fallbackNodeServices;
             _applicationBasePath = hostEnv.ContentRootPath;
+            
+            var applicationLifetime = (IApplicationLifetime) serviceProvider.GetService(typeof(IApplicationLifetime));
+            _applicationStoppingToken = applicationLifetime.ApplicationStopping;
 
             // Consider removing the following. Having it means you can get away with not putting app.AddNodeServices()
             // in your startup file, but then again it might be confusing that you don't need to.
@@ -101,6 +106,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
             var result = await Prerenderer.RenderToString(
                 _applicationBasePath,
                 _nodeServices,
+                _applicationStoppingToken,
                 new JavaScriptModuleExport(ModuleName)
                 {
                     ExportName = ExportName

src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.NodeServices;
 
@@ -9,22 +10,16 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
     /// </summary>
     public static class Prerenderer
     {
-        private static readonly Lazy<StringAsTempFile> NodeScript;
+        private static readonly object CreateNodeScriptLock = new object();
 
-        static Prerenderer()
-        {
-            NodeScript = new Lazy<StringAsTempFile>(() =>
-            {
-                var script = EmbeddedResourceReader.Read(typeof(Prerenderer), "/Content/Node/prerenderer.js");
-                return new StringAsTempFile(script); // Will be cleaned up on process exit
-            });
-        }
+        private static StringAsTempFile NodeScript;
 
         /// <summary>
         /// Performs server-side prerendering by invoking code in Node.js.
         /// </summary>
         /// <param name="applicationBasePath">The root path to your application. This is used when resolving project-relative paths.</param>
         /// <param name="nodeServices">The instance of <see cref="INodeServices"/> that will be used to invoke JavaScript code.</param>
+        /// <param name="applicationStoppingToken">A token that indicates when the host application is stopping.</param>
         /// <param name="bootModule">The path to the JavaScript file containing the prerendering logic.</param>
         /// <param name="requestAbsoluteUrl">The URL of the currently-executing HTTP request. This is supplied to the prerendering code.</param>
         /// <param name="requestPathAndQuery">The path and query part of the URL of the currently-executing HTTP request. This is supplied to the prerendering code.</param>
@@ -35,6 +30,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
         public static Task<RenderToStringResult> RenderToString(
             string applicationBasePath,
             INodeServices nodeServices,
+            CancellationToken applicationStoppingToken,
             JavaScriptModuleExport bootModule,
             string requestAbsoluteUrl,
             string requestPathAndQuery,
@@ -43,7 +39,7 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
             string requestPathBase)
         {
             return nodeServices.InvokeExportAsync<RenderToStringResult>(
-                NodeScript.Value.FileName,
+                GetNodeScriptFilename(applicationStoppingToken),
                 "renderToString",
                 applicationBasePath,
                 bootModule,
@@ -53,5 +49,19 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
                 timeoutMilliseconds,
                 requestPathBase);
         }
+
+        private static string GetNodeScriptFilename(CancellationToken applicationStoppingToken)
+        {
+            lock(CreateNodeScriptLock)
+            {
+                if (NodeScript == null)
+                {
+                    var script = EmbeddedResourceReader.Read(typeof(Prerenderer), "/Content/Node/prerenderer.js");
+                    NodeScript = new StringAsTempFile(script, applicationStoppingToken); // Will be cleaned up on process exit
+                }
+            }
+
+            return NodeScript.FileName;
+        }
     }
 }

src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs

@@ -98,7 +98,15 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack
 
                 using (var responseStream = await responseMessage.Content.ReadAsStreamAsync())
                 {
-                    await responseStream.CopyToAsync(context.Response.Body, DefaultHttpBufferSize, context.RequestAborted);
+                    try
+                    {
+                        await responseStream.CopyToAsync(context.Response.Body, DefaultHttpBufferSize, context.RequestAborted);
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // The CopyToAsync task will be canceled if the client disconnects (e.g., user
+                        // closes or refreshes the browser tab). Don't treat this as an error.
+                    }
                 }
 
                 return true;

src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs

@@ -1,14 +1,9 @@
 using System;
 using System.IO;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.NodeServices;
 using Microsoft.AspNetCore.SpaServices.Webpack;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.PlatformAbstractions;
 using Newtonsoft.Json;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -54,7 +49,7 @@ namespace Microsoft.AspNetCore.Builder
             // middleware). And since this is a dev-time-only feature, it doesn't matter if the default transport isn't
             // as fast as some theoretical future alternative.
             var nodeServicesOptions = new NodeServicesOptions(appBuilder.ApplicationServices);
-            nodeServicesOptions.WatchFileExtensions = new string[] {}; // Don't watch anything
+            nodeServicesOptions.WatchFileExtensions = new string[] { }; // Don't watch anything
             if (!string.IsNullOrEmpty(options.ProjectPath))
             {
                 nodeServicesOptions.ProjectPath = options.ProjectPath;
@@ -73,7 +68,7 @@ namespace Microsoft.AspNetCore.Builder
             // Get a filename matching the middleware Node script
             var script = EmbeddedResourceReader.Read(typeof(WebpackDevMiddleware),
                 "/Content/Node/webpack-dev-middleware.js");
-            var nodeScript = new StringAsTempFile(script); // Will be cleaned up on process exit
+            var nodeScript = new StringAsTempFile(script, nodeServicesOptions.ApplicationStoppingToken); // Will be cleaned up on process exit
 
             // Ideally, this would be relative to the application's PathBase (so it could work in virtual directories)
             // but it's not clear that such information exists during application startup, as opposed to within the context

templates/AngularSpa/AngularSpa.csproj

@@ -1,19 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,7 +28,23 @@
     <Content Remove="ClientApp\**" />
   </ItemGroup>
 
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
+<!--/-:cnd:noEmit -->
+  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+
+    <!-- In development, the dist files won't exist on the first run or when cloning to
+         a different machine, so rebuild them if not already present. -->
+    <Message Importance="high" Text="Performing first-run Webpack build..." />
+    <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
+    <Exec Command="node node_modules/webpack/bin/webpack.js" />
+  </Target>
+<!--/+:cnd:noEmit -->
+
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />

templates/AngularSpa/ClientApp/app/app.module.browser.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { AppModuleShared } from './app.module.shared';
+import { AppComponent } from './components/app/app.component';
+
+@NgModule({
+    bootstrap: [ AppComponent ],
+    imports: [
+        BrowserModule,
+        AppModuleShared
+    ],
+    providers: [
+        { provide: 'ORIGIN_URL', useValue: location.origin }
+    ]
+})
+export class AppModule {
+}

templates/AngularSpa/ClientApp/app/app.module.client.ts

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
-import { sharedConfig } from './app.module.shared';
-
-@NgModule({
-    bootstrap: sharedConfig.bootstrap,
-    declarations: sharedConfig.declarations,
-    imports: [
-        BrowserModule,
-        FormsModule,
-        HttpModule,
-        ...sharedConfig.imports
-    ],
-    providers: [
-        { provide: 'ORIGIN_URL', useValue: location.origin },
-        { provide: 'PRERENDERING_DATA', useValue: (window as any).PRERENDERING_DATA }
-    ]
-})
-export class AppModule {
-}

templates/AngularSpa/ClientApp/app/app.module.server.ts

@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
-import { sharedConfig } from './app.module.shared';
+import { AppModuleShared } from './app.module.shared';
+import { AppComponent } from './components/app/app.component';
 
 @NgModule({
-    bootstrap: sharedConfig.bootstrap,
-    declarations: sharedConfig.declarations,
+    bootstrap: [ AppComponent ],
     imports: [
         ServerModule,
-        ...sharedConfig.imports
+        AppModuleShared
     ]
 })
 export class AppModule {

templates/AngularSpa/ClientApp/app/app.module.shared.ts

@@ -1,14 +1,16 @@
 import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { HttpModule } from '@angular/http';
 import { RouterModule } from '@angular/router';
 
-import { AppComponent } from './components/app/app.component'
+import { AppComponent } from './components/app/app.component';
 import { NavMenuComponent } from './components/navmenu/navmenu.component';
 import { HomeComponent } from './components/home/home.component';
 import { FetchDataComponent } from './components/fetchdata/fetchdata.component';
 import { CounterComponent } from './components/counter/counter.component';
 
-export const sharedConfig: NgModule = {
-    bootstrap: [ AppComponent ],
+@NgModule({
     declarations: [
         AppComponent,
         NavMenuComponent,
@@ -17,6 +19,9 @@ export const sharedConfig: NgModule = {
         HomeComponent
     ],
     imports: [
+        CommonModule,
+        HttpModule,
+        FormsModule,
         RouterModule.forRoot([
             { path: '', redirectTo: 'home', pathMatch: 'full' },
             { path: 'home', component: HomeComponent },
@@ -25,4 +30,6 @@ export const sharedConfig: NgModule = {
             { path: '**', redirectTo: 'home' }
         ])
     ]
-};
+})
+export class AppModuleShared {
+}

templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.html

@@ -1,7 +1,5 @@
 <h1>Weather forecast</h1>
 
-<p>Prerendering data: {{ prerenderingDataString }}</p>
-
 <p>This component demonstrates fetching data from the server.</p>
 
 <p *ngIf="!forecasts"><em>Loading...</em></p>

templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts

@@ -7,11 +7,8 @@ import { Http } from '@angular/http';
 })
 export class FetchDataComponent {
     public forecasts: WeatherForecast[];
-    public prerenderingDataString: string;
-
-    constructor(http: Http, @Inject('ORIGIN_URL') originUrl: string, @Inject('PRERENDERING_DATA') prerenderingData: any) {
-        this.prerenderingDataString = JSON.stringify(prerenderingData);
 
+    constructor(http: Http, @Inject('ORIGIN_URL') originUrl: string) {
         http.get(originUrl + '/api/SampleData/WeatherForecasts').subscribe(result => {
             this.forecasts = result.json() as WeatherForecast[];
         });

templates/AngularSpa/ClientApp/boot-client.ts

@@ -1,8 +1,9 @@
 import 'reflect-metadata';
 import 'zone.js';
+import 'bootstrap';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module.client';
+import { AppModule } from './app/app.module.browser';
 
 if (module['hot']) {
     module['hot'].accept();

templates/AngularSpa/ClientApp/boot-server.ts

@@ -11,8 +11,7 @@ enableProdMode();
 export default createServerRenderer(params => {
     const providers = [
         { provide: INITIAL_CONFIG, useValue: { document: '<app></app>', url: params.url } },
-        { provide: 'ORIGIN_URL', useValue: params.origin },
-        { provide: 'PRERENDERING_DATA', useValue: params.data }
+        { provide: 'ORIGIN_URL', useValue: params.origin }
     ];
 
     return platformDynamicServer(providers).bootstrapModule(AppModule).then(moduleRef => {
@@ -27,8 +26,7 @@ export default createServerRenderer(params => {
                 // completing the request in case there's an error to report
                 setImmediate(() => {
                     resolve({
-                        html: state.renderToString(),
-                        globals: { PRERENDERING_DATA: params.data }
+                        html: state.renderToString()
                     });
                     moduleRef.destroy();
                 });

templates/AngularSpa/Views/Home/Index.cshtml

@@ -2,11 +2,7 @@
     ViewData["Title"] = "Home Page";
 }
 
-<app asp-prerender-module="ClientApp/dist/main-server"
-     asp-prerender-data="new {
-                    IsGoldUser = true,
-                    Cookies = ViewContext.HttpContext.Request.Cookies
-                 }">Loading...</app>
+<app asp-prerender-module="ClientApp/dist/main-server">Loading...</app>
 
 <script src="~/dist/vendor.js" asp-append-version="true"></script>
 @section scripts {

templates/AngularSpa/global.json

@@ -1,3 +0,0 @@
-{
-  "sdk": { "version": "sdkVersionInjectedHere" }
-}

templates/AureliaSpa/AureliaSpa.csproj

@@ -1,22 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
   </ItemGroup>
 
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
+<!--/-:cnd:noEmit -->
+  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+
+    <!-- In development, the dist files won't exist on the first run or when cloning to
+         a different machine, so rebuild them if not already present. -->
+    <Message Importance="high" Text="Performing first-run Webpack build..." />
+    <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
+    <Exec Command="node node_modules/webpack/bin/webpack.js" />
+  </Target>
+<!--/+:cnd:noEmit -->
+
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />

templates/AureliaSpa/global.json

@@ -1,3 +0,0 @@
-{
-  "sdk": { "version": "sdkVersionInjectedHere" }
-}

templates/KnockoutSpa/KnockoutSpa.csproj

@@ -1,22 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
   </ItemGroup>
 
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
+<!--/-:cnd:noEmit -->
+  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+
+    <!-- In development, the dist files won't exist on the first run or when cloning to
+         a different machine, so rebuild them if not already present. -->
+    <Message Importance="high" Text="Performing first-run Webpack build..." />
+    <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
+    <Exec Command="node node_modules/webpack/bin/webpack.js" />
+  </Target>
+<!--/+:cnd:noEmit -->
+
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />

templates/KnockoutSpa/global.json

@@ -1,3 +0,0 @@
-{
-  "sdk": { "version": "sdkVersionInjectedHere" }
-}

templates/ReactReduxSpa/ReactReduxSpa.csproj

@@ -1,15 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
@@ -21,7 +28,23 @@
     <Content Remove="ClientApp\**" />
   </ItemGroup>
 
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
+<!--/-:cnd:noEmit -->
+  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+
+    <!-- In development, the dist files won't exist on the first run or when cloning to
+         a different machine, so rebuild them if not already present. -->
+    <Message Importance="high" Text="Performing first-run Webpack build..." />
+    <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
+    <Exec Command="node node_modules/webpack/bin/webpack.js" />
+  </Target>
+<!--/+:cnd:noEmit -->
+
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />

templates/ReactReduxSpa/global.json

@@ -1,3 +0,0 @@
-{
-  "sdk": { "version": "sdkVersionInjectedHere" }
-}

templates/ReactReduxSpa/package.json

@@ -6,13 +6,14 @@
     "@types/react": "15.0.24",
     "@types/react-dom": "15.5.0",
     "@types/react-redux": "4.4.40",
+    "@types/react-router": "4.0.11",
     "@types/react-router-dom": "4.0.4",
     "@types/react-router-redux": "5.0.1",
     "@types/webpack": "2.2.15",
     "@types/webpack-env": "1.13.0",
     "aspnet-prerendering": "^2.0.5",
     "aspnet-webpack": "^1.0.29",
-    "aspnet-webpack-react": "^2.0.0",
+    "aspnet-webpack-react": "^3.0.0-beta",
     "awesome-typescript-loader": "3.1.3",
     "bootstrap": "3.3.7",
     "css-loader": "0.28.1",

templates/ReactSpa/ReactSpa.csproj

@@ -1,22 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
   </ItemGroup>
 
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
+<!--/-:cnd:noEmit -->
+  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+
+    <!-- In development, the dist files won't exist on the first run or when cloning to
+         a different machine, so rebuild them if not already present. -->
+    <Message Importance="high" Text="Performing first-run Webpack build..." />
+    <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
+    <Exec Command="node node_modules/webpack/bin/webpack.js" />
+  </Target>
+<!--/+:cnd:noEmit -->
+
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />

templates/ReactSpa/global.json

@@ -1,3 +0,0 @@
-{
-  "sdk": { "version": "sdkVersionInjectedHere" }
-}

templates/ReactSpa/package.json

@@ -8,7 +8,7 @@
     "@types/react-router": "4.0.9",
     "@types/webpack-env": "1.13.0",
     "aspnet-webpack": "^1.0.29",
-    "aspnet-webpack-react": "^2.0.0",
+    "aspnet-webpack-react": "^3.0.0-beta",
     "awesome-typescript-loader": "3.1.3",
     "bootstrap": "3.3.7",
     "css-loader": "0.28.1",

templates/VueSpa/VueSpa.csproj

@@ -1,22 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-*" />
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
   </ItemGroup>
 
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
   </ItemGroup>
 
-  <Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
+<!--/-:cnd:noEmit -->
+  <Target Name="DebugRunWebpack" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('wwwroot\dist') ">
+    <!-- Ensure Node.js is installed -->
+    <Exec Command="node --version" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+    </Exec>
+    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+
+    <!-- In development, the dist files won't exist on the first run or when cloning to
+         a different machine, so rebuild them if not already present. -->
+    <Message Importance="high" Text="Performing first-run Webpack build..." />
+    <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js" />
+    <Exec Command="node node_modules/webpack/bin/webpack.js" />
+  </Target>
+<!--/+:cnd:noEmit -->
+
+  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
     <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
     <Exec Command="npm install" />
     <Exec Command="node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js --env.prod" />

templates/VueSpa/global.json

@@ -1,3 +0,0 @@
-{
-  "sdk": { "version": "sdkVersionInjectedHere" }
-}

templates/package-builder/src/build/build.ts

@@ -11,26 +11,29 @@ import * as targz from 'tar.gz';
 const isWindows = /^win/.test(process.platform);
 const textFileExtensions = ['.gitignore', 'template_gitignore', '.config', '.cs', '.cshtml', '.csproj', '.html', '.js', '.json', '.jsx', '.md', '.nuspec', '.ts', '.tsx'];
 const yeomanGeneratorSource = './src/yeoman';
+const webToolsVSPackageGuid = '{0CD94836-1526-4E85-87D3-FB5274C5AFC9}';
 
-// To support the "dotnet new" templates, we want to bundle prebuilt dist dev-mode files, because "dotnet new" can't auto-run
-// webpack on project creation. Note that these script entries are *not* the same as the project's usual prepublish
-// scripts, because here we want dev-mode builds (e.g., to support HMR), not prod-mode builds.
-const commonTemplatePrepublishSteps = [
-    'npm install',
-    'node node_modules/webpack/bin/webpack.js --config webpack.config.vendor.js',
-    'node node_modules/webpack/bin/webpack.js'
-];
-const commonForceInclusionRegex = /^(wwwroot|ClientApp)\/dist\//; // Files to be included in template, even though gitignored
-
-const templates: { [key: string]: { dir: string, dotNetNewId: string, displayName: string, prepublish?: string[], forceInclusion?: RegExp } } = {
-    'angular': { dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular' },
-    'aurelia': { dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia' },
-    'knockout': { dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js' },
-    'react-redux': { dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux' },
-    'react': { dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js' },
-    'vue': { dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js' }
+const dotNetPackages = {
+    builtIn: 'Microsoft.DotNet.Web.Spa.ProjectTemplates',
+    extra: 'Microsoft.AspNetCore.SpaTemplates'
 };
 
+interface TemplateConfig {
+    dir: string;
+    dotNetNewId: string;
+    dotNetPackageId: string;
+    displayName: string;
+    localizationIdStart: number;
+}
+
+const templates: { [key: string]: TemplateConfig } = {
+    'angular': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/AngularSpa/', dotNetNewId: 'Angular', displayName: 'Angular', localizationIdStart: 1100 },
+    'aurelia': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/AureliaSpa/', dotNetNewId: 'Aurelia', displayName: 'Aurelia', localizationIdStart: 1200 },
+    'knockout': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/KnockoutSpa/', dotNetNewId: 'Knockout', displayName: 'Knockout.js', localizationIdStart: 1300 },
+    'react-redux': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactReduxSpa/', dotNetNewId: 'ReactRedux', displayName: 'React.js and Redux', localizationIdStart: 1400 },
+    'react': { dotNetPackageId: dotNetPackages.builtIn, dir: '../../templates/ReactSpa/', dotNetNewId: 'React', displayName: 'React.js', localizationIdStart: 1500 },
+    'vue': { dotNetPackageId: dotNetPackages.extra, dir: '../../templates/VueSpa/', dotNetNewId: 'Vue', displayName: 'Vue.js', localizationIdStart: 1600 }
+};
 
 function isTextFile(filename: string): boolean {
     return textFileExtensions.indexOf(path.extname(filename).toLowerCase()) >= 0
@@ -43,7 +46,7 @@ function writeFileEnsuringDirExists(root: string, filename: string, contents: st
     fs.writeFileSync(fullPath, contents);
 }
 
-function listFilesExcludingGitignored(root: string, forceInclusion: RegExp): string[] {
+function listFilesExcludingGitignored(root: string): string[] {
     // Note that the gitignore files, prior to be written by the generator, are called 'template_gitignore'
     // instead of '.gitignore'. This is a workaround for Yeoman doing strange stuff with .gitignore files
     // (it renames them to .npmignore, which is not helpful).
@@ -52,21 +55,23 @@ function listFilesExcludingGitignored(root: string, forceInclusion: RegExp): str
         ? gitignore.compile(fs.readFileSync(gitIgnorePath, 'utf8'))
         : { accepts: () => true };
     return glob.sync('**/*', { cwd: root, dot: true, nodir: true })
-        .filter(fn => gitignoreEvaluator.accepts(fn) || (forceInclusion && forceInclusion.test(fn)));
+        .filter(fn => gitignoreEvaluator.accepts(fn));
 }
 
-function writeTemplate(sourceRoot: string, destRoot: string, contentReplacements: { from: RegExp, to: string }[], filenameReplacements: { from: RegExp, to: string }[], forceInclusion: RegExp) {
-    listFilesExcludingGitignored(sourceRoot, forceInclusion).forEach(fn => {
+function applyContentReplacements(sourceContent: Buffer, contentReplacements: { from: RegExp, to: string }[]) {
+    let sourceText = sourceContent.toString('utf8');
+    contentReplacements.forEach(replacement => {
+        sourceText = sourceText.replace(replacement.from, replacement.to);
+    });
+
+    return new Buffer(sourceText, 'utf8');
+}
+
+function writeTemplate(sourceRoot: string, destRoot: string, contentReplacements: { from: RegExp, to: string }[], filenameReplacements: { from: RegExp, to: string }[]) {
+    listFilesExcludingGitignored(sourceRoot).forEach(fn => {
         let sourceContent = fs.readFileSync(path.join(sourceRoot, fn));
-
-        // For text files, replace hardcoded values with template tags
         if (isTextFile(fn)) {
-            let sourceText = sourceContent.toString('utf8');
-            contentReplacements.forEach(replacement => {
-                sourceText = sourceText.replace(replacement.from, replacement.to);
-            });
-
-            sourceContent = new Buffer(sourceText, 'utf8');
+            sourceContent = applyContentReplacements(sourceContent, contentReplacements);
         }
 
         // Also apply replacements in filenames
@@ -86,6 +91,22 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string)
         });
 }
 
+function leftPad(str: string, minLength: number, padChar: string) {
+    while (str.length < minLength) {
+        str = padChar + str;
+    }
+    return str;
+}
+
+function getBuildNumber(): string {
+    if (process.env.APPVEYOR_BUILD_NUMBER) {
+        return leftPad(process.env.APPVEYOR_BUILD_NUMBER, 6, '0');
+    }
+
+    // For local builds, use timestamp
+    return 't-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000));
+}
+
 function buildYeomanNpmPackage(outputRoot: string) {
     const outputTemplatesRoot = path.join(outputRoot, 'app/templates');
     rimraf.sync(outputTemplatesRoot);
@@ -95,12 +116,11 @@ function buildYeomanNpmPackage(outputRoot: string) {
         { from: /.*\.csproj$/, to: 'tokenreplace-namePascalCase.csproj' }
     ];
     const contentReplacements = [
-        // global.json items
-        { from: /sdkVersionInjectedHere/, to: '<%= sdkVersion %>' }
+        // Currently, there are none
     ];
     _.forEach(templates, (templateConfig, templateName) => {
         const outputDir = path.join(outputTemplatesRoot, templateName);
-        writeTemplate(templateConfig.dir, outputDir, contentReplacements, filenameReplacements, commonForceInclusionRegex);
+        writeTemplate(templateConfig.dir, outputDir, contentReplacements, filenameReplacements);
     });
 
     // Also copy the generator files (that's the compiled .js files, plus all other non-.ts files)
@@ -112,7 +132,17 @@ function buildYeomanNpmPackage(outputRoot: string) {
     rimraf.sync(tempRoot);
 }
 
-function buildDotNetNewNuGetPackage() {
+function buildDotNetNewNuGetPackages(outputDir: string) {
+    const dotNetPackageIds = _.values(dotNetPackages);
+    dotNetPackageIds.forEach(packageId => {
+        const dotNetNewNupkgPath = buildDotNetNewNuGetPackage(packageId);
+
+        // Move the .nupkg file to the output dir
+        fs.renameSync(dotNetNewNupkgPath, path.join(outputDir, path.basename(dotNetNewNupkgPath)));
+    });
+}
+
+function buildDotNetNewNuGetPackage(packageId: string) {
     const outputRoot = './dist/dotnetnew';
     rimraf.sync(outputRoot);
 
@@ -125,8 +155,13 @@ function buildDotNetNewNuGetPackage() {
     ];
     const contentReplacements = [];
     _.forEach(templates, (templateConfig, templateName) => {
+        // Only include templates matching the output package ID
+        if (templateConfig.dotNetPackageId !== packageId) {
+            return;
+        }
+
         const templateOutputDir = path.join(outputRoot, 'Content', templateName);
-        writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements, commonForceInclusionRegex);
+        writeTemplate(templateConfig.dir, templateOutputDir, contentReplacements, filenameReplacements);
 
         // Add the .template.config dir and its contents
         const templateConfigDir = path.join(templateOutputDir, '.template.config');
@@ -134,10 +169,10 @@ function buildDotNetNewNuGetPackage() {
 
         fs.writeFileSync(path.join(templateConfigDir, 'template.json'), JSON.stringify({
             author: 'Microsoft',
-            classifications: ["Web", "MVC", "SPA"],
-            groupIdentity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}`,
-            identity: `Microsoft.AspNetCore.SpaTemplates.${templateConfig.dotNetNewId}.CSharp`,
-            name: `MVC ASP.NET Core with ${templateConfig.displayName}`,
+            classifications: ['Web', 'MVC', 'SPA'],
+            groupIdentity: `${packageId}.${templateConfig.dotNetNewId}`,
+            identity: `${packageId}.${templateConfig.dotNetNewId}.CSharp`,
+            name: `ASP.NET Core with ${templateConfig.displayName}`,
             preferNameDirectory: true,
             primaryOutputs: [{ path: `${sourceProjectName}.csproj` }],
             shortName: `${templateConfig.dotNetNewId.toLowerCase()}`,
@@ -148,46 +183,116 @@ function buildDotNetNewNuGetPackage() {
                 exclude: ['.template.config/**']
             }],
             symbols: {
-                sdkVersion: {
-                    type: 'bind',
-                    binding: 'dotnet-cli-version',
-                    replaces: 'sdkVersionInjectedHere'
+                TargetFrameworkOverride: {
+                    type: 'parameter',
+                    description: 'Overrides the target framework',
+                    replaces: 'TargetFrameworkOverride',
+                    datatype: 'string',
+                    defaultValue: ''
                 },
                 Framework: {
-                    type: "parameter",
-                    description: "The target framework for the project.",
-                    datatype: "choice",
+                    type: 'parameter',
+                    description: 'The target framework for the project.',
+                    datatype: 'choice',
                     choices: [
                         {
-                            choice: "netcoreapp1.1",
-                            description: "Target netcoreapp1.1"
+                            choice: 'netcoreapp2.0',
+                            description: 'Target netcoreapp2.0'
                         }
                     ],
-                    defaultValue: "netcoreapp1.1"
+                    replaces: 'netcoreapp2.0',
+                    defaultValue: 'netcoreapp2.0'
+                },
+                HostIdentifier: {
+                    type: 'bind',
+                    binding: 'HostIdentifier'
+                },
+                skipRestore: {
+                    type: 'parameter',
+                    datatype: 'bool',
+                    description: 'If specified, skips the automatic restore of packages on project creation.',
+                    defaultValue: 'false'
                 }
             },
             tags: { language: 'C#', type: 'project' },
+            postActions: [
+                {
+                    condition: '(!skipRestore)',
+                    description: 'Restores NuGet packages required by this project.',
+                    manualInstructions: [{ text: 'Run \'dotnet restore\'' }],
+                    actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025',
+                    continueOnError: true
+                },
+                /*
+                // Currently it doesn't appear to be possible to run `npm install` from a
+                // postAction, due to https://github.com/dotnet/templating/issues/849
+                // We will re-enable this when that bug is fixed.
+                {
+                    condition: '(!skipRestore)',
+                    description: 'Restores NPM packages required by this project.',
+                    manualInstructions: [{ text: 'Run \'npm install\'' }],
+                    actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2',
+                    args: { executable: 'npm', args: 'install' },
+                    continueOnError: false
+                }
+                */
+                {
+                    // For the preview2 release, just display manual instructions instead.
+                    // This is only applicable on the command line, because VS will restore
+                    // NPM packages automatically by default.
+                    condition: '(HostIdentifier == "dotnetcli" || HostIdentifier == "dotnetcli-preview")',
+                    actionId: 'AC1156F7-BB77-4DB8-B28F-24EEBCCA1E5C',
+                    description: '\n\n-------------------------------------------------------------------\nIMPORTANT: Before running this project on the command line,\n           you must restore NPM packages by running "npm install"\n-------------------------------------------------------------------\n',
+                    manualInstructions: [{ text: 'Run "npm install"' }]
+                }
+            ],
         }, null, 2));
 
         fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({
-            symbolInfo: {}
+            $schema: 'http://json.schemastore.org/dotnetcli.host',
+            symbolInfo: {
+                TargetFrameworkOverride: {
+                    isHidden: 'true',
+                    longName: 'target-framework-override',
+                    shortName: ''
+                },
+                Framework: {
+                    longName: 'framework'
+                },
+                skipRestore: {
+                    longName: 'no-restore',
+                    shortName: ''
+                }
+            }
         }, null, 2));
         
+        const localisedNameId = templateConfig.localizationIdStart + 0;
+        const localisedDescId = templateConfig.localizationIdStart + 1;
+
         fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({
-            name: { text: templateConfig.displayName },
-            description: { text: `Web application built with MVC ASP.NET Core and ${templateConfig.displayName}` },
-            order: 2000,
+            $schema: 'http://json.schemastore.org/vs-2017.3.host',
+            name: { text: templateConfig.displayName, package: webToolsVSPackageGuid, id: localisedNameId.toString() },
+            description: { text: `A project template for creating an ASP.NET Core application with ${templateConfig.displayName}`, package: webToolsVSPackageGuid, id: localisedDescId.toString() },
+            order: 301,
             icon: 'icon.png',
             learnMoreLink: 'https://github.com/aspnet/JavaScriptServices',
-            uiFilters: [ 'oneaspnet' ]
+            uiFilters: [ 'oneaspnet' ],
+            minFullFrameworkVersion: '4.6.1'
         }, null, 2));
     });
 
-    // Invoke NuGet to create the final package
+    // Create the .nuspec file
     const yeomanPackageVersion = JSON.parse(fs.readFileSync(path.join(yeomanGeneratorSource, 'package.json'), 'utf8')).version;
-    writeTemplate('./src/dotnetnew', outputRoot, [
-        { from: /\{version\}/g, to: yeomanPackageVersion },
-    ], [], null);
+    const nuspecContentTemplate = fs.readFileSync(`./src/dotnetnew/${ packageId }.nuspec`);
+    writeFileEnsuringDirExists(outputRoot,
+        `${ packageId }.nuspec`,
+        applyContentReplacements(nuspecContentTemplate, [
+            { from: /\{yeomanversion\}/g, to: yeomanPackageVersion },
+            { from: /\{buildnumber\}/g, to: getBuildNumber() },
+        ])
+    );
+
+    // Invoke NuGet to create the final package
     const nugetExe = path.join(process.cwd(), './bin/NuGet.exe');
     const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' };
     if (isWindows) {
@@ -204,21 +309,7 @@ function buildDotNetNewNuGetPackage() {
     return glob.sync(path.join(outputRoot, './*.nupkg'))[0];
 }
 
-function runAllPrepublishScripts() {
-    Object.getOwnPropertyNames(templates).forEach(templateKey => {
-        const templateInfo = templates[templateKey];
-
-        // First run standard prepublish steps
-        runScripts(templateInfo.dir, commonTemplatePrepublishSteps);
-
-        // Second, run any template-specific prepublish steps
-        if (templateInfo.prepublish) {
-            runScripts(templateInfo.dir, templateInfo.prepublish);
-        }
-    });
-}
-
-function runScripts(rootDir: string, scripts: string[]) {
+function runPrepublishScripts(rootDir: string, scripts: string[]) {
     console.log(`[Prepublish] In directory: ${ rootDir }`);
     scripts.forEach(script => {
         console.log(`[Prepublish] Running: ${ script }`);
@@ -233,12 +324,8 @@ const yeomanOutputRoot = path.join(distDir, 'generator-aspnetcore-spa');
 
 rimraf.sync(distDir);
 mkdirp.sync(artifactsDir);
-runAllPrepublishScripts();
 buildYeomanNpmPackage(yeomanOutputRoot);
-const dotNetNewNupkgPath = buildDotNetNewNuGetPackage();
-
-// Move the .nupkg file to the artifacts dir
-fs.renameSync(dotNetNewNupkgPath, path.join(artifactsDir, path.basename(dotNetNewNupkgPath)));
+buildDotNetNewNuGetPackages(artifactsDir);
 
 // Finally, create a .tar.gz file containing the built generator-aspnetcore-spa.
 // The CI system can treat this as the final built artifact.

templates/package-builder/src/dotnetnew/Microsoft.AspNetCore.SpaTemplates.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Microsoft.AspNetCore.SpaTemplates</id>
-        <version>{version}</version>
+        <version>{yeomanversion}</version>
         <description>Single Page Application templates for ASP.NET Core</description>
         <authors>Microsoft</authors>
         <language>en-US</language>

templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>Microsoft.DotNet.Web.Spa.ProjectTemplates</id>
+        <version>1.0.0-preview-{buildnumber}</version>
+        <description>Single Page Application templates for ASP.NET Core</description>
+        <authors>Microsoft</authors>
+        <language>en-US</language>
+        <projectUrl>https://github.com/aspnet/javascriptservices</projectUrl>
+        <licenseUrl>https://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
+        <copyright>Copyright © Microsoft Corporation</copyright>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <packageTypes>
+            <packageType name="Template" />
+        </packageTypes>
+    </metadata>
+</package>