Example of using BrowserAnimationsModule

2025-12-23 18:19:40 +00:00 · 2017-08-24 15:44:56 -07:00
339 changed files with 28339 additions and 21950 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,19 +0,0 @@
-init:
- git config --global core.autocrlf true
-install:
- ps: Install-Product node 6.9.2 x64
-branches:
-  only:
-  - master
-  - /^release\/.*$/
-  - /^(.*\/)?ci-.*$/
-build_script:
- ps: .\run.ps1 default-build
-clone_depth: 1
-environment:
-  global:
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    DOTNET_CLI_TELEMETRY_OPTOUT: 1
-test: 'off'
-deploy: 'off'
-os: Visual Studio 2017
--- a/.gitignore
+++ b/.gitignore
@@ -24,8 +24,12 @@ nuget.exe
 *.ncrunchsolution
 *.*sdf
 *.ipch
+
 .vs/
 npm-debug.log
 /.build/
+
 .vscode/
+
 global.json
+korebuild-lock.txt
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,13 +12,8 @@ addons:
    - zlib1g
 mono: none
 os:
- linux
- osx
+  - linux
+  - osx
 osx_image: xcode7.1
 script:
- ./build.sh
-branches:
-  only:
-  - master
-  - /^release\/.*$/
-  - /^(.*\/)?ci-.*$/
+  - ./build.sh
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ b/.vsts-pipelines/builds/ci-internal.yml
@@ -1,13 +0,0 @@
-trigger:
- master
- release/*
-
-resources:
-  repositories:
-  - repository: buildtools
-    type: git
-    name: aspnet-BuildTools
-    ref: refs/heads/master
-
-phases:
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
--- a/.vsts-pipelines/builds/ci-public.yml
+++ b/.vsts-pipelines/builds/ci-public.yml
@@ -1,15 +0,0 @@
-trigger:
- master
- release/*
-
-# See https://github.com/aspnet/BuildTools
-resources:
-  repositories:
-  - repository: buildtools
-    type: github
-    endpoint: DotNet-Bot GitHub Connection
-    name: aspnet/BuildTools
-    ref: refs/heads/master
-
-phases:
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
 Contributing
 ======

-Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo.
+Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo.
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,15 +0,0 @@
-<Project>
-  <Import Project="version.props" />
-  <Import Project="build\dependencies.props" />
-  <Import Project="build\sources.props" />
-
-  <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/javascriptservices</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-</Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,10 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
-    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
-  </PropertyGroup>
-</Project>
--- a/JavaScriptServices.sln
+++ b/JavaScriptServices.sln
@@ -1,12 +1,9 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
-MinimumVisualStudioVersion = 15.0.26730.03
+VisualStudioVersion = 15.0.26430.4
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}"
-	ProjectSection(SolutionItems) = preProject
-		src\Directory.Build.props = src\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}"
 EndProject
@@ -31,13 +28,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webpack", "samples\misc\Web
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "samples\misc\NodeServicesExamples\NodeServicesExamples.csproj", "{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}"
-	ProjectSection(SolutionItems) = preProject
-		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
-	EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions", "src\Microsoft.AspNetCore.SpaServices.Extensions\Microsoft.AspNetCore.SpaServices.Extensions.csproj", "{D40BD1C4-6A6F-4213-8535-1057F3EB3400}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}"
+	ProjectSection(SolutionItems) = preProject
+		src\build\common.props = src\build\common.props
+		src\build\Key.snk = src\build\Key.snk
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,10 +66,6 @@ Global
 		{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D40BD1C4-6A6F-4213-8535-1057F3EB3400}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -85,9 +78,5 @@ Global
 		{1931B19A-EC42-4D56-B2D0-FB06D17244DA} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
 		{DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
 		{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
-		{D40BD1C4-6A6F-4213-8535-1057F3EB3400} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DDF59B0D-2DEC-45D6-8667-DCB767487101}
 	EndGlobalSection
 EndGlobal
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,201 +1,14 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+Copyright (c) .NET Foundation and Contributors

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+All rights reserved.

-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) .NET Foundation and Contributors
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at

    http://www.apache.org/licenses/LICENSE-2.0

-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,6 +2,8 @@
 <configuration>
  <packageSources>
    <clear />
-    <!-- Restore sources should be defined in build/sources.props. -->
+    <add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/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>
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -1,7 +0,0 @@
-{
-  "Default": {
-    "rules": [
-      "DefaultCompositeRule"
-    ]
-  }
-}
--- a/README.md
+++ b/README.md
@@ -17,44 +17,36 @@ Read [Building Single Page Applications on ASP.NET Core with JavaScriptServices]
 This repo contains:

 * A set of NuGet/NPM packages that implement functionality for:
-   * Invoking arbitrary NPM packages at runtime from .NET code ([docs](/src/Microsoft.AspNetCore.NodeServices#simple-usage-example))
-   * Server-side prerendering of SPA components ([docs](/src/Microsoft.AspNetCore.SpaServices#server-side-prerendering))
-   * Webpack dev middleware ([docs](/src/Microsoft.AspNetCore.SpaServices#webpack-dev-middleware))
-   * Hot module replacement (HMR) ([docs](/src/Microsoft.AspNetCore.SpaServices#webpack-hot-module-replacement))
-   * Server-side and client-side routing integration ([docs](/src/Microsoft.AspNetCore.SpaServices#routing-helper-mapspafallbackroute))
+   * Invoking arbitrary NPM packages at runtime from .NET code ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices#simple-usage-example))
+   * Server-side prerendering of SPA components ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#server-side-prerendering))
+   * Webpack dev middleware ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#webpack-dev-middleware))
+   * Hot module replacement (HMR) ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#webpack-hot-module-replacement))
+   * Server-side and client-side routing integration ([docs](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#routing-helper-mapspafallbackroute))
   * Server-side and client-side validation integration
   * "Lazy loading" for Knockout apps
+ * A Yeoman generator that creates preconfigured app starting points ([guide](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/))
 * Samples and docs

-It's cross-platform (Windows, Linux, or macOS) and works with .NET Core 2.0 or later.
+It's cross-platform (Windows, Linux, or macOS) and works with .NET Core 1.0.1 or later.

 ## Creating new applications

-Prerequisites:
+If you want to build a brand-new ASP.NET Core app that uses Angular / React / Knockout on the client, consider starting with the `aspnetcore-spa` generator. This lets you choose your client-side framework. It generates a starting point that includes applicable features such as Webpack dev middleware, server-side prerendering, and efficient production builds. It's much easier than configuring everything to work together manually!

-* [.NET Core 2.0](https://www.microsoft.com/net/core) (or later) SDK
-* [Node.js](https://nodejs.org/) version 6 (or later)
+To do this, install Yeoman and these generator templates:

-With these prerequisites, you can immediately create new ASP.NET Core applications that use Angular, React, or React+Redux without having to install anything extra.
+    npm install -g yo generator-aspnetcore-spa

-### Option 1: Creating Angular/React/Redux applications from the command line (cross-platform)
+Generate your new application starting point:

-In an empty directory, run (for example) `dotnet new angular`. Other supported SPA frameworks include React and React+Redux. You can see the list of available SPA templates by running `dotnet new spa`.
+    cd some-empty-directory
+    yo aspnetcore-spa

 Once the generator has run and restored all the dependencies, you can start up your new ASP.NET Core SPA:

-    npm install
    dotnet run 

-### Option 2: Creating Angular/React/Redux applications using Visual Studio 2017 Update 3 or later (Windows only)
-
-Using the `File`->`New Project` dialog, select *ASP.NET Core Web Application*. You will then be offered the option to create an application with Angular, React, or React+Redux. When the application is created, you can build and run it in the normal way.
-
-### More info and other SPA frameworks
-
-For a more detailed (albeit somewhat outdated) walkthrough, see [getting started with the `aspnetcore-spa` generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/).
-
-If you want to build an ASP.NET Core application with Aurelia, Knockout, or Vue, you can use the `Microsoft.AspNetCore.SpaTemplates` package. On the command line, run `dotnet new --install Microsoft.AspNetCore.SpaTemplates`. Then you will be able to run `dotnet new aurelia` (or `dotnet new vue`, etc.) to create your new application.
+For a more detailed walkthrough, see [getting started with the `aspnetcore-spa` generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/).

 ## Adding to existing applications

@@ -63,18 +55,23 @@ If you have an existing ASP.NET Core application, or if you just want to use the
 * `Microsoft.AspNetCore.NodeServices`
   * This provides a fast and robust way for .NET code to run JavaScript on the server inside a Node.js environment. You can use this to consume arbitrary functionality from NPM packages at runtime in your ASP.NET Core app.
   * Most applications developers don't need to use this directly, but you can do so if you want to implement your own functionality that involves calling Node.js code from .NET at runtime.
-   * Find [documentation and usage examples here](/src/Microsoft.AspNetCore.NodeServices#microsoftaspnetcorenodeservices).
+   * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices#microsoftaspnetcorenodeservices).
 * `Microsoft.AspNetCore.SpaServices`
   * This provides infrastructure that's generally useful when building Single Page Applications (SPAs) with technologies such as Angular or React (for example, server-side prerendering and webpack middleware). Internally, it uses the `NodeServices` package to implement its features.
-   * Find [documentation and usage examples here](/src/Microsoft.AspNetCore.SpaServices#microsoftaspnetcorespaservices)
+   * Find [documentation and usage examples here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices#microsoftaspnetcorespaservices).
+ * `Microsoft.AspNetCore.AngularServices`
+   * This builds on the `SpaServices` package and includes features specific to Angular. Currently, this includes validation helpers.
+   * The code is [here](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices). You'll find a usage example for [the validation helper here](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts).

-There were previously other packages called  `Microsoft.AspNetCore.AngularServices` and `Microsoft.AspNetCore.ReactServices` but these are not currently needed - all applicable functionality is in `Microsoft.AspNetCore.SpaServices`, because it's sufficiently general.
+There was previously a `Microsoft.AspNetCore.ReactServices` but this is not currently needed - all applicable functionality is in `Microsoft.AspNetCore.SpaServices`, because it's sufficiently general. We might add a new `Microsoft.AspNetCore.ReactServices` package in the future if new React-specific requirements emerge.

 If you want to build a helper library for some other SPA framework, you can do so by taking a dependency on `Microsoft.AspNetCore.SpaServices` and wrapping its functionality in whatever way is most useful for your SPA framework.

-## Samples
+## Samples and templates

-The [`samples` directory](/samples) contains examples of:
+Inside this repo, [the `templates` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/templates) contains the application starting points that the `aspnetcore-spa` generator emits. You can clone this repo and run those applications directly. But it's easier to [use the Yeoman tool to run the generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/).
+
+The [`samples` directory](https://github.com/aspnet/JavaScriptServices/tree/dev/samples) contains examples of:

 - Using the JavaScript services family of packages with Angular and React.
 - A standalone `NodeServices` usage for runtime code transpilation and image processing.
@@ -91,6 +88,13 @@ The [`samples` directory](/samples) contains examples of:

 ## Contributing

-If you're interested in contributing to the various packages, samples, and project templates in this repo, that's great!
+If you're interested in contributing to the various packages, samples, and project templates in this repo, that's great! You can run the code in this repo as follows:

-Before working on a pull request, especially if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans.
+ * Clone the repo
+ * Run `dotnet restore` at the repo root dir
+ * Go to whatever sample or template you want to run (for example, `cd templates/AngularSpa`)
+ * Restore NPM dependencies (run `npm install`)
+ * If the sample/template you're trying to run has a file called `webpack.config.vendor.js` at its root, run `webpack --config webpack.config.vendor.js`. If it has a file called `webpack.config.js`, run `webpack` (no args). You might need to install webpack first, by running `npm install -g webpack`.
+ * Launch it (`dotnet run`)
+
+If you're planning to submit a pull request, and if it's more than a trivial fix (for example, for a typo), it's usually a good idea first to file an issue describing what you're proposing to do and how it will work. Then you can find out if it's likely that such a pull request will be accepted, and how it fits into wider ongoing plans.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -0,0 +1,42 @@
+init:
+  - git config --global core.autocrlf true
+install:
+   - ps: Install-Product node 6.9.2 x64
+   # .NET Core SDK binaries
+   # Download .NET Core 2.0 Preview 3 SDK and add to PATH
+   - ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0-preview3-006857/dotnet-sdk-2.0.0-preview3-006857-win-x64.zip"
+   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+   - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+   - ps: $tempFileCurrent = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName())
+   - ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent)
+   - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR)
+   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+build_script:
+  - ps: Push-Location
+  - cd templates/package-builder
+  - npm install
+  - npm run build
+  - ps: Pop-Location
+artifacts:
+  - path: templates\package-builder\artifacts\*.nupkg
+    name: Microsoft.AspNetCore.SpaTemplates
+    type: NuGetPackage
+#  - ps: .\build.ps1
+clone_depth: 1
+environment:
+  global:
+    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+    DOTNET_CLI_TELEMETRY_OPTOUT: 1
+test_script:
+  - dotnet restore
+  - ps: Push-Location
+  - cd test
+  - npm install selenium-standalone
+  - ps: Start-Process node './start-selenium.js'
+  - npm install
+  - npm test
+on_finish :
+  - ps: Pop-Location
+  # After running tests, upload results to Appveyor
+  - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test\tmp\junit\*.xml))
+deploy: off
--- a/build.cmd
+++ b/build.cmd
@@ -1,2 +1,2 @@
@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE"
+PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"
--- a/build.ps1
+++ b/build.ps1
@@ -3,13 +3,10 @@

 <#
 .SYNOPSIS
-Executes KoreBuild commands.
+Build this repository

 .DESCRIPTION
-Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`.
-
-.PARAMETER Command
-The KoreBuild command to run.
+Downloads korebuild if required. Then builds the repository.

 .PARAMETER Path
 The folder to build. Defaults to the folder containing this script.
@@ -26,42 +23,32 @@ The base url where build tools can be downloaded. Overrides the value from the c
 .PARAMETER Update
 Updates KoreBuild to the latest version even if a lock file is present.

-.PARAMETER Reinstall
-Re-installs KoreBuild
-
 .PARAMETER ConfigFile
-The path to the configuration file that stores values. Defaults to korebuild.json.
+The path to the configuration file that stores values. Defaults to version.xml.

-.PARAMETER ToolsSourceSuffix
-The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores.
-
-.PARAMETER CI
-Sets up CI specific settings and variables.
-
-.PARAMETER Arguments
-Arguments to be passed to the command
+.PARAMETER MSBuildArgs
+Arguments to be passed to MSBuild

 .NOTES
 This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be.
 When the lockfile is not present, KoreBuild will create one using latest available version from $Channel.

-The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set
-in the file are overridden by command line parameters.
+The $ConfigFile is expected to be an XML file. It is optional, and the configuration values in it are optional as well.

 .EXAMPLE
 Example config file:
-```json
-{
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
-  "channel": "master",
-  "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
-}
+```xml
+<!-- version.xml -->
+<Project>
+  <PropertyGroup>
+    <KoreBuildChannel>dev</KoreBuildChannel>
+    <KoreBuildToolsSource>https://aspnetcore.blob.core.windows.net/buildtools</KoreBuildToolsSource>
+  </PropertyGroup>
+</Project>
 ```
 #>
 [CmdletBinding(PositionalBinding = $false)]
 param(
-    [Parameter(Mandatory = $true, Position = 0)]
-    [string]$Command,
    [string]$Path = $PSScriptRoot,
    [Alias('c')]
    [string]$Channel,
@@ -71,12 +58,9 @@ param(
    [string]$ToolsSource,
    [Alias('u')]
    [switch]$Update,
-    [switch]$Reinstall,
-    [string]$ToolsSourceSuffix,
-    [string]$ConfigFile = $null,
-    [switch]$CI,
+    [string]$ConfigFile = (Join-Path $PSScriptRoot 'version.xml'),
    [Parameter(ValueFromRemainingArguments = $true)]
-    [string[]]$Arguments
+    [string[]]$MSBuildArgs
 )

 Set-StrictMode -Version 2
@@ -91,7 +75,7 @@ function Get-KoreBuild {
    $lockFile = Join-Path $Path 'korebuild-lock.txt'

    if (!(Test-Path $lockFile) -or $Update) {
-        Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix
+        Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile
    }

    $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1
@@ -101,10 +85,6 @@ function Get-KoreBuild {
    $version = $version.TrimStart('version:').Trim()
    $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)

-    if ($Reinstall -and (Test-Path $korebuildPath)) {
-        Remove-Item -Force -Recurse $korebuildPath
-    }
-
    if (!(Test-Path $korebuildPath)) {
        Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
        New-Item -ItemType Directory -Path $korebuildPath | Out-Null
@@ -112,10 +92,10 @@ function Get-KoreBuild {

        try {
            $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
-            Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix
-            if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) {
+            Get-RemoteFile $remotePath $tmpfile
+            if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) {
                # Use built-in commands where possible as they are cross-plat compatible
-                Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
+                Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
            }
            else {
                # Fallback to old approach for old installations of PowerShell
@@ -140,7 +120,7 @@ function Join-Paths([string]$path, [string[]]$childPaths) {
    return $path
 }

-function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) {
+function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
    if ($RemotePath -notlike 'http*') {
        Copy-Item $RemotePath $LocalPath
        return
@@ -150,7 +130,7 @@ function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$Remote
    while ($retries -gt 0) {
        $retries -= 1
        try {
-            Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath
+            Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath
            return
        }
        catch {
@@ -167,22 +147,10 @@ function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$Remote

 # Load configuration or set defaults

-$Path = Resolve-Path $Path
-if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' }
-
 if (Test-Path $ConfigFile) {
-    try {
-        $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json
-        if ($config) {
-            if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel }
-            if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource}
-        }
-    }
-    catch {
-        Write-Host -ForegroundColor Red $Error[0]
-        Write-Error "$ConfigFile contains invalid JSON."
-        exit 1
-    }
+    [xml] $config = Get-Content $ConfigFile
+    if (!($Channel)) { [string] $Channel = Select-Xml -Xml $config -XPath '/Project/PropertyGroup/KoreBuildChannel' }
+    if (!($ToolsSource)) { [string] $ToolsSource = Select-Xml -Xml $config -XPath '/Project/PropertyGroup/KoreBuildToolsSource' }
 }

 if (!$DotNetHome) {
@@ -192,7 +160,7 @@ if (!$DotNetHome) {
        else { Join-Path $PSScriptRoot '.dotnet'}
 }

-if (!$Channel) { $Channel = 'master' }
+if (!$Channel) { $Channel = 'dev' }
 if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }

 # Execute
@@ -201,8 +169,8 @@ $korebuildPath = Get-KoreBuild
 Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')

 try {
-    Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI
-    Invoke-KoreBuildCommand $Command @Arguments
+    Install-Tools $ToolsSource $DotNetHome
+    Invoke-RepositoryBuild $Path @MSBuildArgs
 }
 finally {
    Remove-Module 'KoreBuild' -ErrorAction Ignore
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,199 @@
 #!/usr/bin/env bash

 set -euo pipefail
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

-# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
-chmod +x "$DIR/run.sh"; sync
-"$DIR/run.sh" default-build "$@"
+#
+# variables
+#
+
+RESET="\033[0m"
+RED="\033[0;31m"
+MAGENTA="\033[0;95m"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
+config_file="$DIR/version.xml"
+verbose=false
+update=false
+repo_path="$DIR"
+channel=''
+tools_source=''
+
+#
+# Functions
+#
+__usage() {
+    echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] <MSBUILD_ARG>...]"
+    echo ""
+    echo "Arguments:"
+    echo "    <MSBUILD_ARG>...         Arguments passed to MSBuild. Variable number of arguments allowed."
+    echo ""
+    echo "Options:"
+    echo "    --verbose                Show verbose output."
+    echo "    -c|--channel <CHANNEL>   The channel of KoreBuild to download. Overrides the value from the config file.."
+    echo "    --config-file <FILE>     TThe path to the configuration file that stores values. Defaults to version.xml."
+    echo "    -d|--dotnet-home <DIR>   The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet."
+    echo "    --path <PATH>            The directory to build. Defaults to the directory containing the script."
+    echo "    -s|--tools-source <URL>  The base url where build tools can be downloaded. Overrides the value from the config file."
+    echo "    -u|--update              Update to the latest KoreBuild even if the lock file is present."
+    echo ""
+    echo "Description:"
+    echo "    This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
+    echo "    When the lockfile is not present, KoreBuild will create one using latest available version from \$channel."
+
+    if [[ "${1:-}" != '--no-exit' ]]; then
+        exit 2
+    fi
+}
+
+get_korebuild() {
+    local version
+    local lock_file="$repo_path/korebuild-lock.txt"
+    if [ ! -f "$lock_file" ] || [ "$update" = true ]; then
+        __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file"
+    fi
+    version="$(grep 'version:*' -m 1 "$lock_file")"
+    if [[ "$version" == '' ]]; then
+        __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'"
+        return 1
+    fi
+    version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
+    local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
+
+    {
+        if [ ! -d "$korebuild_path" ]; then
+            mkdir -p "$korebuild_path"
+            local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip"
+            tmpfile="$(mktemp)"
+            echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}"
+            if __get_remote_file "$remote_path" "$tmpfile"; then
+                unzip -q -d "$korebuild_path" "$tmpfile"
+            fi
+            rm "$tmpfile" || true
+        fi
+
+        source "$korebuild_path/KoreBuild.sh"
+    } || {
+        if [ -d "$korebuild_path" ]; then
+            echo "Cleaning up after failed installation"
+            rm -rf "$korebuild_path" || true
+        fi
+        return 1
+    }
+}
+
+__error() {
+    echo -e "${RED}$*${RESET}" 1>&2
+}
+
+__machine_has() {
+    hash "$1" > /dev/null 2>&1
+    return $?
+}
+
+__get_remote_file() {
+    local remote_path=$1
+    local local_path=$2
+
+    if [[ "$remote_path" != 'http'* ]]; then
+        cp "$remote_path" "$local_path"
+        return 0
+    fi
+
+    local failed=false
+    if __machine_has wget; then
+        wget --tries 10 --quiet -O "$local_path" "$remote_path" || failed=true
+    else
+        failed=true
+    fi
+
+    if [ "$failed" = true ] && __machine_has curl; then
+        failed=false
+        curl --retry 10 -sSL -f --create-dirs -o "$local_path" "$remote_path" || failed=true
+    fi
+
+    if [ "$failed" = true ]; then
+        __error "Download failed: $remote_path" 1>&2
+        return 1
+    fi
+}
+
+__read_dom () { local IFS=\> ; read -r -d \< ENTITY CONTENT ;}
+
+#
+# main
+#
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -\?|-h|--help)
+            __usage --no-exit
+            exit 0
+            ;;
+        -c|--channel|-Channel)
+            shift
+            channel="${1:-}"
+            [ -z "$channel" ] && __usage
+            ;;
+        --config-file|-ConfigFile)
+            shift
+            config_file="${1:-}"
+            [ -z "$config_file" ] && __usage
+            ;;
+        -d|--dotnet-home|-DotNetHome)
+            shift
+            DOTNET_HOME="${1:-}"
+            [ -z "$DOTNET_HOME" ] && __usage
+            ;;
+        --path|-Path)
+            shift
+            repo_path="${1:-}"
+            [ -z "$repo_path" ] && __usage
+            ;;
+        -s|--tools-source|-ToolsSource)
+            shift
+            tools_source="${1:-}"
+            [ -z "$tools_source" ] && __usage
+            ;;
+        -u|--update|-Update)
+            update=true
+            ;;
+        --verbose|-Verbose)
+            verbose=true
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            break
+            ;;
+    esac
+    shift
+done
+
+if ! __machine_has unzip; then
+    __error 'Missing required command: unzip'
+    exit 1
+fi
+
+if ! __machine_has curl && ! __machine_has wget; then
+    __error 'Missing required command. Either wget or curl is required.'
+    exit 1
+fi
+
+if [ -f "$config_file" ]; then
+    comment=false
+    while __read_dom; do
+        if [ "$comment" = true ]; then [[ $CONTENT == *'-->'* ]] && comment=false ; continue; fi
+        if [[ $ENTITY == '!--'* ]]; then comment=true; continue; fi
+        if [ -z "$channel" ] && [[ $ENTITY == "KoreBuildChannel" ]]; then channel=$CONTENT; fi
+        if [ -z "$tools_source" ] && [[ $ENTITY == "KoreBuildToolsSource" ]]; then tools_source=$CONTENT; fi
+    done < "$config_file"
+fi
+
+[ -z "$channel" ] && channel='dev'
+[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
+
+get_korebuild
+install_tools "$tools_source" "$DOTNET_HOME"
+invoke_repository_build "$repo_path" "$@"
--- a/build/common.props
+++ b/build/common.props
@@ -0,0 +1,23 @@
+<Project>
+  <Import Project="dependencies.props" />
+  <Import Project="..\version.xml" />
+
+  <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
+    <RepositoryUrl>https://github.com/aspnet/javascriptservices</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
+    <PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
+  </ItemGroup>
+</Project>
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,31 +1,11 @@
-<Project>
+<Project>
  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>
+    <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
+    <JsonNetVersion>10.0.1</JsonNetVersion>
+    <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
+    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
+    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
+    <ThreadingDataflowVersion>4.8.0-*</ThreadingDataflowVersion>
  </PropertyGroup>
-  <PropertyGroup Label="Package Versions">
-    <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181011.3</InternalAspNetCoreSdkPackageVersion>
-    <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreDiagnosticsPackageVersion>
-    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
-    <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreHostingPackageVersion>
-    <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreMvcPackageVersion>
-    <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
-    <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
-    <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
-    <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreServerKestrelPackageVersion>
-    <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreStaticFilesPackageVersion>
-    <MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreWebSocketsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10605</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-alpha1-10605</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10605</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10605</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
-    <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview2-26905-02</MicrosoftNETCoreApp22PackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-alpha1-10605</MicrosoftNETSdkRazorPackageVersion>
-    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
-    <SystemThreadingTasksDataflowPackageVersion>4.10.0-preview1-26907-04</SystemThreadingTasksDataflowPackageVersion>
-  </PropertyGroup>
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-  <PropertyGroup Label="Package Versions: Pinned" />
 </Project>
--- a/build/repo.props
+++ b/build/repo.props
@@ -1,15 +0,0 @@
-<Project>
-  <Import Project="dependencies.props" />
-
-  <PropertyGroup>
-    <!-- These properties are use by the automation that updates dependencies.props -->
-    <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
-    <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
-  </ItemGroup>
-</Project>
--- a/build/sources.props
+++ b/build/sources.props
@@ -1,17 +0,0 @@
-<Project>
-  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
-
-  <PropertyGroup Label="RestoreSources">
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-  </PropertyGroup>
-</Project>
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +0,0 @@
-version:3.0.0-alpha1-20181011.3
-commithash:e7569d931e994629267ab2646e9926140962b4ac
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,10 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
-  "channel": "master",
-  "toolsets": {
-    "nodejs": {
-      "required": true,
-      "minVersion": "6.9"
-    }
-  }
-}
--- a/run.cmd
+++ b/run.cmd
@@ -1,2 +0,0 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE"
--- a/run.sh
+++ b/run.sh
@@ -1,256 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-#
-# variables
-#
-
-RESET="\033[0m"
-RED="\033[0;31m"
-YELLOW="\033[0;33m"
-MAGENTA="\033[0;95m"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
-verbose=false
-update=false
-reinstall=false
-repo_path="$DIR"
-channel=''
-tools_source=''
-tools_source_suffix=''
-ci=false
-
-#
-# Functions
-#
-__usage() {
-    echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] <Arguments>...]"
-    echo ""
-    echo "Arguments:"
-    echo "    command                The command to be run."
-    echo "    <Arguments>...         Arguments passed to the command. Variable number of arguments allowed."
-    echo ""
-    echo "Options:"
-    echo "    --verbose                                             Show verbose output."
-    echo "    -c|--channel <CHANNEL>                                The channel of KoreBuild to download. Overrides the value from the config file.."
-    echo "    --config-file <FILE>                                  The path to the configuration file that stores values. Defaults to korebuild.json."
-    echo "    -d|--dotnet-home <DIR>                                The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet."
-    echo "    --path <PATH>                                         The directory to build. Defaults to the directory containing the script."
-    echo "    -s|--tools-source|-ToolsSource <URL>                  The base url where build tools can be downloaded. Overrides the value from the config file."
-    echo "    --tools-source-suffix|-ToolsSourceSuffix <SUFFIX>     The suffix to append to tools-source. Useful for query strings."
-    echo "    -u|--update                                           Update to the latest KoreBuild even if the lock file is present."
-    echo "    --reinstall                                           Reinstall KoreBuild."
-    echo "    --ci                                                  Apply CI specific settings and environment variables."
-    echo ""
-    echo "Description:"
-    echo "    This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
-    echo "    When the lockfile is not present, KoreBuild will create one using latest available version from \$channel."
-
-    if [[ "${1:-}" != '--no-exit' ]]; then
-        exit 2
-    fi
-}
-
-get_korebuild() {
-    local version
-    local lock_file="$repo_path/korebuild-lock.txt"
-    if [ ! -f "$lock_file" ] || [ "$update" = true ]; then
-        __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix"
-    fi
-    version="$(grep 'version:*' -m 1 "$lock_file")"
-    if [[ "$version" == '' ]]; then
-        __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'"
-        return 1
-    fi
-    version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-    local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
-
-    if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then
-        rm -rf "$korebuild_path"
-    fi
-
-    {
-        if [ ! -d "$korebuild_path" ]; then
-            mkdir -p "$korebuild_path"
-            local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip"
-            tmpfile="$(mktemp)"
-            echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}"
-            if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then
-                unzip -q -d "$korebuild_path" "$tmpfile"
-            fi
-            rm "$tmpfile" || true
-        fi
-
-        source "$korebuild_path/KoreBuild.sh"
-    } || {
-        if [ -d "$korebuild_path" ]; then
-            echo "Cleaning up after failed installation"
-            rm -rf "$korebuild_path" || true
-        fi
-        return 1
-    }
-}
-
-__error() {
-    echo -e "${RED}error: $*${RESET}" 1>&2
-}
-
-__warn() {
-    echo -e "${YELLOW}warning: $*${RESET}"
-}
-
-__machine_has() {
-    hash "$1" > /dev/null 2>&1
-    return $?
-}
-
-__get_remote_file() {
-    local remote_path=$1
-    local local_path=$2
-    local remote_path_suffix=$3
-
-    if [[ "$remote_path" != 'http'* ]]; then
-        cp "$remote_path" "$local_path"
-        return 0
-    fi
-
-    local failed=false
-    if __machine_has wget; then
-        wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true
-    else
-        failed=true
-    fi
-
-    if [ "$failed" = true ] && __machine_has curl; then
-        failed=false
-        curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true
-    fi
-
-    if [ "$failed" = true ]; then
-        __error "Download failed: $remote_path" 1>&2
-        return 1
-    fi
-}
-
-#
-# main
-#
-
-command="${1:-}"
-shift
-
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        -\?|-h|--help)
-            __usage --no-exit
-            exit 0
-            ;;
-        -c|--channel|-Channel)
-            shift
-            channel="${1:-}"
-            [ -z "$channel" ] && __usage
-            ;;
-        --config-file|-ConfigFile)
-            shift
-            config_file="${1:-}"
-            [ -z "$config_file" ] && __usage
-            if [ ! -f "$config_file" ]; then
-                __error "Invalid value for --config-file. $config_file does not exist."
-                exit 1
-            fi
-            ;;
-        -d|--dotnet-home|-DotNetHome)
-            shift
-            DOTNET_HOME="${1:-}"
-            [ -z "$DOTNET_HOME" ] && __usage
-            ;;
-        --path|-Path)
-            shift
-            repo_path="${1:-}"
-            [ -z "$repo_path" ] && __usage
-            ;;
-        -s|--tools-source|-ToolsSource)
-            shift
-            tools_source="${1:-}"
-            [ -z "$tools_source" ] && __usage
-            ;;
-        --tools-source-suffix|-ToolsSourceSuffix)
-            shift
-            tools_source_suffix="${1:-}"
-            [ -z "$tools_source_suffix" ] && __usage
-            ;;
-        -u|--update|-Update)
-            update=true
-            ;;
-        --reinstall|-[Rr]einstall)
-            reinstall=true
-            ;;
-        --ci|-[Cc][Ii])
-            ci=true
-            ;;
-        --verbose|-Verbose)
-            verbose=true
-            ;;
-        --)
-            shift
-            break
-            ;;
-        *)
-            break
-            ;;
-    esac
-    shift
-done
-
-if ! __machine_has unzip; then
-    __error 'Missing required command: unzip'
-    exit 1
-fi
-
-if ! __machine_has curl && ! __machine_has wget; then
-    __error 'Missing required command. Either wget or curl is required.'
-    exit 1
-fi
-
-[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json"
-if [ -f "$config_file" ]; then
-    if __machine_has jq ; then
-        if jq '.' "$config_file" >/dev/null ; then
-            config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
-            config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
-        else
-            __error "$config_file contains invalid JSON."
-            exit 1
-        fi
-    elif __machine_has python ; then
-        if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
-            config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
-            config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
-        else
-            __error "$config_file contains invalid JSON."
-            exit 1
-        fi
-    elif __machine_has python3 ; then
-        if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
-            config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
-            config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
-        else
-            __error "$config_file contains invalid JSON."
-            exit 1
-        fi
-    else
-        __error 'Missing required command: jq or python. Could not parse the JSON file.'
-        exit 1
-    fi
-
-    [ ! -z "${config_channel:-}" ] && channel="$config_channel"
-    [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
-fi
-
-[ -z "$channel" ] && channel='master'
-[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
-
-get_korebuild
-set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci"
-invoke_korebuild_command "$command" "$@"
--- a/samples/misc/LatencyTest/LatencyTest.csproj
+++ b/samples/misc/LatencyTest/LatencyTest.csproj
@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\build\common.props" />

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <IsPackable>false</IsPackable>
    <OutputType>exe</OutputType>
  </PropertyGroup>
@@ -12,7 +14,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
  </ItemGroup>

 </Project>
--- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
+++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

+  <Import Project="..\..\..\build\common.props" />
+
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
@@ -11,14 +13,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
  </ItemGroup>

  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
--- a/samples/misc/Webpack/Webpack.csproj
+++ b/samples/misc/Webpack/Webpack.csproj
@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

+  <Import Project="..\..\..\build\common.props" />
+
  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
@@ -11,14 +13,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
-    <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
  </ItemGroup>

  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
--- a/scripts/Regenerate-JSFiles.ps1
+++ b/scripts/Regenerate-JSFiles.ps1
@@ -1,28 +0,0 @@
-[cmdletbinding(SupportsShouldProcess = $true)]
-param(
-)
-
-$ErrorActionPreference = 'Stop'
-Set-StrictMode -Version 2
-
-Push-Location "src"
-try {
-    $dirs = Get-ChildItem -Directory
-    foreach($dir in $dirs)
-    {
-        Push-Location $dir
-        try{
-            if(Test-Path -Path "package.json")
-            {
-                npm install
-                npm run build
-            }
-        }
-        finally{
-            Pop-Location
-        }
-    }
-}
-finally {
-    Pop-Location
-}
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,13 +0,0 @@
-<Project>
-  <Import Project="..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
-  </ItemGroup>
-</Project>
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Content/Node/entrypoint-socket.js
@@ -1,114 +1,57 @@
-(function (e, a) { for (var i in a) e[i] = a[i]; }(exports, /******/(function (modules) { // webpackBootstrap
+(function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-/******/
+
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-/******/
+
 /******/ 		// Check if module is in cache
-/******/ 		if (installedModules[moduleId]) {
+/******/ 		if(installedModules[moduleId])
 /******/ 			return installedModules[moduleId].exports;
-            /******/
-        }
+
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-            /******/
-        };
-/******/
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
+
 /******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
+/******/ 		module.loaded = true;
+
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
-        /******/
-    }
-/******/
-/******/
+/******/ 	}
+
+
 /******/ 	// expose the modules object (__webpack_modules__)
 /******/ 	__webpack_require__.m = modules;
-/******/
+
 /******/ 	// expose the module cache
 /******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function (exports, name, getter) {
-/******/ 		if (!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-            /******/
-        }
-        /******/
-    };
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function (exports) {
-/******/ 		if (typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-            /******/
-        }
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-        /******/
-    };
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function (value, mode) {
-/******/ 		if (mode & 1) value = __webpack_require__(value);
-/******/ 		if (mode & 8) return value;
-/******/ 		if ((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if (mode & 2 && typeof value != 'string') for (var key in value) __webpack_require__.d(ns, key, function (key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-        /******/
-    };
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function (module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-        /******/
-    };
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function (object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
+
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-/******/
-/******/
+
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
-    /******/
-})
+/******/ 	return __webpack_require__(0);
+/******/ })
 /************************************************************************/
-/******/([
+/******/ ([
 /* 0 */
-/***/ (function (module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

 	module.exports = __webpack_require__(1);


-            /***/
-        }),
+/***/ },
 /* 1 */
-/***/ (function (module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

 	"use strict";
-
-            exports.__esModule = true;
 	// Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive,
 	// but simplifies things for the consumer of this module.
 	__webpack_require__(2);
@@ -172,13 +115,12 @@
 	var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
 	var listenAddress = (useWindowsNamedPipes ? '\\\\.\\pipe\\' : '/tmp/') + parsedArgs.listenAddress;
 	server.listen(listenAddress);
-            ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true);
+	ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid));


-            /***/
-        }),
+/***/ },
 /* 2 */
-/***/ (function (module, exports) {
+/***/ function(module, exports) {

 	// When Node writes to stdout/strerr, we capture that and convert the lines into calls on the
 	// active .NET ILogger. But by default, stdout/stderr don't have any way of distinguishing
@@ -217,35 +159,29 @@
 	}


-            /***/
-        }),
+/***/ },
 /* 3 */
-/***/ (function (module, exports) {
+/***/ function(module, exports) {

 	module.exports = require("net");

-            /***/
-        }),
+/***/ },
 /* 4 */
-/***/ (function (module, exports) {
+/***/ function(module, exports) {

 	module.exports = require("path");

-            /***/
-        }),
+/***/ },
 /* 5 */
-/***/ (function (module, exports) {
+/***/ function(module, exports) {

 	module.exports = require("readline");

-            /***/
-        }),
+/***/ },
 /* 6 */
-/***/ (function (module, exports, __webpack_require__) {
+/***/ function(module, exports) {

 	"use strict";
-
-            exports.__esModule = true;
 	function parseArgs(args) {
 	    // Very simplistic parsing which is sufficient for the cases needed. We don't want to bring in any external
 	    // dependencies (such as an args-parsing library) to this file.
@@ -267,12 +203,9 @@
 	exports.parseArgs = parseArgs;


-            /***/
-        }),
+/***/ },
 /* 7 */
-/***/ (function (module, exports, __webpack_require__) {
-
-            "use strict";
+/***/ function(module, exports) {

 	/*
 	In general, we want the Node child processes to be terminated as soon as the parent .NET processes exit,
@@ -307,9 +240,9 @@
 	Of these, the only cross-platform approach that is actually documented as a valid strategy is simply polling
 	to check whether the parent PID is still running. So that's what we do here.
 	*/
-            exports.__esModule = true;
+	"use strict";
 	var pollIntervalMs = 1000;
-            function exitWhenParentExits(parentPid, ignoreSigint) {
+	function exitWhenParentExits(parentPid) {
 	    setInterval(function () {
 	        if (!processExists(parentPid)) {
 	            // Can't log anything at this point, because out stdout was connected to the parent,
@@ -317,24 +250,6 @@
 	            process.exit();
 	        }
 	    }, pollIntervalMs);
-                if (ignoreSigint) {
-                    // Pressing ctrl+c in the terminal sends a SIGINT to all processes in the foreground process tree.
-                    // By default, the Node process would then exit before the .NET process, because ASP.NET implements
-                    // a delayed shutdown to allow ongoing requests to complete.
-                    //
-                    // This is problematic, because if Node exits first, the CopyToAsync code in ConditionalProxyMiddleware
-                    // will experience a read fault, and logs a huge load of errors. Fortunately, since the Node process is
-                    // already set up to shut itself down if it detects the .NET process is terminated, all we have to do is
-                    // ignore the SIGINT. The Node process will then terminate automatically after the .NET process does.
-                    //
-                    // A better solution would be to have WebpackDevMiddleware listen for SIGINT and gracefully close any
-                    // ongoing EventSource connections before letting the Node process exit, independently of the .NET
-                    // process exiting. However, doing this well in general is very nontrivial (see all the discussion at
-                    // https://github.com/nodejs/node/issues/2642).
-                    process.on('SIGINT', function () {
-                        console.log('Received SIGINT. Waiting for .NET process to exit...');
-                    });
-                }
 	}
 	exports.exitWhenParentExits = exitWhenParentExits;
 	function processExists(pid) {
@@ -355,14 +270,11 @@
 	}


-            /***/
-        }),
+/***/ },
 /* 8 */
-/***/ (function (module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

 	"use strict";
-
-            exports.__esModule = true;
 	var events_1 = __webpack_require__(9);
 	var VirtualConnection_1 = __webpack_require__(10);
 	// Keep this in sync with the equivalent constant in the .NET code. Both sides split up their transmissions into frames with this max length,
@@ -388,7 +300,7 @@
 	/**
 	 * Tracks the 'virtual connections' associated with a single physical socket connection.
 	 */
-            var VirtualConnectionsCollection = /** @class */ (function () {
+	var VirtualConnectionsCollection = (function () {
 	    function VirtualConnectionsCollection(_socket, _onVirtualConnectionCallback) {
 	        var _this = this;
 	        this._socket = _socket;
@@ -470,7 +382,7 @@
 	        newVirtualConnection.on('finish', function () {
 	            // The virtual connection was closed locally. Clean up locally, and notify the remote that we're done.
 	            _this._onVirtualConnectionWasClosed(header.connectionIdString);
-                        _this._sendFrame(header.connectionIdBinary, Buffer.alloc(0));
+	            _this._sendFrame(header.connectionIdBinary, new Buffer(0));
 	        });
 	        this._virtualConnections[header.connectionIdString] = newVirtualConnection;
 	        this._onVirtualConnectionCallback(newVirtualConnection);
@@ -532,7 +444,7 @@
 	     * Sends a number serialized in the correct format for .NET to receive as a System.Int32
 	     */
 	    VirtualConnectionsCollection.prototype._sendInt32LE = function (value, callback) {
-                    var buf = Buffer.alloc(4);
+	        var buf = new Buffer(4);
 	        buf.writeInt32LE(value, 0);
 	        this._socket.write(buf, callback);
 	    };
@@ -545,39 +457,27 @@
 	}());


-            /***/
-        }),
+/***/ },
 /* 9 */
-/***/ (function (module, exports) {
+/***/ function(module, exports) {

 	module.exports = require("events");

-            /***/
-        }),
+/***/ },
 /* 10 */
-/***/ (function (module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

 	"use strict";
-
-            var __extends = (this && this.__extends) || (function () {
-                var extendStatics = function (d, b) {
-                    extendStatics = Object.setPrototypeOf ||
-                        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-                        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-                    return extendStatics(d, b);
-                }
-                return function (d, b) {
-                    extendStatics(d, b);
+	var __extends = (this && this.__extends) || function (d, b) {
+	    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
 	    function __() { this.constructor = d; }
 	    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 	};
-            })();
-            exports.__esModule = true;
 	var stream_1 = __webpack_require__(11);
 	/**
 	 * Represents a virtual connection. Multiple virtual connections may be multiplexed over a single physical socket connection.
 	 */
-            var VirtualConnection = /** @class */ (function (_super) {
+	var VirtualConnection = (function (_super) {
 	    __extends(VirtualConnection, _super);
 	    function VirtualConnection(_beginWriteCallback) {
 	        var _this = _super.call(this) || this;
@@ -597,7 +497,7 @@
 	    };
 	    VirtualConnection.prototype._write = function (chunk, encodingIfString, callback) {
 	        if (typeof chunk === 'string') {
-                        chunk = Buffer.from(chunk, encodingIfString);
+	            chunk = new Buffer(chunk, encodingIfString);
 	        }
 	        this._beginWriteCallback(chunk, callback);
 	    };
@@ -614,13 +514,11 @@
 	exports.VirtualConnection = VirtualConnection;


-            /***/
-        }),
+/***/ },
 /* 11 */
-/***/ (function (module, exports) {
+/***/ function(module, exports) {

 	module.exports = require("stream");

-            /***/
-        })
-/******/])));
+/***/ }
+/******/ ])));
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
@@ -1,8 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">

+  <Import Project="..\..\build\common.props" />
+
  <PropertyGroup>
    <Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
+    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
  </PropertyGroup>

  <ItemGroup>
@@ -12,10 +16,7 @@

  <ItemGroup>
    <ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(SystemThreadingTasksDataflowPackageVersion)" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(ThreadingDataflowVersion)" />
  </ItemGroup>

  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/SocketNodeInstance.cs
@@ -14,7 +14,8 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets
    /// <summary>
    /// A specialisation of the OutOfProcessNodeInstance base class that uses a lightweight binary streaming protocol
    /// to perform RPC invocations. The physical transport is Named Pipes on Windows, or Domain Sockets on Linux/Mac.
-    /// For details on the binary streaming protocol, see <see cref="Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections.VirtualConnectionClient" />
+    /// For details on the binary streaming protocol, see
+    /// Microsoft.AspNetCore.NodeServices.HostingModels.VirtualConnections.VirtualConnectionClient.
    /// The advantage versus using HTTP for RPC is that this is faster (not surprisingly - there's much less overhead
    /// because we don't need most of the functionality of HTTP.
    ///
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnection.ts
@@ -27,7 +27,7 @@ export class VirtualConnection extends Duplex {

    public _write(chunk: Buffer | string, encodingIfString: string, callback: EndWriteCallback) {
        if (typeof chunk === 'string') {
-            chunk = Buffer.from(chunk as string, encodingIfString);
+            chunk = new Buffer(chunk as string, encodingIfString);
        }

        this._beginWriteCallback(chunk as Buffer, callback);
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/VirtualConnections/VirtualConnectionServer.ts
@@ -113,7 +113,7 @@ class VirtualConnectionsCollection {
        newVirtualConnection.on('finish', () => {
            // The virtual connection was closed locally. Clean up locally, and notify the remote that we're done.
            this._onVirtualConnectionWasClosed(header.connectionIdString);
-            this._sendFrame(header.connectionIdBinary, Buffer.alloc(0));
+            this._sendFrame(header.connectionIdBinary, new Buffer(0));
        });

        this._virtualConnections[header.connectionIdString] = newVirtualConnection;
@@ -180,7 +180,7 @@ class VirtualConnectionsCollection {
     * Sends a number serialized in the correct format for .NET to receive as a System.Int32
     */
    private _sendInt32LE(value: number, callback?: EndWriteCallback) {
-        const buf = Buffer.alloc(4);
+        const buf = new Buffer(4);
        buf.writeInt32LE(value, 0);
        this._socket.write(buf, callback);
    }
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/baseline.netcore.json
@@ -1,109 +0,0 @@
-{
-  "AssemblyIdentity": "Microsoft.AspNetCore.NodeServices.Sockets, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
-  "Types": [
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.Sockets.NodeServicesOptionsExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseSocketHosting",
-          "Parameters": [
-            {
-              "Name": "options",
-              "Type": "Microsoft.AspNetCore.NodeServices.NodeServicesOptions"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections.VirtualConnectionReadErrorHandler",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Sealed": true,
-      "BaseType": "System.MulticastDelegate",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Invoke",
-          "Parameters": [
-            {
-              "Name": "ex",
-              "Type": "System.Exception"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "BeginInvoke",
-          "Parameters": [
-            {
-              "Name": "ex",
-              "Type": "System.Exception"
-            },
-            {
-              "Name": "callback",
-              "Type": "System.AsyncCallback"
-            },
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            }
-          ],
-          "ReturnType": "System.IAsyncResult",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "EndInvoke",
-          "Parameters": [
-            {
-              "Name": "result",
-              "Type": "System.IAsyncResult"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "method",
-              "Type": "System.IntPtr"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    }
-  ]
-}
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/package-lock.json
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/package-lock.json
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/package.json
@@ -5,15 +5,14 @@
  "main": "index.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack --mode production"
+    "build": "./node_modules/.bin/webpack"
  },
  "author": "Microsoft",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/node": "^10.9.2",
-    "ts-loader": "^4.5.0",
-    "typescript": "^3.0.1",
-    "webpack": "^4.17.1",
-    "webpack-cli": "^3.1.0"
+    "@types/node": "^6.0.42",
+    "ts-loader": "^0.8.2",
+    "typescript": "^2.0.0",
+    "webpack": "^1.13.1"
  }
 }
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/webpack.config.js
@@ -1,13 +1,12 @@
-const path = require('path');
-
 module.exports = {
    target: 'node',
+    externals: ['fs', 'net', 'events', 'readline', 'stream'],
    resolve: {
        extensions: [ '.ts' ]
    },
    module: {
-        rules: [
-            { test: /\.ts$/, use: 'ts-loader' },
+        loaders: [
+            { test: /\.ts$/, loader: 'ts-loader' },
        ]
    },
    entry: {
@@ -15,10 +14,7 @@ module.exports = {
    },
    output: {
        libraryTarget: 'commonjs',
-        path: path.join(__dirname, 'Content', 'Node'),
+        path: './Content/Node',
        filename: '[name].js'
-    },
-    optimization: {
-        minimize: false
    }
 };
--- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
+++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
@@ -1,121 +1,69 @@
 (function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-/******/
+
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-/******/
+
 /******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
+/******/ 		if(installedModules[moduleId])
 /******/ 			return installedModules[moduleId].exports;
-/******/ 		}
+
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
 /******/ 		};
-/******/
+
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
+
 /******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
+/******/ 		module.loaded = true;
+
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
 /******/ 	}
-/******/
-/******/
+
+
 /******/ 	// expose the modules object (__webpack_modules__)
 /******/ 	__webpack_require__.m = modules;
-/******/
+
 /******/ 	// expose the module cache
 /******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
+
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-/******/
-/******/
+
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1);
+/******/ 	return __webpack_require__(0);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {

-module.exports = require("path");
+	module.exports = __webpack_require__(1);

-/***/ }),
+
+/***/ },
 /* 1 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

-module.exports = __webpack_require__(2);
-
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-exports.__esModule = true;
-// Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive,
-// but simplifies things for the consumer of this module.
-__webpack_require__(3);
-__webpack_require__(4);
-var http = __webpack_require__(5);
-var path = __webpack_require__(0);
-var ArgsUtil_1 = __webpack_require__(6);
-var ExitWhenParentExits_1 = __webpack_require__(7);
-// Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
-// reference to Node's runtime 'require' function.
-var dynamicRequire = eval('require');
-var server = http.createServer(function (req, res) {
+	"use strict";
+	// Limit dependencies to core Node modules. This means the code in this file has to be very low-level and unattractive,
+	// but simplifies things for the consumer of this module.
+	__webpack_require__(2);
+	__webpack_require__(4);
+	var http = __webpack_require__(5);
+	var path = __webpack_require__(3);
+	var ArgsUtil_1 = __webpack_require__(6);
+	var ExitWhenParentExits_1 = __webpack_require__(7);
+	// Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
+	// reference to Node's runtime 'require' function.
+	var dynamicRequire = eval('require');
+	var server = http.createServer(function (req, res) {
 	    readRequestBodyAsJson(req, function (bodyJson) {
 	        var hasSentResult = false;
 	        var callback = function (errorValue, successValue) {
@@ -169,42 +117,39 @@ var server = http.createServer(function (req, res) {
 	            callback(synchronousException, null);
 	        }
 	    });
-});
-var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
-var requestedPortOrZero = parsedArgs.port || 0; // 0 means 'let the OS decide'
-server.listen(requestedPortOrZero, 'localhost', function () {
-    var addressInfo = server.address();
-    // Signal to HttpNodeHost which loopback IP address (IPv4 or IPv6) and port it should make its HTTP connections on
-    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {' + addressInfo.address + '} port ' + addressInfo.port + '\]');
+	});
+	var parsedArgs = ArgsUtil_1.parseArgs(process.argv);
+	var requestedPortOrZero = parsedArgs.port || 0; // 0 means 'let the OS decide'
+	server.listen(requestedPortOrZero, 'localhost', function () {
+	    // Signal to HttpNodeHost which port it should make its HTTP connections on
+	    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port ' + server.address().port + '\]');
 	    // Signal to the NodeServices base class that we're ready to accept invocations
 	    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
-});
-ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true);
-function readRequestBodyAsJson(request, callback) {
+	});
+	ExitWhenParentExits_1.exitWhenParentExits(parseInt(parsedArgs.parentPid), /* ignoreSigint */ true);
+	function readRequestBodyAsJson(request, callback) {
 	    var requestBodyAsString = '';
 	    request.on('data', function (chunk) { requestBodyAsString += chunk; });
 	    request.on('end', function () { callback(JSON.parse(requestBodyAsString)); });
-}
-function respondWithError(res, errorValue) {
+	}
+	function respondWithError(res, errorValue) {
 	    res.statusCode = 500;
 	    res.end(JSON.stringify({
 	        errorMessage: errorValue.message || errorValue,
 	        errorDetails: errorValue.stack || null
 	    }));
-}
+	}


-/***/ }),
-/* 3 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ },
+/* 2 */
+/***/ function(module, exports, __webpack_require__) {

-"use strict";
-
-exports.__esModule = true;
-var path = __webpack_require__(0);
-var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; };
-var appRootDir = process.cwd();
-function patchedLStat(pathToStatLong, fsReqWrap) {
+	"use strict";
+	var path = __webpack_require__(3);
+	var startsWith = function (str, prefix) { return str.substring(0, prefix.length) === prefix; };
+	var appRootDir = process.cwd();
+	function patchedLStat(pathToStatLong, fsReqWrap) {
 	    try {
 	        // If the lstat completes without errors, we don't modify its behavior at all
 	        return origLStat.apply(this, arguments);
@@ -227,12 +172,12 @@ function patchedLStat(pathToStatLong, fsReqWrap) {
 	            throw ex;
 	        }
 	    }
-}
-;
-// It's only necessary to apply this workaround on Windows
-var appRootDirLong = null;
-var origLStat = null;
-if (/^win/.test(process.platform)) {
+	}
+	;
+	// It's only necessary to apply this workaround on Windows
+	var appRootDirLong = null;
+	var origLStat = null;
+	if (/^win/.test(process.platform)) {
 	    try {
 	        // Get the app's root dir in Node's internal "long" format (e.g., \\?\C:\dir\subdir)
 	        appRootDirLong = path._makeLong(appRootDir);
@@ -244,35 +189,39 @@ if (/^win/.test(process.platform)) {
 	        }
 	    }
 	    catch (ex) {
-        // If some future version of Node throws (e.g., to prevent use of process.binding()),
-        // don't apply the patch, but still let the application run.
 	    }
-}
+	}


-/***/ }),
+/***/ },
+/* 3 */
+/***/ function(module, exports) {
+
+	module.exports = require("path");
+
+/***/ },
 /* 4 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {

-// When Node writes to stdout/strerr, we capture that and convert the lines into calls on the
-// active .NET ILogger. But by default, stdout/stderr don't have any way of distinguishing
-// linebreaks inside log messages from the linebreaks that delimit separate log messages,
-// so multiline strings will end up being written to the ILogger as multiple independent
-// log messages. This makes them very hard to make sense of, especially when they represent
-// something like stack traces.
-//
-// To fix this, we intercept stdout/stderr writes, and replace internal linebreaks with a
-// marker token. When .NET receives the lines, it converts the marker tokens back to regular
-// linebreaks within the logged messages.
-//
-// Note that it's better to do the interception at the stdout/stderr level, rather than at
-// the console.log/console.error (etc.) level, because this takes place after any native
-// message formatting has taken place (e.g., inserting values for % placeholders).
-var findInternalNewlinesRegex = /\n(?!$)/g;
-var encodedNewline = '__ns_newline__';
-encodeNewlinesWrittenToStream(process.stdout);
-encodeNewlinesWrittenToStream(process.stderr);
-function encodeNewlinesWrittenToStream(outputStream) {
+	// When Node writes to stdout/strerr, we capture that and convert the lines into calls on the
+	// active .NET ILogger. But by default, stdout/stderr don't have any way of distinguishing
+	// linebreaks inside log messages from the linebreaks that delimit separate log messages,
+	// so multiline strings will end up being written to the ILogger as multiple independent
+	// log messages. This makes them very hard to make sense of, especially when they represent
+	// something like stack traces.
+	//
+	// To fix this, we intercept stdout/stderr writes, and replace internal linebreaks with a
+	// marker token. When .NET receives the lines, it converts the marker tokens back to regular
+	// linebreaks within the logged messages.
+	//
+	// Note that it's better to do the interception at the stdout/stderr level, rather than at
+	// the console.log/console.error (etc.) level, because this takes place after any native
+	// message formatting has taken place (e.g., inserting values for % placeholders).
+	var findInternalNewlinesRegex = /\n(?!$)/g;
+	var encodedNewline = '__ns_newline__';
+	encodeNewlinesWrittenToStream(process.stdout);
+	encodeNewlinesWrittenToStream(process.stderr);
+	function encodeNewlinesWrittenToStream(outputStream) {
 	    var origWriteFunction = outputStream.write;
 	    outputStream.write = function (value) {
 	        // Only interfere with the write if it's definitely a string
@@ -285,26 +234,24 @@ function encodeNewlinesWrittenToStream(outputStream) {
 	            origWriteFunction.apply(this, arguments);
 	        }
 	    };
-}
-function encodeNewlinesInString(str) {
+	}
+	function encodeNewlinesInString(str) {
 	    return str.replace(findInternalNewlinesRegex, encodedNewline);
-}
+	}


-/***/ }),
+/***/ },
 /* 5 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {

-module.exports = require("http");
+	module.exports = require("http");

-/***/ }),
+/***/ },
 /* 6 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports) {

-"use strict";
-
-exports.__esModule = true;
-function parseArgs(args) {
+	"use strict";
+	function parseArgs(args) {
 	    // Very simplistic parsing which is sufficient for the cases needed. We don't want to bring in any external
 	    // dependencies (such as an args-parsing library) to this file.
 	    var result = {};
@@ -321,27 +268,25 @@ function parseArgs(args) {
 	        }
 	    });
 	    return result;
-}
-exports.parseArgs = parseArgs;
+	}
+	exports.parseArgs = parseArgs;


-/***/ }),
+/***/ },
 /* 7 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports) {

-"use strict";
+	/*
+	In general, we want the Node child processes to be terminated as soon as the parent .NET processes exit,
+	because we have no further use for them. If the .NET process shuts down gracefully, it will run its
+	finalizers, one of which (in OutOfProcessNodeInstance.cs) will kill its associated Node process immediately.

-/*
-In general, we want the Node child processes to be terminated as soon as the parent .NET processes exit,
-because we have no further use for them. If the .NET process shuts down gracefully, it will run its
-finalizers, one of which (in OutOfProcessNodeInstance.cs) will kill its associated Node process immediately.
+	But if the .NET process is terminated forcefully (e.g., on Linux/OSX with 'kill -9'), then it won't have
+	any opportunity to shut down its child processes, and by default they will keep running. In this case, it's
+	up to the child process to detect this has happened and terminate itself.

-But if the .NET process is terminated forcefully (e.g., on Linux/OSX with 'kill -9'), then it won't have
-any opportunity to shut down its child processes, and by default they will keep running. In this case, it's
-up to the child process to detect this has happened and terminate itself.
-
-There are many possible approaches to detecting when a parent process has exited, most of which behave
-differently between Windows and Linux/OS X:
+	There are many possible approaches to detecting when a parent process has exited, most of which behave
+	differently between Windows and Linux/OS X:

 	 - On Windows, the parent process can mark its child as being a 'job' that should auto-terminate when
 	   the parent does (http://stackoverflow.com/a/4657392). Not cross-platform.
@@ -361,12 +306,12 @@ differently between Windows and Linux/OS X:
 	     process.stdout is still connected (without actually writing to it) but I haven't found any property whose
 	     value changes until you actually try to write to it.

-Of these, the only cross-platform approach that is actually documented as a valid strategy is simply polling
-to check whether the parent PID is still running. So that's what we do here.
-*/
-exports.__esModule = true;
-var pollIntervalMs = 1000;
-function exitWhenParentExits(parentPid, ignoreSigint) {
+	Of these, the only cross-platform approach that is actually documented as a valid strategy is simply polling
+	to check whether the parent PID is still running. So that's what we do here.
+	*/
+	"use strict";
+	var pollIntervalMs = 1000;
+	function exitWhenParentExits(parentPid, ignoreSigint) {
 	    setInterval(function () {
 	        if (!processExists(parentPid)) {
 	            // Can't log anything at this point, because out stdout was connected to the parent,
@@ -392,9 +337,9 @@ function exitWhenParentExits(parentPid, ignoreSigint) {
 	            console.log('Received SIGINT. Waiting for .NET process to exit...');
 	        });
 	    }
-}
-exports.exitWhenParentExits = exitWhenParentExits;
-function processExists(pid) {
+	}
+	exports.exitWhenParentExits = exitWhenParentExits;
+	function processExists(pid) {
 	    try {
 	        // Sending signal 0 - on all platforms - tests whether the process exists. As long as it doesn't
 	        // throw, that means it does exist.
@@ -409,8 +354,8 @@ function processExists(pid) {
 	        }
 	        return false;
 	    }
-}
+	}


-/***/ })
+/***/ }
 /******/ ])));
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
@@ -21,8 +21,8 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
    /// <seealso cref="Microsoft.AspNetCore.NodeServices.HostingModels.OutOfProcessNodeInstance" />
    internal class HttpNodeInstance : OutOfProcessNodeInstance
    {
-        private static readonly Regex EndpointMessageRegex =
-            new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {(.*?)} port (\d+)\]$");
+        private static readonly Regex PortMessageRegex =
+            new Regex(@"^\[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port (\d+)\]$");

        private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings
        {
@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels

        private readonly HttpClient _client;
        private bool _disposed;
-        private string _endpoint;
+        private int _portNumber;

        public HttpNodeInstance(NodeServicesOptions options, int port = 0)
        : base(
@@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
        {
            var payloadJson = JsonConvert.SerializeObject(invocationInfo, jsonSerializerSettings);
            var payload = new StringContent(payloadJson, Encoding.UTF8, "application/json");
-            var response = await _client.PostAsync(_endpoint, payload, cancellationToken);
+            var response = await _client.PostAsync("http://localhost:" + _portNumber, payload, cancellationToken);

            if (!response.IsSuccessStatusCode)
            {
@@ -111,19 +111,13 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels

        protected override void OnOutputDataReceived(string outputData)
        {
-            // Watch for "port selected" messages, and when observed, 
-            // store the IP (IPv4/IPv6) and port number
+            // Watch for "port selected" messages, and when observed, store the port number
            // so we can use it when making HTTP requests. The child process will always send
            // one of these messages before it sends a "ready for connections" message.
-            var match = string.IsNullOrEmpty(_endpoint) ? EndpointMessageRegex.Match(outputData) : null;
+            var match = _portNumber != 0 ? null : PortMessageRegex.Match(outputData);
            if (match != null && match.Success)
            {
-                var port = int.Parse(match.Groups[2].Captures[0].Value);
-                var resolvedIpAddress = match.Groups[1].Captures[0].Value;
-
-                //IPv6 must be wrapped with [] brackets
-                resolvedIpAddress = resolvedIpAddress == "::1" ? $"[{resolvedIpAddress}]" : resolvedIpAddress;
-                _endpoint = $"http://{resolvedIpAddress}:{port}";
+                _portNumber = int.Parse(match.Groups[1].Captures[0].Value);
            }
            else
            {
--- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
@@ -1,8 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

+  <Import Project="..\..\build\common.props" />
+
  <PropertyGroup>
    <Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
+    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
  </PropertyGroup>

  <ItemGroup>
@@ -11,9 +16,9 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
  </ItemGroup>

  <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
--- a/src/Microsoft.AspNetCore.NodeServices/README.md
+++ b/src/Microsoft.AspNetCore.NodeServices/README.md
@@ -9,7 +9,8 @@ This NuGet package provides a fast and robust way to invoke Node.js code from a

 It is the underlying mechanism supporting the following packages:

- * [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/master/src/Microsoft.AspNetCore.SpaServices) - builds on NodeServices, adding functionality commonly used in Single Page Applications, such as server-side prerendering, webpack middleware, and integration between server-side and client-side routing.
+ * [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices) - builds on NodeServices, adding functionality commonly used in Single Page Applications, such as server-side prerendering, webpack middleware, and integration between server-side and client-side routing.
+ * [`Microsoft.AspNetCore.AngularServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.AngularServices) and [`Microsoft.AspNetCore.ReactServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.ReactServices) - these build on `SpaServices`, adding helpers specific to Angular and React, such as cache priming and integrating server-side and client-side validation

 ### Requirements

@@ -36,7 +37,7 @@ For .NET Framework apps:
 In that case, you don't need to use NodeServices directly (or install it manually). You can either:

 * **Recommended:** Use the `aspnetcore-spa` Yeoman generator to get a ready-to-go starting point using your choice of client-side framework. [Instructions here.](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/)
-* Or set up your ASP.NET Core and client-side Angular/React/KO/etc. app manually, and then use the [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/master/src/Microsoft.AspNetCore.SpaServices) package to add features like server-side prerendering or Webpack middleware. But really, at least try using the `aspnetcore-spa` generator first.
+* Or set up your ASP.NET Core and client-side Angular/React/KO/etc. app manually, and then use the [`Microsoft.AspNetCore.SpaServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.SpaServices) package to add features like server-side prerendering or Webpack middleware. But really, at least try using the `aspnetcore-spa` generator first.

 # Simple usage example

@@ -255,7 +256,7 @@ module.exports = function(result, physicalPath, maxWidth, maxHeight) {
 }
 ```

-There's a working image resizing example following this approach [here](../../samples/misc/NodeServicesExamples) - see the [C# code](../../samples/misc/NodeServicesExamples/Controllers/ResizeImage.cs) and the [JavaScript code](../../samples/misc/NodeServicesExamples/Node/resizeImage.js).
+There's a working image resizing example following this approach [here](https://github.com/aspnet/JavaScriptServices/tree/dev/samples/misc/NodeServicesExamples) - see the [C# code](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/misc/NodeServicesExamples/Controllers/ResizeImage.cs) and the [JavaScript code](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/misc/NodeServicesExamples/Node/resizeImage.js).

 **Parameters**

--- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts
+++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts
@@ -6,7 +6,6 @@ import * as http from 'http';
 import * as path from 'path';
 import { parseArgs } from './Util/ArgsUtil';
 import { exitWhenParentExits } from './Util/ExitWhenParentExits';
-import { AddressInfo } from 'net';

 // Webpack doesn't support dynamic requires for files not present at compile time, so grab a direct
 // reference to Node's runtime 'require' function.
@@ -71,10 +70,8 @@ const server = http.createServer((req, res) => {
 const parsedArgs = parseArgs(process.argv);
 const requestedPortOrZero = parsedArgs.port || 0; // 0 means 'let the OS decide'
 server.listen(requestedPortOrZero, 'localhost', function () {
-    const addressInfo = server.address() as AddressInfo;
-
-    // Signal to HttpNodeHost which loopback IP address (IPv4 or IPv6) and port it should make its HTTP connections on
-    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on {' + addressInfo.address + '} port ' + addressInfo.port + '\]');
+    // Signal to HttpNodeHost which port it should make its HTTP connections on
+    console.log('[Microsoft.AspNetCore.NodeServices.HttpNodeHost:Listening on port ' + server.address().port + '\]');

    // Signal to the NodeServices base class that we're ready to accept invocations
    console.log('[Microsoft.AspNetCore.NodeServices:Listening]');
--- a/src/Microsoft.AspNetCore.NodeServices/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.NodeServices/baseline.netcore.json
@@ -1,935 +0,0 @@
-{
-  "AssemblyIdentity": "Microsoft.AspNetCore.NodeServices, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
-  "Types": [
-    {
-      "Name": "Microsoft.Extensions.DependencyInjection.NodeServicesServiceCollectionExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "AddNodeServices",
-          "Parameters": [
-            {
-              "Name": "serviceCollection",
-              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "AddNodeServices",
-          "Parameters": [
-            {
-              "Name": "serviceCollection",
-              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
-            },
-            {
-              "Name": "setupAction",
-              "Type": "System.Action<Microsoft.AspNetCore.NodeServices.NodeServicesOptions>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.NodeServicesFactory",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "CreateNodeServices",
-          "Parameters": [
-            {
-              "Name": "options",
-              "Type": "Microsoft.AspNetCore.NodeServices.NodeServicesOptions"
-            }
-          ],
-          "ReturnType": "Microsoft.AspNetCore.NodeServices.INodeServices",
-          "Static": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.NodeServicesOptions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_NodeInstanceFactory",
-          "Parameters": [],
-          "ReturnType": "System.Func<Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance>",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_NodeInstanceFactory",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Func<Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ProjectPath",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ProjectPath",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_WatchFileExtensions",
-          "Parameters": [],
-          "ReturnType": "System.String[]",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_WatchFileExtensions",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String[]"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_NodeInstanceOutputLogger",
-          "Parameters": [],
-          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_NodeInstanceOutputLogger",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "Microsoft.Extensions.Logging.ILogger"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_LaunchWithDebugging",
-          "Parameters": [],
-          "ReturnType": "System.Boolean",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_LaunchWithDebugging",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Boolean"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_DebuggingPort",
-          "Parameters": [],
-          "ReturnType": "System.Int32",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_DebuggingPort",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Int32"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_EnvironmentVariables",
-          "Parameters": [],
-          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_EnvironmentVariables",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_InvocationTimeoutMilliseconds",
-          "Parameters": [],
-          "ReturnType": "System.Int32",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_InvocationTimeoutMilliseconds",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Int32"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ApplicationStoppingToken",
-          "Parameters": [],
-          "ReturnType": "System.Threading.CancellationToken",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ApplicationStoppingToken",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Threading.CancellationToken"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "serviceProvider",
-              "Type": "System.IServiceProvider"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.INodeServices",
-      "Visibility": "Public",
-      "Kind": "Interface",
-      "Abstract": true,
-      "ImplementedInterfaces": [
-        "System.IDisposable"
-      ],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "InvokeAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "args",
-              "Type": "System.Object[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        },
-        {
-          "Kind": "Method",
-          "Name": "InvokeAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "cancellationToken",
-              "Type": "System.Threading.CancellationToken"
-            },
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "args",
-              "Type": "System.Object[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        },
-        {
-          "Kind": "Method",
-          "Name": "InvokeExportAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "exportedFunctionName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "args",
-              "Type": "System.Object[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        },
-        {
-          "Kind": "Method",
-          "Name": "InvokeExportAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "cancellationToken",
-              "Type": "System.Threading.CancellationToken"
-            },
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "exportedFunctionName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "args",
-              "Type": "System.Object[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.EmbeddedResourceReader",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Read",
-          "Parameters": [
-            {
-              "Name": "assemblyContainingType",
-              "Type": "System.Type"
-            },
-            {
-              "Name": "path",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.String",
-          "Static": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.StringAsTempFile",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Sealed": true,
-      "ImplementedInterfaces": [
-        "System.IDisposable"
-      ],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_FileName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "Dispose",
-          "Parameters": [],
-          "ReturnType": "System.Void",
-          "Sealed": true,
-          "Virtual": true,
-          "ImplementedInterface": "System.IDisposable",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "Finalize",
-          "Parameters": [],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Override": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "content",
-              "Type": "System.String"
-            },
-            {
-              "Name": "applicationStoppingToken",
-              "Type": "System.Threading.CancellationToken"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance",
-      "Visibility": "Public",
-      "Kind": "Interface",
-      "Abstract": true,
-      "ImplementedInterfaces": [
-        "System.IDisposable"
-      ],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "InvokeExportAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "cancellationToken",
-              "Type": "System.Threading.CancellationToken"
-            },
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "exportNameOrNull",
-              "Type": "System.String"
-            },
-            {
-              "Name": "args",
-              "Type": "System.Object[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.HostingModels.NodeInvocationException",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "BaseType": "System.Exception",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_NodeInstanceUnavailable",
-          "Parameters": [],
-          "ReturnType": "System.Boolean",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_AllowConnectionDraining",
-          "Parameters": [],
-          "ReturnType": "System.Boolean",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "message",
-              "Type": "System.String"
-            },
-            {
-              "Name": "details",
-              "Type": "System.String"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "message",
-              "Type": "System.String"
-            },
-            {
-              "Name": "details",
-              "Type": "System.String"
-            },
-            {
-              "Name": "nodeInstanceUnavailable",
-              "Type": "System.Boolean"
-            },
-            {
-              "Name": "allowConnectionDraining",
-              "Type": "System.Boolean"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.HostingModels.NodeInvocationInfo",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_ModuleName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ModuleName",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ExportedFunctionName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ExportedFunctionName",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_Args",
-          "Parameters": [],
-          "ReturnType": "System.Object[]",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_Args",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Object[]"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.HostingModels.NodeServicesOptionsExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseHttpHosting",
-          "Parameters": [
-            {
-              "Name": "options",
-              "Type": "Microsoft.AspNetCore.NodeServices.NodeServicesOptions"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.HostingModels.OutOfProcessNodeInstance",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "ImplementedInterfaces": [
-        "Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance"
-      ],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Dispose",
-          "Parameters": [],
-          "ReturnType": "System.Void",
-          "Sealed": true,
-          "Virtual": true,
-          "ImplementedInterface": "System.IDisposable",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "InvokeExportAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "cancellationToken",
-              "Type": "System.Threading.CancellationToken"
-            },
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "exportNameOrNull",
-              "Type": "System.String"
-            },
-            {
-              "Name": "args",
-              "Type": "System.Object[]",
-              "IsParams": true
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "Sealed": true,
-          "Virtual": true,
-          "ImplementedInterface": "Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance",
-          "Visibility": "Public",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        },
-        {
-          "Kind": "Method",
-          "Name": "InvokeExportAsync<T0>",
-          "Parameters": [
-            {
-              "Name": "invocationInfo",
-              "Type": "Microsoft.AspNetCore.NodeServices.HostingModels.NodeInvocationInfo"
-            },
-            {
-              "Name": "cancellationToken",
-              "Type": "System.Threading.CancellationToken"
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<T0>",
-          "Virtual": true,
-          "Abstract": true,
-          "Visibility": "Protected",
-          "GenericParameter": [
-            {
-              "ParameterName": "T",
-              "ParameterPosition": 0,
-              "BaseTypeOrInterfaces": []
-            }
-          ]
-        },
-        {
-          "Kind": "Method",
-          "Name": "PrepareNodeProcessStartInfo",
-          "Parameters": [
-            {
-              "Name": "entryPointFilename",
-              "Type": "System.String"
-            },
-            {
-              "Name": "projectPath",
-              "Type": "System.String"
-            },
-            {
-              "Name": "commandLineArguments",
-              "Type": "System.String"
-            },
-            {
-              "Name": "environmentVars",
-              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
-            },
-            {
-              "Name": "launchWithDebugging",
-              "Type": "System.Boolean"
-            },
-            {
-              "Name": "debuggingPort",
-              "Type": "System.Int32"
-            }
-          ],
-          "ReturnType": "System.Diagnostics.ProcessStartInfo",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "OnOutputDataReceived",
-          "Parameters": [
-            {
-              "Name": "outputData",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "OnErrorDataReceived",
-          "Parameters": [
-            {
-              "Name": "errorData",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "Dispose",
-          "Parameters": [
-            {
-              "Name": "disposing",
-              "Type": "System.Boolean"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "Finalize",
-          "Parameters": [],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Override": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "entryPointScript",
-              "Type": "System.String"
-            },
-            {
-              "Name": "projectPath",
-              "Type": "System.String"
-            },
-            {
-              "Name": "watchFileExtensions",
-              "Type": "System.String[]"
-            },
-            {
-              "Name": "commandLineArguments",
-              "Type": "System.String"
-            },
-            {
-              "Name": "applicationStoppingToken",
-              "Type": "System.Threading.CancellationToken"
-            },
-            {
-              "Name": "nodeOutputLogger",
-              "Type": "Microsoft.Extensions.Logging.ILogger"
-            },
-            {
-              "Name": "environmentVars",
-              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
-            },
-            {
-              "Name": "invocationTimeoutMilliseconds",
-              "Type": "System.Int32"
-            },
-            {
-              "Name": "launchWithDebugging",
-              "Type": "System.Boolean"
-            },
-            {
-              "Name": "debuggingPort",
-              "Type": "System.Int32"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Field",
-          "Name": "OutputLogger",
-          "Parameters": [],
-          "ReturnType": "Microsoft.Extensions.Logging.ILogger",
-          "ReadOnly": true,
-          "Visibility": "Protected",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    }
-  ]
-}
--- a/src/Microsoft.AspNetCore.NodeServices/package-lock.json
+++ b/src/Microsoft.AspNetCore.NodeServices/package-lock.json
--- a/src/Microsoft.AspNetCore.NodeServices/package.json
+++ b/src/Microsoft.AspNetCore.NodeServices/package.json
@@ -5,15 +5,14 @@
  "main": "index.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack --mode production"
+    "build": "./node_modules/.bin/webpack"
  },
  "author": "Microsoft",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/node": "^10.9.2",
-    "ts-loader": "^4.5.0",
-    "typescript": "^3.0.1",
-    "webpack": "^4.17.1",
-    "webpack-cli": "^3.1.0"
+    "@types/node": "^6.0.42",
+    "ts-loader": "^0.8.2",
+    "typescript": "^2.0.0",
+    "webpack": "^1.13.1"
  }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/webpack.config.js
+++ b/src/Microsoft.AspNetCore.NodeServices/webpack.config.js
@@ -1,13 +1,12 @@
-const path = require('path');
-
 module.exports = {
    target: 'node',
+    externals: ['fs', 'net', 'events', 'readline', 'stream'],
    resolve: {
        extensions: [ '.ts' ]
    },
    module: {
-        rules: [
-            { test: /\.ts$/, use: 'ts-loader' },
+        loaders: [
+            { test: /\.ts$/, loader: 'ts-loader' },
        ]
    },
    entry: {
@@ -15,10 +14,7 @@ module.exports = {
    },
    output: {
        libraryTarget: 'commonjs',
-        path: path.join(__dirname, 'Content', 'Node'),
+        path: './Content/Node',
        filename: '[name].js'
-    },
-    optimization: {
-        minimize: false
    }
 };
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliBuilder.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliBuilder.cs
@@ -1,84 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.AspNetCore.NodeServices.Npm;
-using Microsoft.AspNetCore.NodeServices.Util;
-using Microsoft.AspNetCore.SpaServices.Prerendering;
-using Microsoft.AspNetCore.SpaServices.Util;
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.AngularCli
-{
-    /// <summary>
-    /// Provides an implementation of <see cref="ISpaPrerendererBuilder"/> that can build
-    /// an Angular application by invoking the Angular CLI.
-    /// </summary>
-    public class AngularCliBuilder : ISpaPrerendererBuilder
-    {
-        private static TimeSpan RegexMatchTimeout = TimeSpan.FromSeconds(5); // This is a development-time only feature, so a very long timeout is fine
-
-        private readonly string _npmScriptName;
-
-        /// <summary>
-        /// Constructs an instance of <see cref="AngularCliBuilder"/>.
-        /// </summary>
-        /// <param name="npmScript">The name of the script in your package.json file that builds the server-side bundle for your Angular application.</param>
-        public AngularCliBuilder(string npmScript)
-        {
-            if (string.IsNullOrEmpty(npmScript))
-            {
-                throw new ArgumentException("Cannot be null or empty.", nameof(npmScript));
-            }
-
-            _npmScriptName = npmScript;
-        }
-
-        /// <inheritdoc />
-        public async Task Build(ISpaBuilder spaBuilder)
-        {
-            var sourcePath = spaBuilder.Options.SourcePath;
-            if (string.IsNullOrEmpty(sourcePath))
-            {
-                throw new InvalidOperationException($"To use {nameof(AngularCliBuilder)}, you must supply a non-empty value for the {nameof(SpaOptions.SourcePath)} property of {nameof(SpaOptions)} when calling {nameof(SpaApplicationBuilderExtensions.UseSpa)}.");
-            }
-
-            var logger = LoggerFinder.GetOrCreateLogger(
-                spaBuilder.ApplicationBuilder,
-                nameof(AngularCliBuilder));
-            var npmScriptRunner = new NpmScriptRunner(
-                sourcePath,
-                _npmScriptName,
-                "--watch",
-                null);
-            npmScriptRunner.AttachToLogger(logger);
-
-            using (var stdOutReader = new EventedStreamStringReader(npmScriptRunner.StdOut))
-            using (var stdErrReader = new EventedStreamStringReader(npmScriptRunner.StdErr))
-            {
-                try
-                {
-                    await npmScriptRunner.StdOut.WaitForMatch(
-                        new Regex("Date", RegexOptions.None, RegexMatchTimeout));
-                }
-                catch (EndOfStreamException ex)
-                {
-                    throw new InvalidOperationException(
-                        $"The NPM script '{_npmScriptName}' exited without indicating success.\n" +
-                        $"Output was: {stdOutReader.ReadAsString()}\n" +
-                        $"Error output was: {stdErrReader.ReadAsString()}", ex);
-                }
-                catch (OperationCanceledException ex)
-                {
-                    throw new InvalidOperationException(
-                        $"The NPM script '{_npmScriptName}' timed out without indicating success. " +
-                        $"Output was: {stdOutReader.ReadAsString()}\n" +
-                        $"Error output was: {stdErrReader.ReadAsString()}", ex);
-                }
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddleware.cs
@@ -1,145 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.NodeServices.Npm;
-using Microsoft.AspNetCore.NodeServices.Util;
-using Microsoft.AspNetCore.SpaServices.Util;
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Net.Http;
-using Microsoft.AspNetCore.SpaServices.Extensions.Util;
-
-namespace Microsoft.AspNetCore.SpaServices.AngularCli
-{
-    internal static class AngularCliMiddleware
-    {
-        private const string LogCategoryName = "Microsoft.AspNetCore.SpaServices";
-        private static TimeSpan RegexMatchTimeout = TimeSpan.FromSeconds(5); // This is a development-time only feature, so a very long timeout is fine
-
-        public static void Attach(
-            ISpaBuilder spaBuilder,
-            string npmScriptName)
-        {
-            var sourcePath = spaBuilder.Options.SourcePath;
-            if (string.IsNullOrEmpty(sourcePath))
-            {
-                throw new ArgumentException("Cannot be null or empty", nameof(sourcePath));
-            }
-
-            if (string.IsNullOrEmpty(npmScriptName))
-            {
-                throw new ArgumentException("Cannot be null or empty", nameof(npmScriptName));
-            }
-
-            // Start Angular CLI and attach to middleware pipeline
-            var appBuilder = spaBuilder.ApplicationBuilder;
-            var logger = LoggerFinder.GetOrCreateLogger(appBuilder, LogCategoryName);
-            var angularCliServerInfoTask = StartAngularCliServerAsync(sourcePath, npmScriptName, logger);
-
-            // Everything we proxy is hardcoded to target http://localhost because:
-            // - the requests are always from the local machine (we're not accepting remote
-            //   requests that go directly to the Angular CLI middleware server)
-            // - given that, there's no reason to use https, and we couldn't even if we
-            //   wanted to, because in general the Angular CLI server has no certificate
-            var targetUriTask = angularCliServerInfoTask.ContinueWith(
-                task => new UriBuilder("http", "localhost", task.Result.Port).Uri);
-
-            SpaProxyingExtensions.UseProxyToSpaDevelopmentServer(spaBuilder, () =>
-            {
-                // On each request, we create a separate startup task with its own timeout. That way, even if
-                // the first request times out, subsequent requests could still work.
-                var timeout = spaBuilder.Options.StartupTimeout;
-                return targetUriTask.WithTimeout(timeout,
-                    $"The Angular CLI process did not start listening for requests " +
-                    $"within the timeout period of {timeout.Seconds} seconds. " +
-                    $"Check the log output for error information.");
-            });
-        }
-
-        private static async Task<AngularCliServerInfo> StartAngularCliServerAsync(
-            string sourcePath, string npmScriptName, ILogger logger)
-        {
-            var portNumber = TcpPortFinder.FindAvailablePort();
-            logger.LogInformation($"Starting @angular/cli on port {portNumber}...");
-
-            var npmScriptRunner = new NpmScriptRunner(
-                sourcePath, npmScriptName, $"--port {portNumber}", null);
-            npmScriptRunner.AttachToLogger(logger);
-
-            Match openBrowserLine;
-            using (var stdErrReader = new EventedStreamStringReader(npmScriptRunner.StdErr))
-            {
-                try
-                {
-                    openBrowserLine = await npmScriptRunner.StdOut.WaitForMatch(
-                        new Regex("open your browser on (http\\S+)", RegexOptions.None, RegexMatchTimeout));
-                }
-                catch (EndOfStreamException ex)
-                {
-                    throw new InvalidOperationException(
-                        $"The NPM script '{npmScriptName}' exited without indicating that the " +
-                        $"Angular CLI was listening for requests. The error output was: " +
-                        $"{stdErrReader.ReadAsString()}", ex);
-                }
-            }
-
-            var uri = new Uri(openBrowserLine.Groups[1].Value);
-            var serverInfo = new AngularCliServerInfo { Port = uri.Port };
-
-            // Even after the Angular CLI claims to be listening for requests, there's a short
-            // period where it will give an error if you make a request too quickly
-            await WaitForAngularCliServerToAcceptRequests(uri);
-
-            return serverInfo;
-        }
-
-        private static async Task WaitForAngularCliServerToAcceptRequests(Uri cliServerUri)
-        {
-            // To determine when it's actually ready, try making HEAD requests to '/'. If it
-            // produces any HTTP response (even if it's 404) then it's ready. If it rejects the
-            // connection then it's not ready. We keep trying forever because this is dev-mode
-            // only, and only a single startup attempt will be made, and there's a further level
-            // of timeouts enforced on a per-request basis.
-            var timeoutMilliseconds = 1000;
-            using (var client = new HttpClient())
-            {
-                while (true)
-                {
-                    try
-                    {
-                        // If we get any HTTP response, the CLI server is ready
-                        await client.SendAsync(
-                            new HttpRequestMessage(HttpMethod.Head, cliServerUri),
-                            new CancellationTokenSource(timeoutMilliseconds).Token);
-                        return;
-                    }
-                    catch (Exception)
-                    {
-                        await Task.Delay(500);
-
-                        // Depending on the host's networking configuration, the requests can take a while
-                        // to go through, most likely due to the time spent resolving 'localhost'.
-                        // Each time we have a failure, allow a bit longer next time (up to a maximum).
-                        // This only influences the time until we regard the dev server as 'ready', so it
-                        // doesn't affect the runtime perf (even in dev mode) once the first connection is made.
-                        // Resolves https://github.com/aspnet/JavaScriptServices/issues/1611
-                        if (timeoutMilliseconds < 10000)
-                        {
-                            timeoutMilliseconds += 3000;
-                        }
-                    }
-                }
-            }
-        }
-
-        class AngularCliServerInfo
-        {
-            public int Port { get; set; }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/AngularCli/AngularCliMiddlewareExtensions.cs
@@ -1,43 +0,0 @@
-// 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.AspNetCore.Builder;
-using System;
-
-namespace Microsoft.AspNetCore.SpaServices.AngularCli
-{
-    /// <summary>
-    /// Extension methods for enabling Angular CLI middleware support.
-    /// </summary>
-    public static class AngularCliMiddlewareExtensions
-    {
-        /// <summary>
-        /// Handles requests by passing them through to an instance of the Angular CLI server.
-        /// This means you can always serve up-to-date CLI-built resources without having
-        /// to run the Angular CLI server manually.
-        ///
-        /// This feature should only be used in development. For production deployments, be
-        /// sure not to enable the Angular CLI server.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <param name="npmScript">The name of the script in your package.json file that launches the Angular CLI process.</param>
-        public static void UseAngularCliServer(
-            this ISpaBuilder spaBuilder,
-            string npmScript)
-        {
-            if (spaBuilder == null)
-            {
-                throw new ArgumentNullException(nameof(spaBuilder));
-            }
-
-            var spaOptions = spaBuilder.Options;
-
-            if (string.IsNullOrEmpty(spaOptions.SourcePath))
-            {
-                throw new InvalidOperationException($"To use {nameof(UseAngularCliServer)}, you must supply a non-empty value for the {nameof(SpaOptions.SourcePath)} property of {nameof(SpaOptions)} when calling {nameof(SpaApplicationBuilderExtensions.UseSpa)}.");
-            }
-
-            AngularCliMiddleware.Attach(spaBuilder, npmScript);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/DefaultSpaBuilder.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/DefaultSpaBuilder.cs
@@ -1,24 +0,0 @@
-// 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.AspNetCore.Builder;
-using System;
-
-namespace Microsoft.AspNetCore.SpaServices
-{
-    internal class DefaultSpaBuilder : ISpaBuilder
-    {
-        public IApplicationBuilder ApplicationBuilder { get; }
-
-        public SpaOptions Options { get; }
-
-        public DefaultSpaBuilder(IApplicationBuilder applicationBuilder, SpaOptions options)
-        {
-            ApplicationBuilder = applicationBuilder 
-                ?? throw new ArgumentNullException(nameof(applicationBuilder));
-
-            Options = options
-                ?? throw new ArgumentNullException(nameof(options));
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/ISpaBuilder.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/ISpaBuilder.cs
@@ -1,25 +0,0 @@
-// 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.AspNetCore.Builder;
-
-namespace Microsoft.AspNetCore.SpaServices
-{
-    /// <summary>
-    /// Defines a class that provides mechanisms for configuring the hosting
-    /// of a Single Page Application (SPA) and attaching middleware.
-    /// </summary>
-    public interface ISpaBuilder
-    {
-        /// <summary>
-        /// The <see cref="IApplicationBuilder"/> representing the middleware pipeline
-        /// in which the SPA is being hosted.
-        /// </summary>
-        IApplicationBuilder ApplicationBuilder { get; }
-
-        /// <summary>
-        /// Describes configuration options for hosting a SPA.
-        /// </summary>
-        SpaOptions Options { get; }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="$(MicrosoftAspNetCoreWebSocketsPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
-  </ItemGroup>
-
-</Project>
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Npm/NpmScriptRunner.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Npm/NpmScriptRunner.cs
@@ -1,131 +0,0 @@
-// 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.Logging;
-using Microsoft.AspNetCore.NodeServices.Util;
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-
-// This is under the NodeServices namespace because post 2.1 it will be moved to that package
-namespace Microsoft.AspNetCore.NodeServices.Npm
-{
-    /// <summary>
-    /// Executes the <c>script</c> entries defined in a <c>package.json</c> file,
-    /// capturing any output written to stdio.
-    /// </summary>
-    internal class NpmScriptRunner
-    {
-        public EventedStreamReader StdOut { get; }
-        public EventedStreamReader StdErr { get; }
-
-        private static Regex AnsiColorRegex = new Regex("\x001b\\[[0-9;]*m", RegexOptions.None, TimeSpan.FromSeconds(1));
-
-        public NpmScriptRunner(string workingDirectory, string scriptName, string arguments, IDictionary<string, string> envVars)
-        {
-            if (string.IsNullOrEmpty(workingDirectory))
-            {
-                throw new ArgumentException("Cannot be null or empty.", nameof(workingDirectory));
-            }
-
-            if (string.IsNullOrEmpty(scriptName))
-            {
-                throw new ArgumentException("Cannot be null or empty.", nameof(scriptName));
-            }
-
-            var npmExe = "npm";
-            var completeArguments = $"run {scriptName} -- {arguments ?? string.Empty}";
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // On Windows, the NPM executable is a .cmd file, so it can't be executed
-                // directly (except with UseShellExecute=true, but that's no good, because
-                // it prevents capturing stdio). So we need to invoke it via "cmd /c".
-                npmExe = "cmd";
-                completeArguments = $"/c npm {completeArguments}";
-            }
-
-            var processStartInfo = new ProcessStartInfo(npmExe)
-            {
-                Arguments = completeArguments,
-                UseShellExecute = false,
-                RedirectStandardInput = true,
-                RedirectStandardOutput = true,
-                RedirectStandardError = true,
-                WorkingDirectory = workingDirectory
-            };
-
-            if (envVars != null)
-            {
-                foreach (var keyValuePair in envVars)
-                {
-                    processStartInfo.Environment[keyValuePair.Key] = keyValuePair.Value;
-                }
-            }
-
-            var process = LaunchNodeProcess(processStartInfo);
-            StdOut = new EventedStreamReader(process.StandardOutput);
-            StdErr = new EventedStreamReader(process.StandardError);
-        }
-
-        public void AttachToLogger(ILogger logger)
-        {
-            // When the NPM task emits complete lines, pass them through to the real logger
-            StdOut.OnReceivedLine += line =>
-            {
-                if (!string.IsNullOrWhiteSpace(line))
-                {
-                    // NPM tasks commonly emit ANSI colors, but it wouldn't make sense to forward
-                    // those to loggers (because a logger isn't necessarily any kind of terminal)
-                    logger.LogInformation(StripAnsiColors(line));
-                }
-            };
-
-            StdErr.OnReceivedLine += line =>
-            {
-                if (!string.IsNullOrWhiteSpace(line))
-                {
-                    logger.LogError(StripAnsiColors(line));
-                }
-            };
-
-            // But when it emits incomplete lines, assume this is progress information and
-            // hence just pass it through to StdOut regardless of logger config.
-            StdErr.OnReceivedChunk += chunk =>
-            {
-                var containsNewline = Array.IndexOf(
-                    chunk.Array, '\n', chunk.Offset, chunk.Count) >= 0;
-                if (!containsNewline)
-                {
-                    Console.Write(chunk.Array, chunk.Offset, chunk.Count);
-                }
-            };
-        }
-
-        private static string StripAnsiColors(string line)
-            => AnsiColorRegex.Replace(line, string.Empty);
-
-        private static Process LaunchNodeProcess(ProcessStartInfo startInfo)
-        {
-            try
-            {
-                var process = Process.Start(startInfo);
-
-                // See equivalent comment in OutOfProcessNodeInstance.cs for why
-                process.EnableRaisingEvents = true;
-
-                return process;
-            }
-            catch (Exception ex)
-            {
-                var message = $"Failed to start 'npm'. To resolve this:.\n\n"
-                            + "[1] Ensure that 'npm' is installed and can be found in one of the PATH directories.\n"
-                            + $"    Current PATH enviroment variable is: { Environment.GetEnvironmentVariable("PATH") }\n"
-                            + "    Make sure the executable is in one of those directories, or update your PATH.\n\n"
-                            + "[2] See the InnerException for further details of the cause.";
-                throw new InvalidOperationException(message, ex);
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/ISpaPrerendererBuilder.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/ISpaPrerendererBuilder.cs
@@ -1,25 +0,0 @@
-// 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.AspNetCore.Builder;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.Prerendering
-{
-    /// <summary>
-    /// Represents the ability to build a Single Page Application (SPA) on demand
-    /// so that it can be prerendered. This is only intended to be used at development
-    /// time. In production, a SPA should already have been built during publishing.
-    /// </summary>
-    public interface ISpaPrerendererBuilder
-    {
-        /// <summary>
-        /// Builds the Single Page Application so that a JavaScript entrypoint file
-        /// exists on disk. Prerendering middleware can then execute that file in
-        /// a Node environment.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <returns>A <see cref="Task"/> representing completion of the build process.</returns>
-        Task Build(ISpaBuilder spaBuilder);
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingExtensions.cs
@@ -1,269 +0,0 @@
-// 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.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.NodeServices;
-using Microsoft.AspNetCore.SpaServices;
-using Microsoft.AspNetCore.SpaServices.Extensions.Util;
-using Microsoft.AspNetCore.SpaServices.Prerendering;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Extension methods for configuring prerendering of a Single Page Application.
-    /// </summary>
-    public static class SpaPrerenderingExtensions
-    {
-        /// <summary>
-        /// Enables server-side prerendering middleware for a Single Page Application.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <param name="configuration">Supplies configuration for the prerendering middleware.</param>
-        public static void UseSpaPrerendering(
-            this ISpaBuilder spaBuilder,
-            Action<SpaPrerenderingOptions> configuration)
-        {
-            if (spaBuilder == null)
-            {
-                throw new ArgumentNullException(nameof(spaBuilder));
-            }
-
-            if (configuration == null)
-            {
-                throw new ArgumentNullException(nameof(configuration));
-            }
-
-            var options = new SpaPrerenderingOptions();
-            configuration.Invoke(options);
-
-            var capturedBootModulePath = options.BootModulePath;
-            if (string.IsNullOrEmpty(capturedBootModulePath))
-            {
-                throw new InvalidOperationException($"To use {nameof(UseSpaPrerendering)}, you " +
-                    $"must set a nonempty value on the ${nameof(SpaPrerenderingOptions.BootModulePath)} " +
-                    $"property on the ${nameof(SpaPrerenderingOptions)}.");
-            }
-
-            // If we're building on demand, start that process in the background now
-            var buildOnDemandTask = options.BootModuleBuilder?.Build(spaBuilder);
-
-            // Get all the necessary context info that will be used for each prerendering call
-            var applicationBuilder = spaBuilder.ApplicationBuilder;
-            var serviceProvider = applicationBuilder.ApplicationServices;
-            var nodeServices = GetNodeServices(serviceProvider);
-            var applicationStoppingToken = serviceProvider.GetRequiredService<IApplicationLifetime>()
-                .ApplicationStopping;
-            var applicationBasePath = serviceProvider.GetRequiredService<IHostingEnvironment>()
-                .ContentRootPath;
-            var moduleExport = new JavaScriptModuleExport(capturedBootModulePath);
-            var excludePathStrings = (options.ExcludeUrls ?? Array.Empty<string>())
-                .Select(url => new PathString(url))
-                .ToArray();
-            var buildTimeout = spaBuilder.Options.StartupTimeout;
-
-            applicationBuilder.Use(async (context, next) =>
-            {
-                // If this URL is excluded, skip prerendering.
-                // This is typically used to ensure that static client-side resources
-                // (e.g., /dist/*.css) are served normally or through SPA development
-                // middleware, and don't return the prerendered index.html page.
-                foreach (var excludePathString in excludePathStrings)
-                {
-                    if (context.Request.Path.StartsWithSegments(excludePathString))
-                    {
-                        await next();
-                        return;
-                    }
-                }
-
-                // If we're building on demand, wait for that to finish, or raise any build errors
-                if (buildOnDemandTask != null && !buildOnDemandTask.IsCompleted)
-                {
-                    // For better debuggability, create a per-request timeout that makes it clear if the
-                    // prerendering builder took too long for this request, but without aborting the
-                    // underlying build task so that subsequent requests could still work.
-                    await buildOnDemandTask.WithTimeout(buildTimeout,
-                        $"The prerendering build process did not complete within the " +
-                        $"timeout period of {buildTimeout.Seconds} seconds. " +
-                        $"Check the log output for error information.");
-                }
-
-                // It's no good if we try to return a 304. We need to capture the actual
-                // HTML content so it can be passed as a template to the prerenderer.
-                RemoveConditionalRequestHeaders(context.Request);
-
-                // Make sure we're not capturing compressed content, because then we'd have
-                // to decompress it. Since this sub-request isn't leaving the machine, there's
-                // little to no benefit in having compression on it.
-                var originalAcceptEncodingValue = GetAndRemoveAcceptEncodingHeader(context.Request);
-
-                // Capture the non-prerendered responses, which in production will typically only
-                // be returning the default SPA index.html page (because other resources will be
-                // served statically from disk). We will use this as a template in which to inject
-                // the prerendered output.
-                using (var outputBuffer = new MemoryStream())
-                {
-                    var originalResponseStream = context.Response.Body;
-                    context.Response.Body = outputBuffer;
-
-                    try
-                    {
-                        await next();
-                        outputBuffer.Seek(0, SeekOrigin.Begin);
-                    }
-                    finally
-                    {
-                        context.Response.Body = originalResponseStream;
-
-                        if (!string.IsNullOrEmpty(originalAcceptEncodingValue))
-                        {
-                            context.Request.Headers[HeaderNames.AcceptEncoding] = originalAcceptEncodingValue;
-                        }
-                    }
-
-                    // If it isn't an HTML page that we can use as the template for prerendering,
-                    //  - ... because it's not text/html
-                    //  - ... or because it's an error
-                    // then prerendering doesn't apply to this request, so just pass through the
-                    // response as-is. Note that the non-text/html case is not an error: this is
-                    // typically how the SPA dev server responses for static content are returned
-                    // in development mode.
-                    var canPrerender = IsSuccessStatusCode(context.Response.StatusCode)
-                        && IsHtmlContentType(context.Response.ContentType);
-                    if (!canPrerender)
-                    {
-                        await outputBuffer.CopyToAsync(context.Response.Body);
-                        return;
-                    }
-
-                    // Most prerendering logic will want to know about the original, unprerendered
-                    // HTML that the client would be getting otherwise. Typically this is used as
-                    // a template from which the fully prerendered page can be generated.
-                    var customData = new Dictionary<string, object>
-                    {
-                        { "originalHtml", Encoding.UTF8.GetString(outputBuffer.GetBuffer()) }
-                    };
-
-                    // If the developer wants to use custom logic to pass arbitrary data to the
-                    // prerendering JS code (e.g., to pass through cookie data), now's their chance
-                    options.SupplyData?.Invoke(context, customData);
-
-                    var (unencodedAbsoluteUrl, unencodedPathAndQuery)
-                        = GetUnencodedUrlAndPathQuery(context);
-                    var renderResult = await Prerenderer.RenderToString(
-                        applicationBasePath,
-                        nodeServices,
-                        applicationStoppingToken,
-                        moduleExport,
-                        unencodedAbsoluteUrl,
-                        unencodedPathAndQuery,
-                        customDataParameter: customData,
-                        timeoutMilliseconds: 0,
-                        requestPathBase: context.Request.PathBase.ToString());
-
-                    await ServePrerenderResult(context, renderResult);
-                }
-            });
-        }
-
-        private static bool IsHtmlContentType(string contentType)
-        {
-            if (string.Equals(contentType, "text/html", StringComparison.Ordinal))
-            {
-                return true;
-            }
-
-            return contentType != null
-                && contentType.StartsWith("text/html;", StringComparison.Ordinal);
-        }
-
-        private static bool IsSuccessStatusCode(int statusCode)
-            => statusCode >= 200 && statusCode < 300;
-
-        private static void RemoveConditionalRequestHeaders(HttpRequest request)
-        {
-            request.Headers.Remove(HeaderNames.IfMatch);
-            request.Headers.Remove(HeaderNames.IfModifiedSince);
-            request.Headers.Remove(HeaderNames.IfNoneMatch);
-            request.Headers.Remove(HeaderNames.IfUnmodifiedSince);
-            request.Headers.Remove(HeaderNames.IfRange);
-        }
-
-        private static string GetAndRemoveAcceptEncodingHeader(HttpRequest request)
-        {
-            var headers = request.Headers;
-            var value = (string)null;
-
-            if (headers.ContainsKey(HeaderNames.AcceptEncoding))
-            {
-                value = headers[HeaderNames.AcceptEncoding];
-                headers.Remove(HeaderNames.AcceptEncoding);
-            }
-
-            return value;
-        }
-
-        private static (string, string) GetUnencodedUrlAndPathQuery(HttpContext httpContext)
-        {
-            // This is a duplicate of code from Prerenderer.cs in the SpaServices package.
-            // Once the SpaServices.Extension package implementation gets merged back into
-            // SpaServices, this duplicate can be removed. To remove this, change the code
-            // above that calls Prerenderer.RenderToString to use the internal overload
-            // that takes an HttpContext instead of a url/path+query pair.
-            var requestFeature = httpContext.Features.Get<IHttpRequestFeature>();
-            var unencodedPathAndQuery = requestFeature.RawTarget;
-            var request = httpContext.Request;
-            var unencodedAbsoluteUrl = $"{request.Scheme}://{request.Host}{unencodedPathAndQuery}";
-            return (unencodedAbsoluteUrl, unencodedPathAndQuery);
-        }
-
-        private static async Task ServePrerenderResult(HttpContext context, RenderToStringResult renderResult)
-        {
-            context.Response.Clear();
-
-            if (!string.IsNullOrEmpty(renderResult.RedirectUrl))
-            {
-                var permanentRedirect = renderResult.StatusCode.GetValueOrDefault() == 301;
-                context.Response.Redirect(renderResult.RedirectUrl, permanentRedirect);
-            }
-            else
-            {
-                // The Globals property exists for back-compatibility but is meaningless
-                // for prerendering that returns complete HTML pages
-                if (renderResult.Globals != null)
-                {
-                    throw new InvalidOperationException($"{nameof(renderResult.Globals)} is not " +
-                        $"supported when prerendering via {nameof(UseSpaPrerendering)}(). Instead, " +
-                        $"your prerendering logic should return a complete HTML page, in which you " +
-                        $"embed any information you wish to return to the client.");
-                }
-
-                if (renderResult.StatusCode.HasValue)
-                {
-                    context.Response.StatusCode = renderResult.StatusCode.Value;
-                }
-
-                context.Response.ContentType = "text/html";
-                await context.Response.WriteAsync(renderResult.Html);
-            }
-        }
-
-        private static INodeServices GetNodeServices(IServiceProvider serviceProvider)
-        {
-            // Use the registered instance, or create a new private instance if none is registered
-            var instance = (INodeServices)serviceProvider.GetService(typeof(INodeServices));
-            return instance ?? NodeServicesFactory.CreateNodeServices(
-                new NodeServicesOptions(serviceProvider));
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingOptions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Prerendering/SpaPrerenderingOptions.cs
@@ -1,43 +0,0 @@
-// 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.AspNetCore.Http;
-using Microsoft.AspNetCore.SpaServices.Prerendering;
-using System;
-using System.Collections.Generic;
-
-namespace Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Represents options for the SPA prerendering middleware.
-    /// </summary>
-    public class SpaPrerenderingOptions
-    {
-        /// <summary>
-        /// Gets or sets an <see cref="ISpaPrerendererBuilder"/> that the prerenderer will invoke before
-        /// looking for the boot module file.
-        /// 
-        /// This is only intended to be used during development as a way of generating the JavaScript boot
-        /// file automatically when the application runs. This property should be left as <c>null</c> in
-        /// production applications.
-        /// </summary>
-        public ISpaPrerendererBuilder BootModuleBuilder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path, relative to your application root, of the JavaScript file
-        /// containing prerendering logic.
-        /// </summary>
-        public string BootModulePath { get; set; }
-
-        /// <summary>
-        /// Gets or sets an array of URL prefixes for which prerendering should not run.
-        /// </summary>
-        public string[] ExcludeUrls { get; set; }
-
-        /// <summary>
-        /// Gets or sets a callback that will be invoked during prerendering, allowing you to pass additional
-        /// data to the prerendering entrypoint code.
-        /// </summary>
-        public Action<HttpContext, IDictionary<string, object>> SupplyData { get; set; }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/ConditionalProxyMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/ConditionalProxyMiddleware.cs
@@ -1,62 +0,0 @@
-// 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.AspNetCore.Http;
-using Microsoft.AspNetCore.Hosting;
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.Extensions.Proxy
-{
-    // This duplicates and updates the proxying logic in SpaServices so that we can update
-    // the project templates without waiting for 2.1 to ship. When 2.1 is ready to ship,
-    // merge the additional proxying features (e.g., proxying websocket connections) back
-    // into the SpaServices proxying code. It's all internal.
-    internal class ConditionalProxyMiddleware
-    {
-        private readonly RequestDelegate _next;
-        private readonly Task<Uri> _baseUriTask;
-        private readonly string _pathPrefix;
-        private readonly bool _pathPrefixIsRoot;
-        private readonly HttpClient _httpClient;
-        private readonly CancellationToken _applicationStoppingToken;
-
-        public ConditionalProxyMiddleware(
-            RequestDelegate next,
-            string pathPrefix,
-            TimeSpan requestTimeout,
-            Task<Uri> baseUriTask,
-            IApplicationLifetime applicationLifetime)
-        {
-            if (!pathPrefix.StartsWith("/"))
-            {
-                pathPrefix = "/" + pathPrefix;
-            }
-
-            _next = next;
-            _pathPrefix = pathPrefix;
-            _pathPrefixIsRoot = string.Equals(_pathPrefix, "/", StringComparison.Ordinal);
-            _baseUriTask = baseUriTask;
-            _httpClient = SpaProxy.CreateHttpClientForProxy(requestTimeout);
-            _applicationStoppingToken = applicationLifetime.ApplicationStopping;
-        }
-
-        public async Task Invoke(HttpContext context)
-        {
-            if (context.Request.Path.StartsWithSegments(_pathPrefix) || _pathPrefixIsRoot)
-            {
-                var didProxyRequest = await SpaProxy.PerformProxyRequest(
-                    context, _httpClient, _baseUriTask, _applicationStoppingToken, proxy404s: false);
-                if (didProxyRequest)
-                {
-                    return;
-                }
-            }
-
-            // Not a request we can proxy
-            await _next.Invoke(context);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxy.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxy.cs
@@ -1,302 +0,0 @@
-// 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.AspNetCore.Http;
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.Extensions.Proxy
-{
-    // This duplicates and updates the proxying logic in SpaServices so that we can update
-    // the project templates without waiting for 2.1 to ship. When 2.1 is ready to ship,
-    // remove the old ConditionalProxy.cs from SpaServices and replace its usages with this.
-    // Doesn't affect public API surface - it's all internal.
-    internal static class SpaProxy
-    {
-        private const int DefaultWebSocketBufferSize = 4096;
-        private const int StreamCopyBufferSize = 81920;
-
-        // Don't forward User-Agent/Accept because of https://github.com/aspnet/JavaScriptServices/issues/1469
-        // Others just aren't applicable in proxy scenarios
-        private static readonly string[] NotForwardedWebSocketHeaders = new[] { "Accept", "Connection", "Host", "User-Agent", "Upgrade", "Sec-WebSocket-Key", "Sec-WebSocket-Version" };
-
-        public static HttpClient CreateHttpClientForProxy(TimeSpan requestTimeout)
-        {
-            var handler = new HttpClientHandler
-            {
-                AllowAutoRedirect = false,
-                UseCookies = false,
-                
-            };
-
-            return new HttpClient(handler)
-            {
-                Timeout = requestTimeout
-            };
-        }
-
-        public static async Task<bool> PerformProxyRequest(
-            HttpContext context,
-            HttpClient httpClient,
-            Task<Uri> baseUriTask,
-            CancellationToken applicationStoppingToken,
-            bool proxy404s)
-        {
-            // Stop proxying if either the server or client wants to disconnect
-            var proxyCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(
-                context.RequestAborted,
-                applicationStoppingToken).Token;
-
-            // We allow for the case where the target isn't known ahead of time, and want to
-            // delay proxied requests until the target becomes known. This is useful, for example,
-            // when proxying to Angular CLI middleware: we won't know what port it's listening
-            // on until it finishes starting up.
-            var baseUri = await baseUriTask;
-            var targetUri = new Uri(
-                baseUri,
-                context.Request.Path + context.Request.QueryString);
-
-            try
-            {
-                if (context.WebSockets.IsWebSocketRequest)
-                {
-                    await AcceptProxyWebSocketRequest(context, ToWebSocketScheme(targetUri), proxyCancellationToken);
-                    return true;
-                }
-                else
-                {
-                    using (var requestMessage = CreateProxyHttpRequest(context, targetUri))
-                    using (var responseMessage = await httpClient.SendAsync(
-                        requestMessage,
-                        HttpCompletionOption.ResponseHeadersRead,
-                        proxyCancellationToken))
-                    {
-                        if (!proxy404s)
-                        {
-                            if (responseMessage.StatusCode == HttpStatusCode.NotFound)
-                            {
-                                // We're not proxying 404s, i.e., we want to resume the middleware pipeline
-                                // and let some other middleware handle this.
-                                return false;
-                            }
-                        }
-
-                        await CopyProxyHttpResponse(context, responseMessage, proxyCancellationToken);
-                        return true;
-                    }
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                // If we're aborting because either the client disconnected, or the server
-                // is shutting down, don't treat this as an error.
-                return true;
-            }
-            catch (IOException)
-            {
-                // This kind of exception can also occur if a proxy read/write gets interrupted
-                // due to the process shutting down.
-                return true;
-            }
-            catch (HttpRequestException ex)
-            {
-                throw new HttpRequestException(
-                    $"Failed to proxy the request to {targetUri.ToString()}, because the request to " +
-                    $"the proxy target failed. Check that the proxy target server is running and " +
-                    $"accepting requests to {baseUri.ToString()}.\n\n" +
-                    $"The underlying exception message was '{ex.Message}'." +
-                    $"Check the InnerException for more details.", ex);
-            }
-        }
-
-        private static HttpRequestMessage CreateProxyHttpRequest(HttpContext context, Uri uri)
-        {
-            var request = context.Request;
-
-            var requestMessage = new HttpRequestMessage();
-            var requestMethod = request.Method;
-            if (!HttpMethods.IsGet(requestMethod) &&
-                !HttpMethods.IsHead(requestMethod) &&
-                !HttpMethods.IsDelete(requestMethod) &&
-                !HttpMethods.IsTrace(requestMethod))
-            {
-                var streamContent = new StreamContent(request.Body);
-                requestMessage.Content = streamContent;
-            }
-
-            // Copy the request headers
-            foreach (var header in request.Headers)
-            {
-                if (!requestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray()) && requestMessage.Content != null)
-                {
-                    requestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value.ToArray());
-                }
-            }
-
-            requestMessage.Headers.Host = uri.Authority;
-            requestMessage.RequestUri = uri;
-            requestMessage.Method = new HttpMethod(request.Method);
-
-            return requestMessage;
-        }
-
-        private static async Task CopyProxyHttpResponse(HttpContext context, HttpResponseMessage responseMessage, CancellationToken cancellationToken)
-        {
-            context.Response.StatusCode = (int)responseMessage.StatusCode;
-            foreach (var header in responseMessage.Headers)
-            {
-                context.Response.Headers[header.Key] = header.Value.ToArray();
-            }
-
-            foreach (var header in responseMessage.Content.Headers)
-            {
-                context.Response.Headers[header.Key] = header.Value.ToArray();
-            }
-
-            // SendAsync removes chunking from the response. This removes the header so it doesn't expect a chunked response.
-            context.Response.Headers.Remove("transfer-encoding");
-
-            using (var responseStream = await responseMessage.Content.ReadAsStreamAsync())
-            {
-                await responseStream.CopyToAsync(context.Response.Body, StreamCopyBufferSize, cancellationToken);
-            }
-        }
-
-        private static Uri ToWebSocketScheme(Uri uri)
-        {
-            if (uri == null)
-            {
-                throw new ArgumentNullException(nameof(uri));
-            }
-
-            var uriBuilder = new UriBuilder(uri);
-            if (string.Equals(uriBuilder.Scheme, "https", StringComparison.OrdinalIgnoreCase))
-            {
-                uriBuilder.Scheme = "wss";
-            }
-            else if (string.Equals(uriBuilder.Scheme, "http", StringComparison.OrdinalIgnoreCase))
-            {
-                uriBuilder.Scheme = "ws";
-            }
-
-            return uriBuilder.Uri;
-        }
-
-        private static async Task<bool> AcceptProxyWebSocketRequest(HttpContext context, Uri destinationUri, CancellationToken cancellationToken)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
-            if (destinationUri == null)
-            {
-                throw new ArgumentNullException(nameof(destinationUri));
-            }
-
-            using (var client = new ClientWebSocket())
-            {
-                foreach (var headerEntry in context.Request.Headers)
-                {
-                    if (!NotForwardedWebSocketHeaders.Contains(headerEntry.Key, StringComparer.OrdinalIgnoreCase))
-                    {
-                        try
-                        {
-                            client.Options.SetRequestHeader(headerEntry.Key, headerEntry.Value);
-                        }
-                        catch (ArgumentException)
-                        {
-                            // On net461, certain header names are reserved and can't be set.
-                            // We filter out the known ones via the test above, but there could
-                            // be others arbitrarily set by the client. It's not helpful to
-                            // consider it an error, so just skip non-forwardable headers.
-                            // The perf implications of handling this via a catch aren't an
-                            // issue since this is a dev-time only feature.
-                        }
-                    }
-                }
-
-                try
-                {
-                    // Note that this is not really good enough to make Websockets work with
-                    // Angular CLI middleware. For some reason, ConnectAsync takes over 1 second,
-                    // on Windows, by which time the logic in SockJS has already timed out and made
-                    // it fall back on some other transport (xhr_streaming, usually). It's fine
-                    // on Linux though, completing almost instantly.
-                    // 
-                    // The slowness on Windows does not cause a problem though, because the transport
-                    // fallback logic works correctly and doesn't surface any errors, but it would be
-                    // better if ConnectAsync was fast enough and the initial Websocket transport
-                    // could actually be used.
-                    await client.ConnectAsync(destinationUri, cancellationToken);
-                }
-                catch (WebSocketException)
-                {
-                    context.Response.StatusCode = 400;
-                    return false;
-                }
-
-                using (var server = await context.WebSockets.AcceptWebSocketAsync(client.SubProtocol))
-                {
-                    var bufferSize = DefaultWebSocketBufferSize;
-                    await Task.WhenAll(
-                        PumpWebSocket(client, server, bufferSize, cancellationToken),
-                        PumpWebSocket(server, client, bufferSize, cancellationToken));
-                }
-
-                return true;
-            }
-        }
-
-        private static async Task PumpWebSocket(WebSocket source, WebSocket destination, int bufferSize, CancellationToken cancellationToken)
-        {
-            if (bufferSize <= 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(bufferSize));
-            }
-
-            var buffer = new byte[bufferSize];
-
-            while (true)
-            {
-                // Because WebSocket.ReceiveAsync doesn't work well with CancellationToken (it doesn't
-                // actually exit when the token notifies, at least not in the 'server' case), use
-                // polling. The perf might not be ideal, but this is a dev-time feature only.
-                var resultTask = source.ReceiveAsync(new ArraySegment<byte>(buffer), cancellationToken);
-                while (true)
-                {
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        return;
-                    }
-
-                    if (resultTask.IsCompleted)
-                    {
-                        break;
-                    }
-
-                    await Task.Delay(100);
-                }
-
-                var result = resultTask.Result; // We know it's completed already
-                if (result.MessageType == WebSocketMessageType.Close)
-                {
-                    if (destination.State == WebSocketState.Open || destination.State == WebSocketState.CloseReceived)
-                    {
-                        await destination.CloseOutputAsync(source.CloseStatus.Value, source.CloseStatusDescription, cancellationToken);
-                    }
-
-                    return;
-                }
-
-                await destination.SendAsync(new ArraySegment<byte>(buffer, 0, result.Count), result.MessageType, result.EndOfMessage, cancellationToken);
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxyingExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Proxying/SpaProxyingExtensions.cs
@@ -1,92 +0,0 @@
-// 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.AspNetCore.Hosting;
-using Microsoft.AspNetCore.SpaServices;
-using Microsoft.AspNetCore.SpaServices.Extensions.Proxy;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Extension methods for proxying requests to a local SPA development server during
-    /// development. Not for use in production applications.
-    /// </summary>
-    public static class SpaProxyingExtensions
-    {
-        /// <summary>
-        /// Configures the application to forward incoming requests to a local Single Page
-        /// Application (SPA) development server. This is only intended to be used during
-        /// development. Do not enable this middleware in production applications.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <param name="baseUri">The target base URI to which requests should be proxied.</param>
-        public static void UseProxyToSpaDevelopmentServer(
-            this ISpaBuilder spaBuilder,
-            string baseUri)
-        {
-            UseProxyToSpaDevelopmentServer(
-                spaBuilder,
-                new Uri(baseUri));
-        }
-
-        /// <summary>
-        /// Configures the application to forward incoming requests to a local Single Page
-        /// Application (SPA) development server. This is only intended to be used during
-        /// development. Do not enable this middleware in production applications.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <param name="baseUri">The target base URI to which requests should be proxied.</param>
-        public static void UseProxyToSpaDevelopmentServer(
-            this ISpaBuilder spaBuilder,
-            Uri baseUri)
-        {
-            UseProxyToSpaDevelopmentServer(
-                spaBuilder,
-                () => Task.FromResult(baseUri));
-        }
-
-        /// <summary>
-        /// Configures the application to forward incoming requests to a local Single Page
-        /// Application (SPA) development server. This is only intended to be used during
-        /// development. Do not enable this middleware in production applications.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <param name="baseUriTaskFactory">A callback that will be invoked on each request to supply a <see cref="Task"/> that resolves with the target base URI to which requests should be proxied.</param>
-        public static void UseProxyToSpaDevelopmentServer(
-            this ISpaBuilder spaBuilder,
-            Func<Task<Uri>> baseUriTaskFactory)
-        {
-            var applicationBuilder = spaBuilder.ApplicationBuilder;
-            var applicationStoppingToken = GetStoppingToken(applicationBuilder);
-
-            // Since we might want to proxy WebSockets requests (e.g., by default, AngularCliMiddleware
-            // requires it), enable it for the app
-            applicationBuilder.UseWebSockets();
-
-            // It's important not to time out the requests, as some of them might be to
-            // server-sent event endpoints or similar, where it's expected that the response
-            // takes an unlimited time and never actually completes
-            var neverTimeOutHttpClient =
-                SpaProxy.CreateHttpClientForProxy(Timeout.InfiniteTimeSpan);
-
-            // Proxy all requests to the SPA development server
-            applicationBuilder.Use(async (context, next) =>
-            {
-                var didProxyRequest = await SpaProxy.PerformProxyRequest(
-                    context, neverTimeOutHttpClient, baseUriTaskFactory(), applicationStoppingToken,
-                    proxy404s: true);
-            });
-        }
-
-        private static CancellationToken GetStoppingToken(IApplicationBuilder appBuilder)
-        {
-            var applicationLifetime = appBuilder
-                .ApplicationServices
-                .GetService(typeof(IApplicationLifetime));
-            return ((IApplicationLifetime)applicationLifetime).ApplicationStopping;
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddleware.cs
@@ -1,101 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.NodeServices.Npm;
-using Microsoft.AspNetCore.NodeServices.Util;
-using Microsoft.AspNetCore.SpaServices.Util;
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SpaServices.Extensions.Util;
-
-namespace Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer
-{
-    internal static class ReactDevelopmentServerMiddleware
-    {
-        private const string LogCategoryName = "Microsoft.AspNetCore.SpaServices";
-        private static TimeSpan RegexMatchTimeout = TimeSpan.FromSeconds(5); // This is a development-time only feature, so a very long timeout is fine
-
-        public static void Attach(
-            ISpaBuilder spaBuilder,
-            string npmScriptName)
-        {
-            var sourcePath = spaBuilder.Options.SourcePath;
-            if (string.IsNullOrEmpty(sourcePath))
-            {
-                throw new ArgumentException("Cannot be null or empty", nameof(sourcePath));
-            }
-
-            if (string.IsNullOrEmpty(npmScriptName))
-            {
-                throw new ArgumentException("Cannot be null or empty", nameof(npmScriptName));
-            }
-
-            // Start create-react-app and attach to middleware pipeline
-            var appBuilder = spaBuilder.ApplicationBuilder;
-            var logger = LoggerFinder.GetOrCreateLogger(appBuilder, LogCategoryName);
-            var portTask = StartCreateReactAppServerAsync(sourcePath, npmScriptName, logger);
-
-            // Everything we proxy is hardcoded to target http://localhost because:
-            // - the requests are always from the local machine (we're not accepting remote
-            //   requests that go directly to the create-react-app server)
-            // - given that, there's no reason to use https, and we couldn't even if we
-            //   wanted to, because in general the create-react-app server has no certificate
-            var targetUriTask = portTask.ContinueWith(
-                task => new UriBuilder("http", "localhost", task.Result).Uri);
-
-            SpaProxyingExtensions.UseProxyToSpaDevelopmentServer(spaBuilder, () =>
-            {
-                // On each request, we create a separate startup task with its own timeout. That way, even if
-                // the first request times out, subsequent requests could still work.
-                var timeout = spaBuilder.Options.StartupTimeout;
-                return targetUriTask.WithTimeout(timeout,
-                    $"The create-react-app server did not start listening for requests " +
-                    $"within the timeout period of {timeout.Seconds} seconds. " +
-                    $"Check the log output for error information.");
-            });
-        }
-
-        private static async Task<int> StartCreateReactAppServerAsync(
-            string sourcePath, string npmScriptName, ILogger logger)
-        {
-            var portNumber = TcpPortFinder.FindAvailablePort();
-            logger.LogInformation($"Starting create-react-app server on port {portNumber}...");
-
-            var envVars = new Dictionary<string, string>
-            {
-                { "PORT", portNumber.ToString() },
-                { "BROWSER", "none" }, // We don't want create-react-app to open its own extra browser window pointing to the internal dev server port
-            };
-            var npmScriptRunner = new NpmScriptRunner(
-                sourcePath, npmScriptName, null, envVars);
-            npmScriptRunner.AttachToLogger(logger);
-
-            using (var stdErrReader = new EventedStreamStringReader(npmScriptRunner.StdErr))
-            {
-                try
-                {
-                    // Although the React dev server may eventually tell us the URL it's listening on,
-                    // it doesn't do so until it's finished compiling, and even then only if there were
-                    // no compiler warnings. So instead of waiting for that, consider it ready as soon
-                    // as it starts listening for requests.
-                    await npmScriptRunner.StdOut.WaitForMatch(
-                        new Regex("Starting the development server", RegexOptions.None, RegexMatchTimeout));
-                }
-                catch (EndOfStreamException ex)
-                {
-                    throw new InvalidOperationException(
-                        $"The NPM script '{npmScriptName}' exited without indicating that the " +
-                        $"create-react-app server was listening for requests. The error output was: " +
-                        $"{stdErrReader.ReadAsString()}", ex);
-                }
-            }
-
-            return portNumber;
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/ReactDevelopmentServer/ReactDevelopmentServerMiddlewareExtensions.cs
@@ -1,43 +0,0 @@
-// 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.AspNetCore.Builder;
-using System;
-
-namespace Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer
-{
-    /// <summary>
-    /// Extension methods for enabling React development server middleware support.
-    /// </summary>
-    public static class ReactDevelopmentServerMiddlewareExtensions
-    {
-        /// <summary>
-        /// Handles requests by passing them through to an instance of the create-react-app server.
-        /// This means you can always serve up-to-date CLI-built resources without having
-        /// to run the create-react-app server manually.
-        ///
-        /// This feature should only be used in development. For production deployments, be
-        /// sure not to enable the create-react-app server.
-        /// </summary>
-        /// <param name="spaBuilder">The <see cref="ISpaBuilder"/>.</param>
-        /// <param name="npmScript">The name of the script in your package.json file that launches the create-react-app server.</param>
-        public static void UseReactDevelopmentServer(
-            this ISpaBuilder spaBuilder,
-            string npmScript)
-        {
-            if (spaBuilder == null)
-            {
-                throw new ArgumentNullException(nameof(spaBuilder));
-            }
-
-            var spaOptions = spaBuilder.Options;
-
-            if (string.IsNullOrEmpty(spaOptions.SourcePath))
-            {
-                throw new InvalidOperationException($"To use {nameof(UseReactDevelopmentServer)}, you must supply a non-empty value for the {nameof(SpaOptions.SourcePath)} property of {nameof(SpaOptions)} when calling {nameof(SpaApplicationBuilderExtensions.UseSpa)}.");
-            }
-
-            ReactDevelopmentServerMiddleware.Attach(spaBuilder, npmScript);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaApplicationBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaApplicationBuilderExtensions.cs
@@ -1,46 +0,0 @@
-// 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.AspNetCore.SpaServices;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using System;
-
-namespace Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Provides extension methods used for configuring an application to
-    /// host a client-side Single Page Application (SPA).
-    /// </summary>
-    public static class SpaApplicationBuilderExtensions
-    {
-        /// <summary>
-        /// Handles all requests from this point in the middleware chain by returning
-        /// the default page for the Single Page Application (SPA).
-        /// 
-        /// This middleware should be placed late in the chain, so that other middleware
-        /// for serving static files, MVC actions, etc., takes precedence.
-        /// </summary>
-        /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
-        /// <param name="configuration">
-        /// This callback will be invoked so that additional middleware can be registered within
-        /// the context of this SPA.
-        /// </param>
-        public static void UseSpa(this IApplicationBuilder app, Action<ISpaBuilder> configuration)
-        {
-            if (configuration == null)
-            {
-                throw new ArgumentNullException(nameof(configuration));
-            }
-
-            // Use the options configured in DI (or blank if none was configured). We have to clone it
-            // otherwise if you have multiple UseSpa calls, their configurations would interfere with one another.
-            var optionsProvider = app.ApplicationServices.GetService<IOptions<SpaOptions>>();
-            var options = new SpaOptions(optionsProvider.Value);
-
-            var spaBuilder = new DefaultSpaBuilder(app, options);
-            configuration.Invoke(spaBuilder);
-            SpaDefaultPageMiddleware.Attach(spaBuilder);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaDefaultPageMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaDefaultPageMiddleware.cs
@@ -1,60 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-
-namespace Microsoft.AspNetCore.SpaServices
-{
-    internal class SpaDefaultPageMiddleware
-    {
-        public static void Attach(ISpaBuilder spaBuilder)
-        {
-            if (spaBuilder == null)
-            {
-                throw new ArgumentNullException(nameof(spaBuilder));
-            }
-
-            var app = spaBuilder.ApplicationBuilder;
-            var options = spaBuilder.Options;
-
-            // Rewrite all requests to the default page
-            app.Use((context, next) =>
-            {
-                context.Request.Path = options.DefaultPage;
-                return next();
-            });
-
-            // Serve it as a static file
-            // Developers who need to host more than one SPA with distinct default pages can
-            // override the file provider
-            app.UseSpaStaticFilesInternal(
-                options.DefaultPageStaticFileOptions ?? new StaticFileOptions(),
-                allowFallbackOnServingWebRootFiles: true);
-
-            // If the default file didn't get served as a static file (usually because it was not
-            // present on disk), the SPA is definitely not going to work.
-            app.Use((context, next) =>
-            {
-                var message = "The SPA default page middleware could not return the default page " +
-                    $"'{options.DefaultPage}' because it was not found, and no other middleware " +
-                    "handled the request.\n";
-
-                // Try to clarify the common scenario where someone runs an application in
-                // Production environment without first publishing the whole application
-                // or at least building the SPA.
-                var hostEnvironment = (IHostingEnvironment)context.RequestServices.GetService(typeof(IHostingEnvironment));
-                if (hostEnvironment != null && hostEnvironment.IsProduction())
-                {
-                    message += "Your application is running in Production mode, so make sure it has " +
-                        "been published, or that you have built your SPA manually. Alternatively you " +
-                        "may wish to switch to the Development environment.\n";
-                }
-
-                throw new InvalidOperationException(message);
-            });
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaOptions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/SpaOptions.cs
@@ -1,78 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.FileProviders;
-using System;
-
-namespace Microsoft.AspNetCore.SpaServices
-{
-    /// <summary>
-    /// Describes options for hosting a Single Page Application (SPA).
-    /// </summary>
-    public class SpaOptions
-    {
-        private PathString _defaultPage = "/index.html";
-
-        /// <summary>
-        /// Constructs a new instance of <see cref="SpaOptions"/>.
-        /// </summary>
-        public SpaOptions()
-        {
-        }
-
-        /// <summary>
-        /// Constructs a new instance of <see cref="SpaOptions"/>.
-        /// </summary>
-        /// <param name="copyFromOptions">An instance of <see cref="SpaOptions"/> from which values should be copied.</param>
-        internal SpaOptions(SpaOptions copyFromOptions)
-        {
-            _defaultPage = copyFromOptions.DefaultPage;
-            DefaultPageStaticFileOptions = copyFromOptions.DefaultPageStaticFileOptions;
-            SourcePath = copyFromOptions.SourcePath;
-        }
-
-        /// <summary>
-        /// Gets or sets the URL of the default page that hosts your SPA user interface.
-        /// The default value is <c>"/index.html"</c>.
-        /// </summary>
-        public PathString DefaultPage
-        {
-            get => _defaultPage;
-            set
-            {
-                if (string.IsNullOrEmpty(value.Value))
-                {
-                    throw new ArgumentException($"The value for {nameof(DefaultPage)} cannot be null or empty.");
-                }
-
-                _defaultPage = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="StaticFileOptions"/> that supplies content
-        /// for serving the SPA's default page.
-        /// 
-        /// If not set, a default file provider will read files from the
-        /// <see cref="IHostingEnvironment.WebRootPath"/>, which by default is
-        /// the <c>wwwroot</c> directory.
-        /// </summary>
-        public StaticFileOptions DefaultPageStaticFileOptions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path, relative to the application working directory,
-        /// of the directory that contains the SPA source files during
-        /// development. The directory may not exist in published applications.
-        /// </summary>
-        public string SourcePath { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum duration that a request will wait for the SPA
-        /// to become ready to serve to the client.
-        /// </summary>
-        public TimeSpan StartupTimeout { get; set; } = TimeSpan.FromSeconds(50);
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/DefaultSpaStaticFileProvider.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/DefaultSpaStaticFileProvider.cs
@@ -1,52 +0,0 @@
-// 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.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using System;
-using System.IO;
-
-namespace Microsoft.AspNetCore.SpaServices.StaticFiles
-{
-    /// <summary>
-    /// Provides an implementation of <see cref="ISpaStaticFileProvider"/> that supplies
-    /// physical files at a location configured using <see cref="SpaStaticFilesOptions"/>.
-    /// </summary>
-    internal class DefaultSpaStaticFileProvider : ISpaStaticFileProvider
-    {
-        private IFileProvider _fileProvider;
-
-        public DefaultSpaStaticFileProvider(
-            IServiceProvider serviceProvider,
-            SpaStaticFilesOptions options)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            if (string.IsNullOrEmpty(options.RootPath))
-            {
-                throw new ArgumentException($"The {nameof(options.RootPath)} property " +
-                    $"of {nameof(options)} cannot be null or empty.");
-            }
-
-            var env = serviceProvider.GetRequiredService<IHostingEnvironment>();
-            var absoluteRootPath = Path.Combine(
-                env.ContentRootPath,
-                options.RootPath);
-
-            // PhysicalFileProvider will throw if you pass a non-existent path,
-            // but we don't want that scenario to be an error because for SPA
-            // scenarios, it's better if non-existing directory just means we
-            // don't serve any static files.
-            if (Directory.Exists(absoluteRootPath))
-            {
-                _fileProvider = new PhysicalFileProvider(absoluteRootPath);
-            }
-        }
-
-        public IFileProvider FileProvider => _fileProvider;
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/ISpaStaticFileProvider.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/ISpaStaticFileProvider.cs
@@ -1,20 +0,0 @@
-// 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.FileProviders;
-
-namespace Microsoft.AspNetCore.SpaServices.StaticFiles
-{
-    /// <summary>
-    /// Represents a service that can provide static files to be served for a Single Page
-    /// Application (SPA).
-    /// </summary>
-    public interface ISpaStaticFileProvider
-    {
-        /// <summary>
-        /// Gets the file provider, if available, that supplies the static files for the SPA.
-        /// The value is <c>null</c> if no file provider is available.
-        /// </summary>
-        IFileProvider FileProvider { get; }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesExtensions.cs
@@ -1,147 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.AspNetCore.SpaServices.StaticFiles;
-using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Options;
-using System;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Extension methods for configuring an application to serve static files for a
-    /// Single Page Application (SPA).
-    /// </summary>
-    public static class SpaStaticFilesExtensions
-    {
-        /// <summary>
-        /// Registers an <see cref="ISpaStaticFileProvider"/> service that can provide static
-        /// files to be served for a Single Page Application (SPA).
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configuration">If specified, this callback will be invoked to set additional configuration options.</param>
-        public static void AddSpaStaticFiles(
-            this IServiceCollection services,
-            Action<SpaStaticFilesOptions> configuration = null)
-        {
-            services.AddSingleton<ISpaStaticFileProvider>(serviceProvider =>
-            {
-                // Use the options configured in DI (or blank if none was configured)
-                var optionsProvider = serviceProvider.GetService<IOptions<SpaStaticFilesOptions>>();
-                var options = optionsProvider.Value;
-
-                // Allow the developer to perform further configuration
-                configuration?.Invoke(options);
-
-                if (string.IsNullOrEmpty(options.RootPath))
-                {
-                    throw new InvalidOperationException($"No {nameof(SpaStaticFilesOptions.RootPath)} " +
-                        $"was set on the {nameof(SpaStaticFilesOptions)}.");
-                }
-
-                return new DefaultSpaStaticFileProvider(serviceProvider, options);
-            });
-        }
-
-        /// <summary>
-        /// Configures the application to serve static files for a Single Page Application (SPA).
-        /// The files will be located using the registered <see cref="ISpaStaticFileProvider"/> service.
-        /// </summary>
-        /// <param name="applicationBuilder">The <see cref="IApplicationBuilder"/>.</param>
-        public static void UseSpaStaticFiles(this IApplicationBuilder applicationBuilder)
-        {
-            UseSpaStaticFiles(applicationBuilder, new StaticFileOptions());
-        }
-
-        /// <summary>
-        /// Configures the application to serve static files for a Single Page Application (SPA).
-        /// The files will be located using the registered <see cref="ISpaStaticFileProvider"/> service.
-        /// </summary>
-        /// <param name="applicationBuilder">The <see cref="IApplicationBuilder"/>.</param>
-        /// <param name="options">Specifies options for serving the static files.</param>
-        public static void UseSpaStaticFiles(this IApplicationBuilder applicationBuilder, StaticFileOptions options)
-        {
-            if (applicationBuilder == null)
-            {
-                throw new ArgumentNullException(nameof(applicationBuilder));
-            }
-
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            UseSpaStaticFilesInternal(applicationBuilder,
-                staticFileOptions: options,
-                allowFallbackOnServingWebRootFiles: false);
-        }
-
-        internal static void UseSpaStaticFilesInternal(
-            this IApplicationBuilder app,
-            StaticFileOptions staticFileOptions,
-            bool allowFallbackOnServingWebRootFiles)
-        {
-            if (staticFileOptions == null)
-            {
-                throw new ArgumentNullException(nameof(staticFileOptions));
-            }
-
-            // If the file provider was explicitly supplied, that takes precedence over any other
-            // configured file provider. This is most useful if the application hosts multiple SPAs
-            // (via multiple calls to UseSpa()), so each needs to serve its own separate static files
-            // instead of using AddSpaStaticFiles/UseSpaStaticFiles.
-            // But if no file provider was specified, try to get one from the DI config.
-            if (staticFileOptions.FileProvider == null)
-            {
-                var shouldServeStaticFiles = ShouldServeStaticFiles(
-                    app,
-                    allowFallbackOnServingWebRootFiles,
-                    out var fileProviderOrDefault);
-                if (shouldServeStaticFiles)
-                {
-                    staticFileOptions.FileProvider = fileProviderOrDefault;
-                }
-                else
-                {
-                    // The registered ISpaStaticFileProvider says we shouldn't
-                    // serve static files
-                    return;
-                }
-            }
-
-            
-            app.UseStaticFiles(staticFileOptions);
-        }
-
-        private static bool ShouldServeStaticFiles(
-            IApplicationBuilder app,
-            bool allowFallbackOnServingWebRootFiles,
-            out IFileProvider fileProviderOrDefault)
-        {
-            var spaStaticFilesService = app.ApplicationServices.GetService<ISpaStaticFileProvider>();
-            if (spaStaticFilesService != null)
-            {
-                // If an ISpaStaticFileProvider was configured but it says no IFileProvider is available
-                // (i.e., it supplies 'null'), this implies we should not serve any static files. This
-                // is typically the case in development when SPA static files are being served from a
-                // SPA development server (e.g., Angular CLI or create-react-app), in which case no
-                // directory of prebuilt files will exist on disk.
-                fileProviderOrDefault = spaStaticFilesService.FileProvider;
-                return fileProviderOrDefault != null;
-            }
-            else if (!allowFallbackOnServingWebRootFiles)
-            {
-                throw new InvalidOperationException($"To use {nameof(UseSpaStaticFiles)}, you must " +
-                    $"first register an {nameof(ISpaStaticFileProvider)} in the service provider, typically " +
-                    $"by calling services.{nameof(AddSpaStaticFiles)}.");
-            }
-            else
-            {
-                // Fall back on serving wwwroot
-                fileProviderOrDefault = null;
-                return true;
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesOptions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/StaticFiles/SpaStaticFilesOptions.cs
@@ -1,23 +0,0 @@
-// 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.DependencyInjection;
-
-namespace Microsoft.AspNetCore.SpaServices.StaticFiles
-{
-    /// <summary>
-    /// Represents options for serving static files for a Single Page Application (SPA).
-    /// </summary>
-    public class SpaStaticFilesOptions
-    {
-        /// <summary>
-        /// Gets or sets the path, relative to the application root, of the directory in which
-        /// the physical files are located.
-        /// 
-        /// If the specified directory does not exist, then the
-        /// <see cref="SpaStaticFilesExtensions.UseSpaStaticFiles(Builder.IApplicationBuilder)"/>
-        /// middleware will not serve any static files.
-        /// </summary>
-        public string RootPath { get; set; }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamReader.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamReader.cs
@@ -1,125 +0,0 @@
-// 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 System;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.NodeServices.Util
-{
-    /// <summary>
-    /// Wraps a <see cref="StreamReader"/> to expose an evented API, issuing notifications
-    /// when the stream emits partial lines, completed lines, or finally closes.
-    /// </summary>
-    internal class EventedStreamReader
-    {
-        public delegate void OnReceivedChunkHandler(ArraySegment<char> chunk);
-        public delegate void OnReceivedLineHandler(string line);
-        public delegate void OnStreamClosedHandler();
-
-        public event OnReceivedChunkHandler OnReceivedChunk;
-        public event OnReceivedLineHandler OnReceivedLine;
-        public event OnStreamClosedHandler OnStreamClosed;
-
-        private readonly StreamReader _streamReader;
-        private readonly StringBuilder _linesBuffer;
-
-        public EventedStreamReader(StreamReader streamReader)
-        {
-            _streamReader = streamReader ?? throw new ArgumentNullException(nameof(streamReader));
-            _linesBuffer = new StringBuilder();
-            Task.Factory.StartNew(Run);
-        }
-
-        public Task<Match> WaitForMatch(Regex regex)
-        {
-            var tcs = new TaskCompletionSource<Match>();
-            var completionLock = new object();
-
-            OnReceivedLineHandler onReceivedLineHandler = null;
-            OnStreamClosedHandler onStreamClosedHandler = null;
-
-            void ResolveIfStillPending(Action applyResolution)
-            {
-                lock (completionLock)
-                {
-                    if (!tcs.Task.IsCompleted)
-                    {
-                        OnReceivedLine -= onReceivedLineHandler;
-                        OnStreamClosed -= onStreamClosedHandler;
-                        applyResolution();
-                    }
-                }
-            }
-
-            onReceivedLineHandler = line =>
-            {
-                var match = regex.Match(line);
-                if (match.Success)
-                {
-                    ResolveIfStillPending(() => tcs.SetResult(match));
-                }
-            };
-
-            onStreamClosedHandler = () =>
-            {
-                ResolveIfStillPending(() => tcs.SetException(new EndOfStreamException()));
-            };
-
-            OnReceivedLine += onReceivedLineHandler;
-            OnStreamClosed += onStreamClosedHandler;
-
-            return tcs.Task;
-        }
-
-        private async Task Run()
-        {
-            var buf = new char[8 * 1024];
-            while (true)
-            {
-                var chunkLength = await _streamReader.ReadAsync(buf, 0, buf.Length);
-                if (chunkLength == 0)
-                {
-                    OnClosed();
-                    break;
-                }
-
-                OnChunk(new ArraySegment<char>(buf, 0, chunkLength));
-
-                var lineBreakPos = Array.IndexOf(buf, '\n', 0, chunkLength);
-                if (lineBreakPos < 0)
-                {
-                    _linesBuffer.Append(buf, 0, chunkLength);
-                }
-                else
-                {
-                    _linesBuffer.Append(buf, 0, lineBreakPos + 1);
-                    OnCompleteLine(_linesBuffer.ToString());
-                    _linesBuffer.Clear();
-                    _linesBuffer.Append(buf, lineBreakPos + 1, chunkLength - (lineBreakPos + 1));
-                }
-            }
-        }
-
-        private void OnChunk(ArraySegment<char> chunk)
-        {
-            var dlg = OnReceivedChunk;
-            dlg?.Invoke(chunk);
-        }
-
-        private void OnCompleteLine(string line)
-        {
-            var dlg = OnReceivedLine;
-            dlg?.Invoke(line);
-        }
-
-        private void OnClosed()
-        {
-            var dlg = OnStreamClosed;
-            dlg?.Invoke();
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamStringReader.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/EventedStreamStringReader.cs
@@ -1,39 +0,0 @@
-// 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 System;
-using System.Text;
-
-namespace Microsoft.AspNetCore.NodeServices.Util
-{
-    /// <summary>
-    /// Captures the completed-line notifications from a <see cref="EventedStreamReader"/>,
-    /// combining the data into a single <see cref="string"/>.
-    /// </summary>
-    internal class EventedStreamStringReader : IDisposable
-    {
-        private EventedStreamReader _eventedStreamReader;
-        private bool _isDisposed;
-        private StringBuilder _stringBuilder = new StringBuilder();
-
-        public EventedStreamStringReader(EventedStreamReader eventedStreamReader)
-        {
-            _eventedStreamReader = eventedStreamReader
-                ?? throw new ArgumentNullException(nameof(eventedStreamReader));
-            _eventedStreamReader.OnReceivedLine += OnReceivedLine;
-        }
-
-        public string ReadAsString() => _stringBuilder.ToString();
-
-        private void OnReceivedLine(string line) => _stringBuilder.AppendLine(line);
-
-        public void Dispose()
-        {
-            if (!_isDisposed)
-            {
-                _eventedStreamReader.OnReceivedLine -= OnReceivedLine;
-                _isDisposed = true;
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/LoggerFinder.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/LoggerFinder.cs
@@ -1,25 +0,0 @@
-// 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.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Console;
-
-namespace Microsoft.AspNetCore.SpaServices.Util
-{
-    internal static class LoggerFinder
-    {
-        public static ILogger GetOrCreateLogger(
-            IApplicationBuilder appBuilder,
-            string logCategoryName)
-        {
-            // If the DI system gives us a logger, use it. Otherwise, set up a default one.
-            var loggerFactory = appBuilder.ApplicationServices.GetService<ILoggerFactory>();
-            var logger = loggerFactory != null
-                ? loggerFactory.CreateLogger(logCategoryName)
-                : new ConsoleLogger(logCategoryName, null, false);
-            return logger;
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TaskTimeoutExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TaskTimeoutExtensions.cs
@@ -1,35 +0,0 @@
-// 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 System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.Extensions.Util
-{
-    internal static class TaskTimeoutExtensions
-    {
-        public static async Task WithTimeout(this Task task, TimeSpan timeoutDelay, string message)
-        {
-            if (task == await Task.WhenAny(task, Task.Delay(timeoutDelay)))
-            {
-                task.Wait(); // Allow any errors to propagate
-            }
-            else
-            {
-                throw new TimeoutException(message);
-            }
-        }
-
-        public static async Task<T> WithTimeout<T>(this Task<T> task, TimeSpan timeoutDelay, string message)
-        {
-            if (task == await Task.WhenAny(task, Task.Delay(timeoutDelay)))
-            {
-                return task.Result;
-            }
-            else
-            {
-                throw new TimeoutException(message);
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TcpPortFinder.cs
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Util/TcpPortFinder.cs
@@ -1,25 +0,0 @@
-// 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 System.Net;
-using System.Net.Sockets;
-
-namespace Microsoft.AspNetCore.SpaServices.Util
-{
-    internal static class TcpPortFinder
-    {
-        public static int FindAvailablePort()
-        {
-            var listener = new TcpListener(IPAddress.Loopback, 0);
-            listener.Start();
-            try
-            {
-                return ((IPEndPoint)listener.LocalEndpoint).Port;
-            }
-            finally
-            {
-                listener.Stop();
-            }
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices.Extensions/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/baseline.netcore.json
@@ -1,825 +0,0 @@
-{
-  "AssemblyIdentity": "Microsoft.AspNetCore.SpaServices.Extensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
-  "Types": [
-    {
-      "Name": "Microsoft.Extensions.DependencyInjection.SpaStaticFilesExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "AddSpaStaticFiles",
-          "Parameters": [
-            {
-              "Name": "services",
-              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
-            },
-            {
-              "Name": "configuration",
-              "Type": "System.Action<Microsoft.AspNetCore.SpaServices.StaticFiles.SpaStaticFilesOptions>",
-              "DefaultValue": "null"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "UseSpaStaticFiles",
-          "Parameters": [
-            {
-              "Name": "applicationBuilder",
-              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "UseSpaStaticFiles",
-          "Parameters": [
-            {
-              "Name": "applicationBuilder",
-              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
-            },
-            {
-              "Name": "options",
-              "Type": "Microsoft.AspNetCore.Builder.StaticFileOptions"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.Builder.SpaPrerenderingExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseSpaPrerendering",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            },
-            {
-              "Name": "configuration",
-              "Type": "System.Action<Microsoft.AspNetCore.Builder.SpaPrerenderingOptions>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.Builder.SpaPrerenderingOptions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_BootModuleBuilder",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_BootModuleBuilder",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_BootModulePath",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_BootModulePath",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ExcludeUrls",
-          "Parameters": [],
-          "ReturnType": "System.String[]",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ExcludeUrls",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String[]"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_SupplyData",
-          "Parameters": [],
-          "ReturnType": "System.Action<Microsoft.AspNetCore.Http.HttpContext, System.Collections.Generic.IDictionary<System.String, System.Object>>",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_SupplyData",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Action<Microsoft.AspNetCore.Http.HttpContext, System.Collections.Generic.IDictionary<System.String, System.Object>>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.Builder.SpaProxyingExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseProxyToSpaDevelopmentServer",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            },
-            {
-              "Name": "baseUri",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "UseProxyToSpaDevelopmentServer",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            },
-            {
-              "Name": "baseUri",
-              "Type": "System.Uri"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "UseProxyToSpaDevelopmentServer",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            },
-            {
-              "Name": "baseUriTaskFactory",
-              "Type": "System.Func<System.Threading.Tasks.Task<System.Uri>>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.Builder.SpaApplicationBuilderExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseSpa",
-          "Parameters": [
-            {
-              "Name": "app",
-              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
-            },
-            {
-              "Name": "configuration",
-              "Type": "System.Action<Microsoft.AspNetCore.SpaServices.ISpaBuilder>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.ISpaBuilder",
-      "Visibility": "Public",
-      "Kind": "Interface",
-      "Abstract": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_ApplicationBuilder",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.Builder.IApplicationBuilder",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_Options",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.SpaServices.SpaOptions",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.SpaOptions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_DefaultPage",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.Http.PathString",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_DefaultPage",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "Microsoft.AspNetCore.Http.PathString"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_DefaultPageStaticFileOptions",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.Builder.StaticFileOptions",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_DefaultPageStaticFileOptions",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "Microsoft.AspNetCore.Builder.StaticFileOptions"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_SourcePath",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_SourcePath",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_StartupTimeout",
-          "Parameters": [],
-          "ReturnType": "System.TimeSpan",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_StartupTimeout",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.TimeSpan"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.StaticFiles.ISpaStaticFileProvider",
-      "Visibility": "Public",
-      "Kind": "Interface",
-      "Abstract": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_FileProvider",
-          "Parameters": [],
-          "ReturnType": "Microsoft.Extensions.FileProviders.IFileProvider",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.StaticFiles.SpaStaticFilesOptions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_RootPath",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_RootPath",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer.ReactDevelopmentServerMiddlewareExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseReactDevelopmentServer",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            },
-            {
-              "Name": "npmScript",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder",
-      "Visibility": "Public",
-      "Kind": "Interface",
-      "Abstract": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Build",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.AngularCli.AngularCliBuilder",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [
-        "Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder"
-      ],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Build",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task",
-          "Sealed": true,
-          "Virtual": true,
-          "ImplementedInterface": "Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "npmScript",
-              "Type": "System.String"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.AngularCli.AngularCliMiddlewareExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseAngularCliServer",
-          "Parameters": [
-            {
-              "Name": "spaBuilder",
-              "Type": "Microsoft.AspNetCore.SpaServices.ISpaBuilder"
-            },
-            {
-              "Name": "npmScript",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.Util.EventedStreamReader+OnReceivedChunkHandler",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Sealed": true,
-      "BaseType": "System.MulticastDelegate",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Invoke",
-          "Parameters": [
-            {
-              "Name": "chunk",
-              "Type": "System.ArraySegment<System.Char>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "BeginInvoke",
-          "Parameters": [
-            {
-              "Name": "chunk",
-              "Type": "System.ArraySegment<System.Char>"
-            },
-            {
-              "Name": "callback",
-              "Type": "System.AsyncCallback"
-            },
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            }
-          ],
-          "ReturnType": "System.IAsyncResult",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "EndInvoke",
-          "Parameters": [
-            {
-              "Name": "result",
-              "Type": "System.IAsyncResult"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "method",
-              "Type": "System.IntPtr"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.Util.EventedStreamReader+OnReceivedLineHandler",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Sealed": true,
-      "BaseType": "System.MulticastDelegate",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Invoke",
-          "Parameters": [
-            {
-              "Name": "line",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "BeginInvoke",
-          "Parameters": [
-            {
-              "Name": "line",
-              "Type": "System.String"
-            },
-            {
-              "Name": "callback",
-              "Type": "System.AsyncCallback"
-            },
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            }
-          ],
-          "ReturnType": "System.IAsyncResult",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "EndInvoke",
-          "Parameters": [
-            {
-              "Name": "result",
-              "Type": "System.IAsyncResult"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "method",
-              "Type": "System.IntPtr"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.NodeServices.Util.EventedStreamReader+OnStreamClosedHandler",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Sealed": true,
-      "BaseType": "System.MulticastDelegate",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "Invoke",
-          "Parameters": [],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "BeginInvoke",
-          "Parameters": [
-            {
-              "Name": "callback",
-              "Type": "System.AsyncCallback"
-            },
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            }
-          ],
-          "ReturnType": "System.IAsyncResult",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "EndInvoke",
-          "Parameters": [
-            {
-              "Name": "result",
-              "Type": "System.IAsyncResult"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Virtual": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "object",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "method",
-              "Type": "System.IntPtr"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    }
-  ]
-}
--- a/src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js
+++ b/src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js
@@ -1,121 +1,75 @@
 (function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-/******/
+
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-/******/
+
 /******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
+/******/ 		if(installedModules[moduleId])
 /******/ 			return installedModules[moduleId].exports;
-/******/ 		}
+
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
 /******/ 		};
-/******/
+
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
+
 /******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
+/******/ 		module.loaded = true;
+
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
 /******/ 	}
-/******/
-/******/
+
+
 /******/ 	// expose the modules object (__webpack_modules__)
 /******/ 	__webpack_require__.m = modules;
-/******/
+
 /******/ 	// expose the module cache
 /******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
+
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-/******/
-/******/
+
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ 	return __webpack_require__(0);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

-module.exports = __webpack_require__(1);
+	module.exports = __webpack_require__(1);


-/***/ }),
+/***/ },
 /* 1 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

-"use strict";
-
-exports.__esModule = true;
-var path = __webpack_require__(2);
-// Separate declaration and export just to add type checking on function signature
-exports.renderToString = renderToStringImpl;
-// This function is invoked by .NET code (via NodeServices). Its job is to hand off execution to the application's
-// prerendering boot function. It can operate in two modes:
-// [1] Legacy mode
-//     This is for backward compatibility with projects created with templates older than the generator version 0.6.0.
-//     In this mode, we don't really do anything here - we just load the 'aspnet-prerendering' NPM module (which must
-//     exist in node_modules, and must be v1.x (not v2+)), and pass through all the parameters to it. Code in
-//     'aspnet-prerendering' v1.x will locate the boot function and invoke it.
-//     The drawback to this mode is that, for it to work, you have to deploy node_modules to production.
-// [2] Current mode
-//     This is for projects created with the Yeoman generator 0.6.0+ (or projects manually updated). In this mode,
-//     we don't invoke 'require' at runtime at all. All our dependencies are bundled into the NuGet package, so you
-//     don't have to deploy node_modules to production.
-// To determine whether we're in mode [1] or [2], the code locates your prerendering boot function, and checks whether
-// a certain flag is attached to the function instance.
-function renderToStringImpl(callback, applicationBasePath, bootModule, absoluteRequestUrl, requestPathAndQuery, customDataParameter, overrideTimeoutMilliseconds) {
+	"use strict";
+	var path = __webpack_require__(2);
+	// Separate declaration and export just to add type checking on function signature
+	exports.renderToString = renderToStringImpl;
+	// This function is invoked by .NET code (via NodeServices). Its job is to hand off execution to the application's
+	// prerendering boot function. It can operate in two modes:
+	// [1] Legacy mode
+	//     This is for backward compatibility with projects created with templates older than the generator version 0.6.0.
+	//     In this mode, we don't really do anything here - we just load the 'aspnet-prerendering' NPM module (which must
+	//     exist in node_modules, and must be v1.x (not v2+)), and pass through all the parameters to it. Code in
+	//     'aspnet-prerendering' v1.x will locate the boot function and invoke it.
+	//     The drawback to this mode is that, for it to work, you have to deploy node_modules to production.
+	// [2] Current mode
+	//     This is for projects created with the Yeoman generator 0.6.0+ (or projects manually updated). In this mode,
+	//     we don't invoke 'require' at runtime at all. All our dependencies are bundled into the NuGet package, so you
+	//     don't have to deploy node_modules to production.
+	// To determine whether we're in mode [1] or [2], the code locates your prerendering boot function, and checks whether
+	// a certain flag is attached to the function instance.
+	function renderToStringImpl(callback, applicationBasePath, bootModule, absoluteRequestUrl, requestPathAndQuery, customDataParameter, overrideTimeoutMilliseconds) {
 	    try {
 	        var forceLegacy = isLegacyAspNetPrerendering();
 	        var renderToStringFunc = !forceLegacy && findRenderToStringFunc(applicationBasePath, bootModule);
@@ -145,9 +99,9 @@ function renderToStringImpl(callback, applicationBasePath, bootModule, absoluteR
 	            + '\nCurrent directory is: '
 	            + process.cwd());
 	    }
-}
-;
-function findBootModule(applicationBasePath, bootModule) {
+	}
+	;
+	function findBootModule(applicationBasePath, bootModule) {
 	    var bootModuleNameFullPath = path.resolve(applicationBasePath, bootModule.moduleName);
 	    if (bootModule.webpackConfig) {
 	        // If you're using asp-prerender-webpack-config, you're definitely in legacy mode
@@ -156,8 +110,8 @@ function findBootModule(applicationBasePath, bootModule) {
 	    else {
 	        return require(bootModuleNameFullPath);
 	    }
-}
-function findRenderToStringFunc(applicationBasePath, bootModule) {
+	}
+	function findRenderToStringFunc(applicationBasePath, bootModule) {
 	    // First try to load the module
 	    var foundBootModule = findBootModule(applicationBasePath, bootModule);
 	    if (foundBootModule === null) {
@@ -171,7 +125,7 @@ function findRenderToStringFunc(applicationBasePath, bootModule) {
 	    }
 	    else if (typeof foundBootModule !== 'function') {
 	        // TypeScript-style default export
-        renderToStringFunc = foundBootModule["default"];
+	        renderToStringFunc = foundBootModule.default;
 	    }
 	    else {
 	        // Native default export
@@ -187,12 +141,12 @@ function findRenderToStringFunc(applicationBasePath, bootModule) {
 	        }
 	    }
 	    return renderToStringFunc;
-}
-function isLegacyAspNetPrerendering() {
+	}
+	function isLegacyAspNetPrerendering() {
 	    var version = getAspNetPrerenderingPackageVersion();
 	    return version && /^1\./.test(version);
-}
-function getAspNetPrerenderingPackageVersion() {
+	}
+	function getAspNetPrerenderingPackageVersion() {
 	    try {
 	        var packageEntryPoint = require.resolve('aspnet-prerendering');
 	        var packageDir = path.dirname(packageEntryPoint);
@@ -205,20 +159,20 @@ function getAspNetPrerenderingPackageVersion() {
 	        // which will be the case in production based on latest templates).
 	        return null;
 	    }
-}
+	}


-/***/ }),
+/***/ },
 /* 2 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {

-module.exports = require("path");
+	module.exports = require("path");

-/***/ }),
+/***/ },
 /* 3 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {

-module.exports = require("aspnet-prerendering");
+	module.exports = require("aspnet-prerendering");

-/***/ })
+/***/ }
 /******/ ])));
--- a/src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js
+++ b/src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js
@@ -1,112 +1,65 @@
 (function(e, a) { for(var i in a) e[i] = a[i]; }(exports, /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
-/******/
+
 /******/ 	// The require function
 /******/ 	function __webpack_require__(moduleId) {
-/******/
+
 /******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
+/******/ 		if(installedModules[moduleId])
 /******/ 			return installedModules[moduleId].exports;
-/******/ 		}
+
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
 /******/ 		};
-/******/
+
 /******/ 		// Execute the module function
 /******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
+
 /******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
+/******/ 		module.loaded = true;
+
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
 /******/ 	}
-/******/
-/******/
+
+
 /******/ 	// expose the modules object (__webpack_modules__)
 /******/ 	__webpack_require__.m = modules;
-/******/
+
 /******/ 	// expose the module cache
 /******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
+
 /******/ 	// __webpack_public_path__
 /******/ 	__webpack_require__.p = "";
-/******/
-/******/
+
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 4);
+/******/ 	return __webpack_require__(0);
 /******/ })
 /************************************************************************/
 /******/ ([
-/* 0 */,
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	module.exports = __webpack_require__(4);
+
+
+/***/ },
 /* 1 */,
 /* 2 */,
 /* 3 */,
 /* 4 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {

-module.exports = __webpack_require__(5);
-
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-exports.__esModule = true;
-// Pass through the invocation to the 'aspnet-webpack' package, verifying that it can be loaded
-function createWebpackDevServer(callback) {
+	"use strict";
+	// Pass through the invocation to the 'aspnet-webpack' package, verifying that it can be loaded
+	function createWebpackDevServer(callback) {
 	    var aspNetWebpack;
 	    try {
-        aspNetWebpack = __webpack_require__(6);
+	        aspNetWebpack = __webpack_require__(5);
 	    }
 	    catch (ex) {
 	        // Developers sometimes have trouble with badly-configured Node installations, where it's unable
@@ -119,15 +72,15 @@ function createWebpackDevServer(callback) {
 	        return;
 	    }
 	    return aspNetWebpack.createWebpackDevServer.apply(this, arguments);
-}
-exports.createWebpackDevServer = createWebpackDevServer;
+	}
+	exports.createWebpackDevServer = createWebpackDevServer;


-/***/ }),
-/* 6 */
-/***/ (function(module, exports) {
+/***/ },
+/* 5 */
+/***/ function(module, exports) {

-module.exports = require("aspnet-webpack");
+	module.exports = require("aspnet-webpack");

-/***/ })
+/***/ }
 /******/ ])));
--- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
+++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
@@ -1,22 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">

+  <Import Project="..\..\build\common.props" />
+
  <PropertyGroup>
    <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
+    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
  </PropertyGroup>

  <ItemGroup>
    <None Remove="node_modules\**\*" />
    <EmbeddedResource Include="Content\**\*" />
-  </ItemGroup>
-
-  <ItemGroup>
    <ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(MicrosoftAspNetCoreMvcTagHelpersPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="$(MicrosoftAspNetCoreMvcViewFeaturesPackageVersion)" />
+    <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' ">
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs
@@ -1,4 +1,10 @@
-using Microsoft.AspNetCore.SpaServices.Prerendering;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.NodeServices;
+using Microsoft.AspNetCore.SpaServices.Prerendering;
+using Microsoft.Extensions.DependencyInjection.Extensions;

 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -14,7 +20,7 @@ namespace Microsoft.Extensions.DependencyInjection
        /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
        public static void AddSpaPrerenderer(this IServiceCollection serviceCollection)
        {
-            serviceCollection.AddHttpContextAccessor();
+            serviceCollection.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
            serviceCollection.AddSingleton<ISpaPrerenderer, DefaultSpaPrerenderer>();
        }
    }
--- a/src/Microsoft.AspNetCore.SpaServices/README.md
+++ b/src/Microsoft.AspNetCore.SpaServices/README.md
@@ -9,7 +9,7 @@ This package enables:
 * [**Hot module replacement**](#webpack-hot-module-replacement) so that, during development, your code and markup changes will be pushed to your browser and updated in the running application automatically, without even needing to reload the page
 * [**Routing helpers**](#routing-helper-mapspafallbackroute) for integrating server-side routing with client-side routing

-Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](https://github.com/aspnet/JavaScriptServices/tree/master/src/Microsoft.AspNetCore.NodeServices) package as a fast and robust way to invoke Node.js-hosted code from ASP.NET Core at runtime.
+Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](https://github.com/aspnet/JavaScriptServices/tree/dev/src/Microsoft.AspNetCore.NodeServices) package as a fast and robust way to invoke Node.js-hosted code from ASP.NET Core at runtime.

 ### Requirements

@@ -223,7 +223,7 @@ npm install --save angular2-universal

 Now you can use the [`angular2-universal` APIs](https://github.com/angular/universal) from your `boot-server.ts` TypeScript module to execute your Angular component on the server. The code needed for this is fairly complex, but that's unavoidable because Angular supports so many different ways of being configured, and you need to provide wiring for whatever combination of DI modules you're using.

-You can find an example `boot-server.ts` that renders arbitrary Angular components [here](../../templates/AngularSpa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular component depends on.
+You can find an example `boot-server.ts` that renders arbitrary Angular components [here](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/AngularSpa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular component depends on.

 The easiest way to get started with Angular server-side rendering on ASP.NET Core is to use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/), which creates a ready-made working starting point.

@@ -299,7 +299,7 @@ If you want to enable server-side prerendering too, follow the same process as d

 The above example is extremely simple - it doesn't use `react-router`, and it doesn't load any data asynchronously. Real applications are likely to do both of these.

-For an example server-side boot module that knows how to evaluate `react-router` routes and render the correct React component, see [this example](../../templates/ReactReduxSpa/ClientApp/boot-server.tsx).
+For an example server-side boot module that knows how to evaluate `react-router` routes and render the correct React component, see [this example](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/ReactReduxSpa/ClientApp/boot-server.tsx).

 Supporting asynchronous data loading involves more considerations. Unlike Angular applications that run asynchronously on the server and freely overwrite server-generated markup with client-generated markup, React strictly wants to run synchronously on the server and always produce the same markup on the server as it does on the client.

@@ -561,7 +561,7 @@ Typically, when you change a source file, the effects appear in your local brows
 First ensure you already have a working Webpack dev middleware setup. Then, install the `webpack-hot-middleware` NPM module:

 ```
-npm install --save-dev webpack-hot-middleware
+npm install --save webpack-hot-middleware
 ```

 At the top of your `Startup.cs` file, add the following namespace reference:
@@ -620,7 +620,7 @@ app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
 Also, install the NPM module `aspnet-webpack-react`, e.g.:

 ```
-npm install --save-dev aspnet-webpack-react
+npm install --save aspnet-webpack-react
 ```

 Now if you edit any React component (e.g., in `.jsx` or `.tsx` files), the updated component will be injected into the running application, and will even preserve its in-memory state.
--- a/src/Microsoft.AspNetCore.SpaServices/TypeScript/Prerenderer.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/TypeScript/Prerenderer.ts
@@ -1,5 +1,7 @@
-import { BootModuleInfo, RenderToStringFunc, RenderToStringCallback } from '../npm/aspnet-prerendering/src/PrerenderingInterfaces';
+/// <reference path="../npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts" />
+import * as url from 'url';
 import * as path from 'path';
+import * as fs from 'fs';
 declare var __non_webpack_require__;

 // Separate declaration and export just to add type checking on function signature
--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Http;
 namespace Microsoft.AspNetCore.SpaServices.Webpack
 {
    /// <summary>
-    /// Based on ProxyMiddleware from https://github.com/aspnet/Proxy/.
+    /// Based on https://github.com/aspnet/Proxy/blob/dev/src/Microsoft.AspNetCore.Proxy/ProxyMiddleware.cs
    /// Differs in that, if the proxied request returns a 404, we pass through to the next middleware in the chain
    /// This is useful for Webpack middleware, because it lets you fall back on prebuilt files on disk for
    /// chunks not exposed by the current Webpack config (e.g., DLL/vendor chunks).
@@ -22,7 +22,6 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack
        private readonly RequestDelegate _next;
        private readonly ConditionalProxyMiddlewareOptions _options;
        private readonly string _pathPrefix;
-        private readonly bool _pathPrefixIsRoot;

        public ConditionalProxyMiddleware(
            RequestDelegate next,
@@ -36,7 +35,6 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack

            _next = next;
            _pathPrefix = pathPrefix;
-            _pathPrefixIsRoot = string.Equals(_pathPrefix, "/", StringComparison.Ordinal);
            _options = options;
            _httpClient = new HttpClient(new HttpClientHandler());
            _httpClient.Timeout = _options.RequestTimeout;
@@ -44,7 +42,7 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack

        public async Task Invoke(HttpContext context)
        {
-            if (context.Request.Path.StartsWithSegments(_pathPrefix) || _pathPrefixIsRoot)
+            if (context.Request.Path.StartsWithSegments(_pathPrefix))
            {
                var didProxyRequest = await PerformProxyRequest(context);
                if (didProxyRequest)
--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
@@ -17,10 +17,7 @@ namespace Microsoft.AspNetCore.Builder

        private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings
        {
-            // Note that the aspnet-webpack JS code specifically expects options to be serialized with
-            // PascalCase property names, so it's important to be explicit about this contract resolver
-            ContractResolver = new DefaultContractResolver(),
-
+            ContractResolver = new CamelCasePropertyNamesContractResolver(),
            TypeNameHandling = TypeNameHandling.None
        };

--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddlewareOptions.cs
@@ -50,12 +50,5 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack
        /// the webpack compiler.
        /// </summary>
        public IDictionary<string, string> EnvironmentVariables { get; set; }
-
-        /// <summary>
-        /// Specifies a value for the "env" parameter to be passed into the Webpack configuration
-        /// function. The value must be JSON-serializable, and will only be used if the Webpack
-        /// configuration is exported as a function.
-        /// </summary>
-        public object EnvParam { get; set; }
    }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/baseline.netcore.json
+++ b/src/Microsoft.AspNetCore.SpaServices/baseline.netcore.json
@@ -1,751 +0,0 @@
-{
-  "AssemblyIdentity": "Microsoft.AspNetCore.SpaServices, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
-  "Types": [
-    {
-      "Name": "Microsoft.Extensions.DependencyInjection.PrerenderingServiceCollectionExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "AddSpaPrerenderer",
-          "Parameters": [
-            {
-              "Name": "serviceCollection",
-              "Type": "Microsoft.Extensions.DependencyInjection.IServiceCollection"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.Builder.SpaRouteExtensions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "MapSpaFallbackRoute",
-          "Parameters": [
-            {
-              "Name": "routeBuilder",
-              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
-            },
-            {
-              "Name": "name",
-              "Type": "System.String"
-            },
-            {
-              "Name": "defaults",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "constraints",
-              "Type": "System.Object",
-              "DefaultValue": "null"
-            },
-            {
-              "Name": "dataTokens",
-              "Type": "System.Object",
-              "DefaultValue": "null"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "MapSpaFallbackRoute",
-          "Parameters": [
-            {
-              "Name": "routeBuilder",
-              "Type": "Microsoft.AspNetCore.Routing.IRouteBuilder"
-            },
-            {
-              "Name": "name",
-              "Type": "System.String"
-            },
-            {
-              "Name": "templatePrefix",
-              "Type": "System.String"
-            },
-            {
-              "Name": "defaults",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "constraints",
-              "Type": "System.Object",
-              "DefaultValue": "null"
-            },
-            {
-              "Name": "dataTokens",
-              "Type": "System.Object",
-              "DefaultValue": "null"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.Builder.WebpackDevMiddleware",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "UseWebpackDevMiddleware",
-          "Parameters": [
-            {
-              "Name": "appBuilder",
-              "Type": "Microsoft.AspNetCore.Builder.IApplicationBuilder"
-            },
-            {
-              "Name": "options",
-              "Type": "Microsoft.AspNetCore.SpaServices.Webpack.WebpackDevMiddlewareOptions",
-              "DefaultValue": "null"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Static": true,
-          "Extension": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Webpack.WebpackDevMiddlewareOptions",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_HotModuleReplacement",
-          "Parameters": [],
-          "ReturnType": "System.Boolean",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_HotModuleReplacement",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Boolean"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_HotModuleReplacementEndpoint",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_HotModuleReplacementEndpoint",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_HotModuleReplacementServerPort",
-          "Parameters": [],
-          "ReturnType": "System.Int32",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_HotModuleReplacementServerPort",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Int32"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ReactHotModuleReplacement",
-          "Parameters": [],
-          "ReturnType": "System.Boolean",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ReactHotModuleReplacement",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Boolean"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_HotModuleReplacementClientOptions",
-          "Parameters": [],
-          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_HotModuleReplacementClientOptions",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ConfigFile",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ConfigFile",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ProjectPath",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ProjectPath",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_EnvironmentVariables",
-          "Parameters": [],
-          "ReturnType": "System.Collections.Generic.IDictionary<System.String, System.String>",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_EnvironmentVariables",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Collections.Generic.IDictionary<System.String, System.String>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_EnvParam",
-          "Parameters": [],
-          "ReturnType": "System.Object",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_EnvParam",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Object"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerenderer",
-      "Visibility": "Public",
-      "Kind": "Interface",
-      "Abstract": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "RenderToString",
-          "Parameters": [
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            },
-            {
-              "Name": "exportName",
-              "Type": "System.String",
-              "DefaultValue": "null"
-            },
-            {
-              "Name": "customDataParameter",
-              "Type": "System.Object",
-              "DefaultValue": "null"
-            },
-            {
-              "Name": "timeoutMilliseconds",
-              "Type": "System.Int32",
-              "DefaultValue": "0"
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.SpaServices.Prerendering.RenderToStringResult>",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Prerendering.JavaScriptModuleExport",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_ModuleName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ExportName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ExportName",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "moduleName",
-              "Type": "System.String"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Prerendering.Prerenderer",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "Abstract": true,
-      "Static": true,
-      "Sealed": true,
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "RenderToString",
-          "Parameters": [
-            {
-              "Name": "applicationBasePath",
-              "Type": "System.String"
-            },
-            {
-              "Name": "nodeServices",
-              "Type": "Microsoft.AspNetCore.NodeServices.INodeServices"
-            },
-            {
-              "Name": "applicationStoppingToken",
-              "Type": "System.Threading.CancellationToken"
-            },
-            {
-              "Name": "bootModule",
-              "Type": "Microsoft.AspNetCore.SpaServices.Prerendering.JavaScriptModuleExport"
-            },
-            {
-              "Name": "requestAbsoluteUrl",
-              "Type": "System.String"
-            },
-            {
-              "Name": "requestPathAndQuery",
-              "Type": "System.String"
-            },
-            {
-              "Name": "customDataParameter",
-              "Type": "System.Object"
-            },
-            {
-              "Name": "timeoutMilliseconds",
-              "Type": "System.Int32"
-            },
-            {
-              "Name": "requestPathBase",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task<Microsoft.AspNetCore.SpaServices.Prerendering.RenderToStringResult>",
-          "Static": true,
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Prerendering.PrerenderTagHelper",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "ProcessAsync",
-          "Parameters": [
-            {
-              "Name": "context",
-              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext"
-            },
-            {
-              "Name": "output",
-              "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput"
-            }
-          ],
-          "ReturnType": "System.Threading.Tasks.Task",
-          "Virtual": true,
-          "Override": true,
-          "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ModuleName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ModuleName",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ExportName",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ExportName",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_CustomDataParameter",
-          "Parameters": [],
-          "ReturnType": "System.Object",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_CustomDataParameter",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Object"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_TimeoutMillisecondsParameter",
-          "Parameters": [],
-          "ReturnType": "System.Int32",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_TimeoutMillisecondsParameter",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Int32"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_ViewContext",
-          "Parameters": [],
-          "ReturnType": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_ViewContext",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "Microsoft.AspNetCore.Mvc.Rendering.ViewContext"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [
-            {
-              "Name": "serviceProvider",
-              "Type": "System.IServiceProvider"
-            }
-          ],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    },
-    {
-      "Name": "Microsoft.AspNetCore.SpaServices.Prerendering.RenderToStringResult",
-      "Visibility": "Public",
-      "Kind": "Class",
-      "ImplementedInterfaces": [],
-      "Members": [
-        {
-          "Kind": "Method",
-          "Name": "get_Globals",
-          "Parameters": [],
-          "ReturnType": "Newtonsoft.Json.Linq.JObject",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_Globals",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "Newtonsoft.Json.Linq.JObject"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_Html",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_Html",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_RedirectUrl",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_RedirectUrl",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.String"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "get_StatusCode",
-          "Parameters": [],
-          "ReturnType": "System.Nullable<System.Int32>",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "set_StatusCode",
-          "Parameters": [
-            {
-              "Name": "value",
-              "Type": "System.Nullable<System.Int32>"
-            }
-          ],
-          "ReturnType": "System.Void",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Method",
-          "Name": "CreateGlobalsAssignmentScript",
-          "Parameters": [],
-          "ReturnType": "System.String",
-          "Visibility": "Public",
-          "GenericParameter": []
-        },
-        {
-          "Kind": "Constructor",
-          "Name": ".ctor",
-          "Parameters": [],
-          "Visibility": "Public",
-          "GenericParameter": []
-        }
-      ],
-      "GenericParameters": []
-    }
-  ]
-}
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
@@ -1,6 +1,6 @@
 {
  "name": "aspnet-webpack-react",
-  "version": "4.0.0",
+  "version": "3.0.0",
  "description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
  "main": "index.js",
  "scripts": {
@@ -17,12 +17,12 @@
    "url": "https://github.com/aspnet/JavaScriptServices.git"
  },
  "devDependencies": {
-    "@types/webpack": "^4.4.0",
+    "@types/webpack": "^2.2.0",
    "rimraf": "^2.5.4",
    "typescript": "^2.0.0",
-    "webpack": "^4.16.0"
+    "webpack": "^2.2.0"
  },
  "peerDependencies": {
-    "webpack": "^4.0.0"
+    "webpack": "^2.2.0"
  }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/src/HotModuleReplacement.ts
@@ -1,9 +1,11 @@
 import * as webpack from 'webpack';

+const reactHotLoaderWebpackLoader = 'react-hot-loader/webpack';
+const reactHotLoaderPatch = 'react-hot-loader/patch';
 const supportedTypeScriptLoaders = ['ts-loader', 'awesome-typescript-loader'];

 export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Configuration) {
-    const moduleConfig = webpackConfig.module as webpack.Module;
+    const moduleConfig = webpackConfig.module as webpack.NewModule;
    const moduleRules = moduleConfig.rules;
    if (!moduleRules) {
        return; // Unknown rules list format. Might be Webpack 1.x, which is not supported.
@@ -13,18 +15,24 @@ export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Config
    // to its array of loaders
    for (let ruleIndex = 0; ruleIndex < moduleRules.length; ruleIndex++) {
        // We only support NewUseRule (i.e., { use: ... }) because OldUseRule doesn't accept array values
-        const rule = moduleRules[ruleIndex] as webpack.RuleSetRule;
+        const rule = moduleRules[ruleIndex] as webpack.NewUseRule;
        if (!rule.use) {
            continue;
        }

        // We're looking for the first 'use' value that's a TypeScript loader
-        const loadersArray: webpack.RuleSetUseItem[] = rule.use instanceof Array ? rule.use : [rule.use as webpack.RuleSetUseItem];
+        const loadersArray = rule.use instanceof Array ? rule.use : [rule.use];
        const isTypescriptLoader = supportedTypeScriptLoaders.some(typeScriptLoaderName => containsLoader(loadersArray, typeScriptLoaderName));
        if (!isTypescriptLoader) {
            continue;
        }

+        // This is the one - prefix it with the react-hot-loader loader
+        // (unless it's already in there somewhere)
+        if (!containsLoader(loadersArray, reactHotLoaderWebpackLoader)) {
+            loadersArray.unshift(reactHotLoaderWebpackLoader);
+            rule.use = loadersArray; // In case we normalised it to an array
+        }
        break;
    }

@@ -40,14 +48,19 @@ export function addReactHotModuleReplacementConfig(webpackConfig: webpack.Config
            // Normalise to array
            entryConfig[entrypointName] = [entryConfig[entrypointName] as string];
        }
+
+        let entryValueArray = entryConfig[entrypointName] as string[];
+        if (entryValueArray.indexOf(reactHotLoaderPatch) < 0) {
+            entryValueArray.unshift(reactHotLoaderPatch);
+        }
    });
 }

-function containsLoader(loadersArray: webpack.RuleSetUseItem[], loaderName: string) {
+function containsLoader(loadersArray: webpack.Loader[], loaderName: string) {
    return loadersArray.some(loader => {
        // Allow 'use' values to be either { loader: 'name' } or 'name'
        // No need to support legacy webpack.OldLoader
-        const actualLoaderName = (loader as webpack.RuleSetLoader).loader || (loader as string);
+        const actualLoaderName = (loader as webpack.NewLoader).loader || (loader as string);
        return actualLoaderName && new RegExp(`\\b${ loaderName }\\b`).test(actualLoaderName);
    });
 }
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package-lock.json
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "aspnet-webpack",
-  "version": "3.0.0",
+  "version": "2.0.1",
  "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
  "main": "index.js",
  "scripts": {
@@ -21,18 +21,18 @@
    "es6-promise": "^3.1.2",
    "memory-fs": "^0.3.0",
    "require-from-string": "^1.1.0",
+    "webpack-dev-middleware": "^1.8.4",
    "webpack-node-externals": "^1.4.3"
  },
  "devDependencies": {
    "@types/connect": "^3.4.30",
    "@types/node": "^6.0.42",
-    "@types/webpack": "^4.1.3",
+    "@types/webpack": "^2.2.0",
    "rimraf": "^2.5.4",
    "typescript": "^2.0.0",
-    "webpack": "^4.5.0"
+    "webpack": "^1.13.2"
  },
  "peerDependencies": {
-    "webpack": "^1.13.2 || ^2.1.0-beta || ^3.0.0 || ^4.0.0",
-    "webpack-dev-middleware": "^1.8.4 || ^3.0.0"
+    "webpack": "^1.13.2 || ^2.1.0-beta"
  }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts
@@ -90,12 +90,9 @@ function loadViaWebpackNoCache<T>(webpackConfigPath: string, modulePath: string)
        }));

        // The CommonsChunkPlugin is not compatible with a CommonJS environment like Node, nor is it needed in that case
-        const ChunkPlugin = webpack.optimize['CommonsChunkPlugin'];
-        if (ChunkPlugin !== undefined) {
        webpackConfig.plugins = webpackConfig.plugins.filter(plugin => {
-                return !(plugin instanceof ChunkPlugin);
+            return !(plugin instanceof webpack.optimize.CommonsChunkPlugin);
        });
-        }

        // The typical use case for DllReferencePlugin is for referencing vendor modules. In a Node
        // environment, it doesn't make sense to load them from a DLL bundle, nor would that even
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
@@ -23,7 +23,6 @@ interface CreateDevServerOptions {
    hotModuleReplacementEndpointUrl: string;
 }

-type EsModuleExports<T> = { __esModule: true, default: T };
 type StringMap<T> = [(key: string) => T];

 // These are the options configured in C# and then JSON-serialized, hence the C#-style naming
@@ -32,27 +31,15 @@ interface DevServerOptions {
    HotModuleReplacementServerPort: number;
    HotModuleReplacementClientOptions: StringMap<string>;
    ReactHotModuleReplacement: boolean;
-    EnvParam: any;
 }

-// Interface as defined in es6-promise
-interface Thenable<T> {
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => U | Thenable<U>): Thenable<U>;
-    then<U>(onFulfilled?: (value: T) => U | Thenable<U>, onRejected?: (error: any) => void): Thenable<U>;
-}
-
-// We support these four kinds of webpack.config.js export
+// We support these three kinds of webpack.config.js export. We don't currently support exported promises
+// (though we might be able to add that in the future, if there's a need).
 type WebpackConfigOrArray = webpack.Configuration | webpack.Configuration[];
-type WebpackConfigOrArrayOrThenable = WebpackConfigOrArray | Thenable<WebpackConfigOrArray>;
 interface WebpackConfigFunc {
-    (env?: any): WebpackConfigOrArrayOrThenable;
-}
-type WebpackConfigExport = WebpackConfigOrArrayOrThenable | WebpackConfigFunc;
-type WebpackConfigModuleExports = WebpackConfigExport | EsModuleExports<WebpackConfigExport>;
-
-function isThenable<T>(obj: any): obj is Thenable<T> {
-    return obj && typeof (<Thenable<any>>obj).then === 'function';
+    (env?: any): WebpackConfigOrArray;
 }
+type WebpackConfigFileExport = WebpackConfigOrArray | WebpackConfigFunc;

 function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configuration, enableHotModuleReplacement: boolean, enableReactHotModuleReplacement: boolean, hmrClientOptions: StringMap<string>, hmrServerEndpoint: string) {
    // Build the final Webpack config based on supplied options
@@ -121,7 +108,6 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati
    const compiler = webpack(webpackConfig);
    app.use(require('webpack-dev-middleware')(compiler, {
        noInfo: true,
-        stats: webpackConfig.stats,
        publicPath: ensureLeadingSlash(webpackConfig.output.publicPath),
        watchOptions: webpackConfig.watchOptions
    }));
@@ -134,12 +120,9 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati
    // middleware's in-memory filesystem only (and not on disk) would confuse the debugger, because the
    // file on disk wouldn't match the file served to the browser, and the source map line numbers wouldn't
    // match up. Breakpoints would either not be hit, or would hit the wrong lines.
-    const copy = stats => copyRecursiveToRealFsSync(compiler.outputFileSystem, '/', [/\.hot-update\.(js|json|js\.map)$/]);
-    if (compiler.hooks) {
-        compiler.hooks.done.tap('aspnet-webpack', copy);
-    } else {
-        compiler.plugin('done', copy);
-    }
+    (compiler as any).plugin('done', stats => {
+        copyRecursiveToRealFsSync(compiler.outputFileSystem, '/', [/\.hot-update\.(js|json|js\.map)$/]);
+    });

    if (enableHotModuleReplacement) {
        let webpackHotMiddlewareModule;
@@ -241,15 +224,6 @@ function beginWebpackWatcher(webpackConfig: webpack.Configuration) {
 export function createWebpackDevServer(callback: CreateDevServerCallback, optionsJson: string) {
    const options: CreateDevServerOptions = JSON.parse(optionsJson);

-    // Enable TypeScript loading if the webpack config is authored in TypeScript
-    if (path.extname(options.webpackConfigPath) === '.ts') {
-        try {
-            require('ts-node/register');
-        } catch (ex) {
-            throw new Error('Error while attempting to enable support for Webpack config file written in TypeScript. Make sure your project depends on the "ts-node" NPM package. The underlying error was: ' + ex.stack);
-        }
-    }
-
    // See the large comment in WebpackTestPermissions.ts for details about this
    if (!hasSufficientPermissions()) {
        console.log('WARNING: Webpack dev middleware is not enabled because the server process does not have sufficient permissions. You should either remove the UseWebpackDevMiddleware call from your code, or to make it work, give your server process user account permission to write to your application directory and to read all ancestor-level directories.');
@@ -261,26 +235,16 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
    }

    // Read the webpack config's export, and normalize it into the more general 'array of configs' format
-    const webpackConfigModuleExports: WebpackConfigModuleExports = requireNewCopy(options.webpackConfigPath);
-    let webpackConfigExport = (webpackConfigModuleExports as EsModuleExports<{}>).__esModule === true
-        ? (webpackConfigModuleExports as EsModuleExports<WebpackConfigExport>).default
-        : (webpackConfigModuleExports as WebpackConfigExport);
-
+    let webpackConfigExport: WebpackConfigFileExport = requireNewCopy(options.webpackConfigPath);
    if (webpackConfigExport instanceof Function) {
-        // If you export a function, then Webpack convention is that it takes zero or one param,
-        // and that param is called `env` and reflects the `--env.*` args you can specify on
-        // the command line (e.g., `--env.prod`).
-        // When invoking it via WebpackDevMiddleware, we let you configure the `env` param in
-        // your Startup.cs.
-        webpackConfigExport = webpackConfigExport(options.suppliedOptions.EnvParam);
+        // If you export a function, we'll call it with an undefined 'env' arg, since we have nothing else
+        // to pass. This is the same as what the webpack CLI tool does if you specify no '--env.x' values.
+        // In the future, we could add support for configuring the 'env' param in Startup.cs. But right
+        // now, it's not clear that people will want to do that (and they can always make up their own
+        // default env values in their webpack.config.js).
+        webpackConfigExport = webpackConfigExport();
    }
-
-    const webpackConfigThenable = isThenable<WebpackConfigOrArray>(webpackConfigExport)
-        ? webpackConfigExport
-        : { then: callback => callback(webpackConfigExport) } as Thenable<WebpackConfigOrArray>;
-
-    webpackConfigThenable.then(webpackConfigResolved => {
-        const webpackConfigArray = webpackConfigResolved instanceof Array ? webpackConfigResolved : [webpackConfigResolved];
+    const webpackConfigArray = webpackConfigExport instanceof Array ? webpackConfigExport : [webpackConfigExport];

    const enableHotModuleReplacement = options.suppliedOptions.HotModuleReplacement;
    const enableReactHotModuleReplacement = options.suppliedOptions.ReactHotModuleReplacement;
@@ -350,9 +314,6 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
            callback(ex.stack, null);
        }
    });
-        },
-        err => callback(err.stack, null)
-    );
 }

 function removeLeadingSlash(str: string) {
--- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/main.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/main.ts
@@ -7,7 +7,7 @@ const domainTaskBaseUrlStateKey = '__DOMAIN_TASK_INTERNAL_FETCH_BASEURL__DO_NOT_

 let noDomainBaseUrl: string;

-export function addTask<T>(task: PromiseLike<T>): PromiseLike<T> {
+export function addTask(task: PromiseLike<any>) {
    if (task && domain.active) {
        const state = domainContext.get(domainTasksStateKey) as DomainTasksState;
        if (state) {
@@ -32,8 +32,6 @@ export function addTask<T>(task: PromiseLike<T>): PromiseLike<T> {
            });
        }
    }
-
-    return task;
 }

 export function run<T>(codeToRun: () => T, completionCallback: (error: any) => void): T {
--- a/src/Microsoft.AspNetCore.SpaServices/package-lock.json
+++ b/src/Microsoft.AspNetCore.SpaServices/package-lock.json
--- a/src/Microsoft.AspNetCore.SpaServices/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/package.json
@@ -5,15 +5,14 @@
  "main": "index.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack --mode production"
+    "build": "./node_modules/.bin/webpack"
  },
  "author": "Microsoft",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@types/node": "^10.9.2",
-    "ts-loader": "^4.5.0",
-    "typescript": "^3.0.1",
-    "webpack": "^4.17.1",
-    "webpack-cli": "^3.1.0"
+    "@types/node": "^6.0.42",
+    "ts-loader": "^0.8.2",
+    "typescript": "^2.0.0",
+    "webpack": "^1.13.1"
  }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/webpack.config.js
+++ b/src/Microsoft.AspNetCore.SpaServices/webpack.config.js
@@ -1,5 +1,3 @@
-const path = require('path');
-
 module.exports = {
    target: 'node',
    externals: [
@@ -12,8 +10,8 @@ module.exports = {
        extensions: [ '.ts' ]
    },
    module: {
-        rules: [
-            { test: /\.ts$/, use: 'ts-loader' },
+        loaders: [
+            { test: /\.ts$/, loader: 'ts-loader' },
        ]
    },
    entry: {
@@ -22,10 +20,7 @@ module.exports = {
    },
    output: {
        libraryTarget: 'commonjs',
-        path: path.join(__dirname, 'Content', 'Node'),
+        path: './Content/Node',
        filename: '[name].js'
-    },
-    optimization: {
-        minimize: false
    }
 };
--- a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>Microsoft.AspNetCore.SpaTemplates</id>
+        <version>0.0.0</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>
+    <files>
+        <file 
+            src="**/*"
+            exclude="*/node_modules/**;*/bin/**;*/obj/**;*/ClientApp/dist/**;*/wwwroot/dist/**"
+            target="Content" />
+    </files>
+</package>
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.gitignore
@@ -0,0 +1,237 @@
+/Properties/launchSettings.json
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+bin/
+Bin/
+obj/
+Obj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+/wwwroot/dist/
+/ClientApp/dist/
+
+/yarn.lock
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Microsoft Azure ApplicationInsights config file
+ApplicationInsights.config
+
+# Windows Store app package directory
+AppPackages/
+BundleArtifacts/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+/node_modules
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+
+# FAKE - F# Make
+.fake/
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/dotnetcli.host.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {
+    "TargetFrameworkOverride": {
+      "isHidden": "true",
+      "longName": "target-framework-override",
+      "shortName": ""
+    },
+    "Framework": {
+      "longName": "framework"
+    },
+    "skipRestore": {
+      "longName": "no-restore",
+      "shortName": ""
+    }
+  }
+}
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png
--- a/Show More
+++ b/Show More