Cleanup NuGet.config

2025-12-23 10:08:57 +00:00 · 2017-07-10 17:15:22 -07:00
301 changed files with 1414 additions and 22014 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,14 @@ nuget.exe
 npm-debug.log
 /.build/

+# The templates can't contain their own .gitignore files, because Yeoman has strange default handling for
+# files with that name (https://github.com/npm/npm/issues/1862). So, each template instead has a template_gitignore
+# file which gets renamed after the files are copied. And so any files that need to be excluded in the source
+# repo have to be excluded here.
+/templates/*/node_modules/
+/templates/*/wwwroot/dist/
+/templates/*/ClientApp/dist/
+/templates/*/yarn.lock
 .vscode/

-global.json
-korebuild-lock.txt
+/templates/*/Properties/launchSettings.json
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,9 +1,7 @@
-Copyright (c) .NET Foundation and Contributors
-
-All rights reserved.
+Copyright (c) .NET Foundation. All rights reserved.

 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
+these files except in compliance with the License. You may obtain a copy of the
 License at

 http://www.apache.org/licenses/LICENSE-2.0
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,8 +2,7 @@
 <configuration>
  <packageSources>
    <clear />
-    <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="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
  </packageSources>
 </configuration>
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ If you're interested in contributing to the various packages, samples, and proje
 * 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`.
+ * 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`. It 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
@@ -1,13 +1,13 @@
-init:
+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"
+   # Download .NET Core 2.0 Preview 1 SDK and add to PATH
+   - ps: $urlCurrent = "https://download.microsoft.com/download/0/6/5/0656B047-5F2F-4281-A851-F30776F8616D/dotnet-dev-win-x64.2.0.0-preview1-005977.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: $tempFileCurrent = [System.IO.Path]::GetTempFileName()
   - 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"
@@ -18,15 +18,13 @@ build_script:
  - npm run build
  - ps: Pop-Location
 artifacts:
-  - path: templates\package-builder\artifacts\*.nupkg
+  - path: templates\package-builder\dist\artifacts\generator-aspnetcore-spa.tar.gz
+    name: generator-aspnetcore-spa
+  - path: templates\package-builder\dist\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
--- a/build.ps1
+++ b/build.ps1
@@ -1,177 +1,67 @@
-#!/usr/bin/env powershell
-#requires -version 4
+$ErrorActionPreference = "Stop"

-<#
-.SYNOPSIS
-Build this repository
+function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
+{
+    while($true)
+    {
+        try
+        {
+            Invoke-WebRequest $url -OutFile $downloadLocation
+            break
+        }
+        catch
+        {
+            $exceptionMessage = $_.Exception.Message
+            Write-Host "Failed to download '$url': $exceptionMessage"
+            if ($retries -gt 0) {
+                $retries--
+                Write-Host "Waiting 10 seconds before retrying. Retries left: $retries"
+                Start-Sleep -Seconds 10

-.DESCRIPTION
-Downloads korebuild if required. Then builds the repository.
-
-.PARAMETER Path
-The folder to build. Defaults to the folder containing this script.
-
-.PARAMETER Channel
-The channel of KoreBuild to download. Overrides the value from the config file.
-
-.PARAMETER DotNetHome
-The directory where .NET Core tools will be stored.
-
-.PARAMETER ToolsSource
-The base url where build tools can be downloaded. Overrides the value from the config file.
-
-.PARAMETER Update
-Updates KoreBuild to the latest version even if a lock file is present.
-
-.PARAMETER ConfigFile
-The path to the configuration file that stores values. Defaults to version.xml.
-
-.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 XML file. It is optional, and the configuration values in it are optional as well.
-
-.EXAMPLE
-Example config file:
-```xml
-<!-- version.xml -->
-<Project>
-  <PropertyGroup>
-    <KoreBuildChannel>dev</KoreBuildChannel>
-    <KoreBuildToolsSource>https://aspnetcore.blob.core.windows.net/buildtools</KoreBuildToolsSource>
-  </PropertyGroup>
-</Project>
-```
-#>
-[CmdletBinding(PositionalBinding = $false)]
-param(
-    [string]$Path = $PSScriptRoot,
-    [Alias('c')]
-    [string]$Channel,
-    [Alias('d')]
-    [string]$DotNetHome,
-    [Alias('s')]
-    [string]$ToolsSource,
-    [Alias('u')]
-    [switch]$Update,
-    [string]$ConfigFile = (Join-Path $PSScriptRoot 'version.xml'),
-    [Parameter(ValueFromRemainingArguments = $true)]
-    [string[]]$MSBuildArgs
-)
-
-Set-StrictMode -Version 2
-$ErrorActionPreference = 'Stop'
-
-#
-# Functions
-#
-
-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
+            }
+            else
+            {
+                $exception = $_.Exception
+                throw $exception
+            }
+        }
+    }
 }

-    $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1
-    if (!$version) {
-        Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'"
-    }
-    $version = $version.TrimStart('version:').Trim()
-    $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
+cd $PSScriptRoot

-    if (!(Test-Path $korebuildPath)) {
-        Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
-        New-Item -ItemType Directory -Path $korebuildPath | Out-Null
-        $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip"
+$repoFolder = $PSScriptRoot
+$env:REPO_FOLDER = $repoFolder

-        try {
-            $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
-            Get-RemoteFile $remotePath $tmpfile
-            if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) {
-                # Use built-in commands where possible as they are cross-plat compatible
-                Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
+if ($env:KOREBUILD_ZIP)
+{
+    $koreBuildZip=$env:KOREBUILD_ZIP
 }
-            else {
-                # Fallback to old approach for old installations of PowerShell
+
+$buildFolder = ".build"
+$buildFile="$buildFolder\KoreBuild.ps1"
+
+if (!(Test-Path $buildFolder)) {
+    Write-Host "Downloading KoreBuild from $koreBuildZip"
+
+    $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
+    New-Item -Path "$tempFolder" -Type directory | Out-Null
+
+    $localZipFile="$tempFolder\korebuild.zip"
+
+    DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
+
    Add-Type -AssemblyName System.IO.Compression.FileSystem
-                [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath)
-            }
-        }
-        catch {
-            Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore
-            throw
-        }
-        finally {
-            Remove-Item $tmpfile -ErrorAction Ignore
+    [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
+
+    New-Item -Path "$buildFolder" -Type directory | Out-Null
+    copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
+
+    # Cleanup
+    if (Test-Path $tempFolder) {
+        Remove-Item -Recurse -Force $tempFolder
    }
 }

-    return $korebuildPath
-}
-
-function Join-Paths([string]$path, [string[]]$childPaths) {
-    $childPaths | ForEach-Object { $path = Join-Path $path $_ }
-    return $path
-}
-
-function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
-    if ($RemotePath -notlike 'http*') {
-        Copy-Item $RemotePath $LocalPath
-        return
-    }
-
-    $retries = 10
-    while ($retries -gt 0) {
-        $retries -= 1
-        try {
-            Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath
-            return
-        }
-        catch {
-            Write-Verbose "Request failed. $retries retries remaining"
-        }
-    }
-
-    Write-Error "Download failed: '$RemotePath'."
-}
-
-#
-# Main
-#
-
-# Load configuration or set defaults
-
-if (Test-Path $ConfigFile) {
-    [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) {
-    $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } `
-        elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
-        elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}`
-        else { Join-Path $PSScriptRoot '.dotnet'}
-}
-
-if (!$Channel) { $Channel = 'dev' }
-if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
-
-# Execute
-
-$korebuildPath = Get-KoreBuild
-Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
-
-try {
-    Install-Tools $ToolsSource $DotNetHome
-    Invoke-RepositoryBuild $Path @MSBuildArgs
-}
-finally {
-    Remove-Module 'KoreBuild' -ErrorAction Ignore
-}
+&"$buildFile" @args
--- a/build.sh
+++ b/build.sh
@@ -1,199 +1,46 @@
 #!/usr/bin/env bash
+repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $repoFolder

-set -euo pipefail
-
-#
-# 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
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/2.0.0-preview2.zip"
+if [ ! -z $KOREBUILD_ZIP ]; then
+    koreBuildZip=$KOREBUILD_ZIP
 fi

-        source "$korebuild_path/KoreBuild.sh"
-    } || {
-        if [ -d "$korebuild_path" ]; then
-            echo "Cleaning up after failed installation"
-            rm -rf "$korebuild_path" || true
+buildFolder=".build"
+buildFile="$buildFolder/KoreBuild.sh"
+
+if test ! -d $buildFolder; then
+    echo "Downloading KoreBuild from $koreBuildZip"
+
+    tempFolder="/tmp/KoreBuild-$(uuidgen)"
+    mkdir $tempFolder
+
+    localZipFile="$tempFolder/korebuild.zip"
+
+    retries=6
+    until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null)
+    do
+        echo "Failed to download '$koreBuildZip'"
+        if [ "$retries" -le 0 ]; then
+            exit 1
        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
+        retries=$((retries - 1))
+        echo "Waiting 10 seconds before retrying. Retries left: $retries"
+        sleep 10s
    done

-if ! __machine_has unzip; then
-    __error 'Missing required command: unzip'
-    exit 1
+    unzip -q -d $tempFolder $localZipFile
+
+    mkdir $buildFolder
+    cp -r $tempFolder/**/build/** $buildFolder
+
+    chmod +x $buildFile
+
+    # Cleanup
+    if test -d $tempFolder; then
+        rm -rf $tempFolder
+    fi
 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" "$@"
+$buildFile -r $repoFolder "$@"
--- a/build/common.props
+++ b/build/common.props
@@ -1,6 +1,6 @@
 <Project>
  <Import Project="dependencies.props" />
-  <Import Project="..\version.xml" />
+  <Import Project="..\version.props" />

  <PropertyGroup>
    <Product>Microsoft ASP.NET Core</Product>
@@ -10,7 +10,6 @@
    <SignAssembly>true</SignAssembly>
    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
    <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>

  <ItemGroup>
@@ -18,6 +17,7 @@
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
-    <PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
+    <PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" />
+    <PackageReference Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
  </ItemGroup>
 </Project>
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,11 +1,12 @@
 <Project>
  <PropertyGroup>
-    <AspNetCoreVersion>2.1.0-*</AspNetCoreVersion>
-    <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
+    <AspNetCoreVersion>2.0.0-preview2-*</AspNetCoreVersion>
+    <AutoMapperVersion>5.0.2</AutoMapperVersion>
+    <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
    <JsonNetVersion>10.0.1</JsonNetVersion>
-    <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
+    <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
    <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <ThreadingDataflowVersion>4.8.0-*</ThreadingDataflowVersion>
+    <ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
  </PropertyGroup>
 </Project>
--- a/samples/misc/LatencyTest/Program.cs
+++ b/samples/misc/LatencyTest/Program.cs
@@ -21,6 +21,7 @@ namespace ConsoleApplication
                // Since .NET Core 1.1, the HTTP hosting model has become basically as fast as the Socket hosting model
                //options.UseSocketHosting();

+                options.ProjectPath = Directory.GetCurrentDirectory();
                options.WatchFileExtensions = new string[] {}; // Don't watch anything
            });
            var serviceProvider = services.BuildServiceProvider();
--- a/samples/misc/NodeServicesExamples/Controllers/HomeController.cs
+++ b/samples/misc/NodeServicesExamples/Controllers/HomeController.cs
@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.NodeServices;
-using Microsoft.AspNetCore.SpaServices.Prerendering;

 namespace NodeServicesExamples.Controllers
 {
@@ -35,20 +34,6 @@ namespace NodeServicesExamples.Controllers
            return View();
        }

-        public async Task<IActionResult> Prerendering([FromServices] ISpaPrerenderer prerenderer)
-        {
-            var result = await prerenderer.RenderToString("./Node/prerenderPage");
-
-            if (!string.IsNullOrEmpty(result.RedirectUrl))
-            {
-                return Redirect(result.RedirectUrl);
-            }
-
-            ViewData["PrerenderedHtml"] = result.Html;
-            ViewData["PrerenderedGlobals"] = result.CreateGlobalsAssignmentScript();
-            return View();
-        }
-
        public IActionResult Error()
        {
            return View("~/Views/Shared/Error.cshtml");
--- a/samples/misc/NodeServicesExamples/Node/prerenderPage.js
+++ b/samples/misc/NodeServicesExamples/Node/prerenderPage.js
@@ -1,14 +0,0 @@
-var createServerRenderer = require('aspnet-prerendering').createServerRenderer;
-
-module.exports = createServerRenderer(function(params) {
-    return new Promise(function (resolve, reject) {
-        var message = 'The HTML was returned by the prerendering boot function. '
-            + 'The boot function received the following params:'
-            + '<pre>' + JSON.stringify(params, null, 4) + '</pre>';
-
-        resolve({
-            html: '<h3>Hello, world!</h3>' + message,
-            globals: { sampleData: { nodeVersion: process.version } }
-        });
-    });
-});
--- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
+++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/misc/NodeServicesExamples/Startup.cs
+++ b/samples/misc/NodeServicesExamples/Startup.cs
@@ -17,7 +17,6 @@ namespace NodeServicesExamples

            // Enable Node Services
            services.AddNodeServices();
-            services.AddSpaPrerenderer();
        }

        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
--- a/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml
+++ b/samples/misc/NodeServicesExamples/Views/Home/Index.cshtml
@@ -9,5 +9,4 @@
 <ul>
    <li><a asp-action="ES2015Transpilation">ES2015 transpilation</a></li>
    <li><a asp-action="Chart">Server-side chart rendering</a></li>
-    <li><a asp-action="Prerendering">Server-side SPA prerendering</a></li>
 </ul>
--- a/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml
+++ b/samples/misc/NodeServicesExamples/Views/Home/Prerendering.cshtml
@@ -1,21 +0,0 @@
-<h1>Server-side prerendering</h1>
-
-<p>
-    This sample demonstrates how you can invoke a JavaScript module that contains
-    prerendering logic for a Single-Page Application framework.
-</p>
-</p>
-    Your prerendering boot function will receive parameters that describe the page
-    being rendered and any data supplied by the .NET code. The return value should be
-    a promise that resolves with data to be injected into the page, such as the
-    rendered HTML and any global data that should be made available to client-side code.
-</p>
-
-@Html.Raw(ViewData["PrerenderedHtml"])
-
-<script>@Html.Raw(ViewData["PrerenderedGlobals"])</script>
-
-<script>
-    // Demonstrates how client-side code can receive data from the prerendering process
-    console.log('Received Node version from prerendering logic: ' + sampleData.nodeVersion);
-</script>
--- a/samples/misc/NodeServicesExamples/package.json
+++ b/samples/misc/NodeServicesExamples/package.json
@@ -2,7 +2,6 @@
  "name": "nodeservicesexamples",
  "version": "0.0.0",
  "dependencies": {
-    "aspnet-prerendering": "^2.0.6",
    "babel-core": "^6.7.4",
    "babel-preset-es2015": "^6.6.0",
    "node-chartist": "^1.0.2"
--- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
+++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
@@ -10,7 +10,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <None Remove="node_modules\**\*" />
    <EmbeddedResource Include="Content\**\*" />
  </ItemGroup>

--- a/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Configuration/NodeServicesOptions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using Microsoft.AspNetCore.NodeServices.HostingModels;
 using Microsoft.Extensions.Logging;
@@ -35,18 +34,14 @@ namespace Microsoft.AspNetCore.NodeServices
            InvocationTimeoutMilliseconds = DefaultInvocationTimeoutMilliseconds;
            WatchFileExtensions = (string[])DefaultWatchFileExtensions.Clone();

+            // In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few
+            // things that you'd otherwise have to specify manually
            var hostEnv = serviceProvider.GetService<IHostingEnvironment>();
            if (hostEnv != null)
            {
-                // In an ASP.NET environment, we can use the IHostingEnvironment data to auto-populate a few
-                // things that you'd otherwise have to specify manually
                ProjectPath = hostEnv.ContentRootPath;
                EnvironmentVariables["NODE_ENV"] = hostEnv.IsDevelopment() ? "development" : "production"; // De-facto standard values for Node
            }
-            else
-            {
-                ProjectPath = Directory.GetCurrentDirectory();
-            }

            var applicationLifetime = serviceProvider.GetService<IApplicationLifetime>();
            if (applicationLifetime != null)
--- a/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
+++ b/src/Microsoft.AspNetCore.NodeServices/Content/Node/entrypoint-http.js
@@ -55,11 +55,10 @@
 	// 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);
+	var http = __webpack_require__(3);
+	var path = __webpack_require__(4);
+	var ArgsUtil_1 = __webpack_require__(5);
+	var ExitWhenParentExits_1 = __webpack_require__(6);
 	// 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');
@@ -134,73 +133,12 @@
 	}
 	function respondWithError(res, errorValue) {
 	    res.statusCode = 500;
-	    res.end(JSON.stringify({
-	        errorMessage: errorValue.message || errorValue,
-	        errorDetails: errorValue.stack || null
-	    }));
+	    res.end(errorValue.stack || errorValue.toString());
 	}


 /***/ },
 /* 2 */
-/***/ function(module, exports, __webpack_require__) {
-
-	"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);
-	    }
-	    catch (ex) {
-	        var shouldOverrideError = startsWith(ex.message, 'EPERM') // It's a permissions error
-	            && typeof appRootDirLong === 'string'
-	            && startsWith(appRootDirLong, pathToStatLong) // ... for an ancestor directory
-	            && ex.stack.indexOf('Object.realpathSync ') >= 0; // ... during symlink resolution
-	        if (shouldOverrideError) {
-	            // Fake the result to give the same result as an 'lstat' on the app root dir.
-	            // This stops Node failing to load modules just because it doesn't know whether
-	            // ancestor directories are symlinks or not. If there's a genuine file
-	            // permissions issue, it will still surface later when Node actually
-	            // tries to read the file.
-	            return origLStat.call(this, appRootDir, fsReqWrap);
-	        }
-	        else {
-	            // In any other case, preserve the original error
-	            throw ex;
-	        }
-	    }
-	}
-	;
-	// 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);
-	        // Actually apply the patch, being as defensive as possible
-	        var bindingFs = process.binding('fs');
-	        origLStat = bindingFs.lstat;
-	        if (typeof origLStat === 'function') {
-	            bindingFs.lstat = patchedLStat;
-	        }
-	    }
-	    catch (ex) {
-	    }
-	}
-
-
-/***/ },
-/* 3 */
-/***/ function(module, exports) {
-
-	module.exports = require("path");
-
-/***/ },
-/* 4 */
 /***/ function(module, exports) {

 	// When Node writes to stdout/strerr, we capture that and convert the lines into calls on the
@@ -241,13 +179,19 @@


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

 	module.exports = require("http");

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

 	"use strict";
@@ -273,7 +217,7 @@


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

 	/*
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/HttpNodeInstance.cs
@@ -50,7 +50,6 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
                options.DebuggingPort)
        {
            _client = new HttpClient();
-            _client.Timeout = TimeSpan.FromMilliseconds(options.InvocationTimeoutMilliseconds + 1000);
        }

        private static string MakeCommandLineOptions(int port)
@@ -68,10 +67,8 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
            if (!response.IsSuccessStatusCode)
            {
                // Unfortunately there's no true way to cancel ReadAsStringAsync calls, hence AbandonIfCancelled
-                var responseJson = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
-                var responseError = JsonConvert.DeserializeObject<RpcJsonResponse>(responseJson, jsonSerializerSettings);
-
-                throw new NodeInvocationException(responseError.ErrorMessage, responseError.ErrorDetails);
+                var responseErrorString = await response.Content.ReadAsStringAsync().OrThrowOnCancellation(cancellationToken);
+                throw new Exception("Call to Node module failed with error: " + responseErrorString);
            }

            var responseContentType = response.Content.Headers.ContentType;
@@ -139,13 +136,5 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels
                _disposed = true;
            }
        }
-
-#pragma warning disable 649 // These properties are populated via JSON deserialization
-        private class RpcJsonResponse
-        {
-            public string ErrorMessage { get; set; }
-            public string ErrorDetails { get; set; }
-        }
-#pragma warning restore 649
    }
 }
--- a/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
@@ -297,7 +297,7 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels

                // Make sure the Node process is finished
                // TODO: Is there a more graceful way to end it? Or does this still let it perform any cleanup?
-                if (_nodeProcess != null && !_nodeProcess.HasExited)
+                if (!_nodeProcess.HasExited)
                {
                    _nodeProcess.Kill();
                }
--- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
@@ -11,7 +11,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <None Remove="node_modules\**\*" />
    <EmbeddedResource Include="Content\**\*" />
  </ItemGroup>

--- a/src/Microsoft.AspNetCore.NodeServices/README.md
+++ b/src/Microsoft.AspNetCore.NodeServices/README.md
@@ -317,7 +317,7 @@ module.exports = {

 ## Hosting models

-NodeServices has a pluggable hosting/transport mechanism, because it is an abstraction over various possible ways to invoke Node.js from .NET. This allows more high-level facilities (e.g., for Angular prerendering) to be agnostic to the details of launching Node and communicating with it - those high-level facilities can just trust that *somehow* we can invoke code in Node for them.
+NodeServices has a pluggable hosting/transport mechanism, because it is an abstraction over various possible ways to invoke Node.js from .NET. This allows more high-level facilities (e.g., for Angular prerendering) to be agnostic to the details of launching Node and communicating it - those high-level facilities can just trust that *somehow* we can invoke code in Node for them.

 Using this abstraction, we could run Node inside the .NET process, in a separate process on the same machine, or even on a different machine altogether. At the time of writing, all the built-in hosting mechanisms work by launching Node as a separate process on the same machine as your .NET code.

--- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts
+++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/HttpNodeInstanceEntryPoint.ts
@@ -1,6 +1,5 @@
 // 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.
-import './Util/PatchModuleResolutionLStat';
 import './Util/OverrideStdOutputs';
 import * as http from 'http';
 import * as path from 'path';
@@ -87,8 +86,5 @@ function readRequestBodyAsJson(request, callback) {

 function respondWithError(res: http.ServerResponse, errorValue: any) {
    res.statusCode = 500;
-    res.end(JSON.stringify({
-        errorMessage: errorValue.message || errorValue,
-        errorDetails: errorValue.stack || null
-    }));
+    res.end(errorValue.stack || errorValue.toString());
 }
--- a/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts
+++ b/src/Microsoft.AspNetCore.NodeServices/TypeScript/Util/PatchModuleResolutionLStat.ts
@@ -1,48 +0,0 @@
-import * as path from 'path';
-const startsWith = (str: string, prefix: string) => str.substring(0, prefix.length) === prefix;
-const appRootDir = process.cwd();
-
-function patchedLStat(pathToStatLong: string, fsReqWrap?: any) {
-    try {
-        // If the lstat completes without errors, we don't modify its behavior at all
-        return origLStat.apply(this, arguments);
-    } catch(ex) {
-        const shouldOverrideError =
-            startsWith(ex.message, 'EPERM')                     // It's a permissions error
-            && typeof appRootDirLong === 'string'
-            && startsWith(appRootDirLong, pathToStatLong)       // ... for an ancestor directory
-            && ex.stack.indexOf('Object.realpathSync ') >= 0;   // ... during symlink resolution
-
-        if (shouldOverrideError) {
-            // Fake the result to give the same result as an 'lstat' on the app root dir.
-            // This stops Node failing to load modules just because it doesn't know whether
-            // ancestor directories are symlinks or not. If there's a genuine file
-            // permissions issue, it will still surface later when Node actually
-            // tries to read the file.
-            return origLStat.call(this, appRootDir, fsReqWrap);
-        } else {
-            // In any other case, preserve the original error
-            throw ex;
-        }
-    }
-};
-
-// It's only necessary to apply this workaround on Windows
-let appRootDirLong: string = null;
-let origLStat: Function = 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 as any)._makeLong(appRootDir);
-
-        // Actually apply the patch, being as defensive as possible
-        const bindingFs = (process as any).binding('fs');
-        origLStat = bindingFs.lstat;
-        if (typeof origLStat === 'function') {
-            bindingFs.lstat = patchedLStat;
-        }
-    } 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.
-    }
-}
--- a/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
+++ b/src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.NodeServices
        /// <param name="applicationStoppingToken">A token that indicates when the host application is stopping.</param>
        public StringAsTempFile(string content, CancellationToken applicationStoppingToken)
        {
-            FileName = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+            FileName = Path.GetTempFileName();
            File.WriteAllText(FileName, content);

            // Because .NET finalizers don't reliably run when the process is terminating, also
--- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
+++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
@@ -11,7 +11,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <None Remove="node_modules\**\*" />
    <EmbeddedResource Include="Content\**\*" />
    <ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(AspNetCoreVersion)" />
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/DefaultSpaPrerenderer.cs
@@ -1,49 +0,0 @@
-using System.Threading;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.NodeServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.Prerendering
-{
-    /// <summary>
-    /// Default implementation of a DI service that provides convenient access to
-    /// server-side prerendering APIs. This is an alternative to prerendering via
-    /// the asp-prerender-module tag helper.
-    /// </summary>
-    internal class DefaultSpaPrerenderer : ISpaPrerenderer
-    {
-        private readonly string _applicationBasePath;
-        private readonly CancellationToken _applicationStoppingToken;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly INodeServices _nodeServices;
-
-        public DefaultSpaPrerenderer(
-            INodeServices nodeServices,
-            IApplicationLifetime applicationLifetime,
-            IHostingEnvironment hostingEnvironment,
-            IHttpContextAccessor httpContextAccessor)
-        {
-            _applicationBasePath = hostingEnvironment.ContentRootPath;
-            _applicationStoppingToken = applicationLifetime.ApplicationStopping;
-            _httpContextAccessor = httpContextAccessor;
-            _nodeServices = nodeServices;
-        }
-
-        public Task<RenderToStringResult> RenderToString(
-            string moduleName,
-            string exportName = null,
-            object customDataParameter = null,
-            int timeoutMilliseconds = default(int))
-        {
-            return Prerenderer.RenderToString(
-                _applicationBasePath,
-                _nodeServices,
-                _applicationStoppingToken,
-                new JavaScriptModuleExport(moduleName) { ExportName = exportName },
-                _httpContextAccessor.HttpContext,
-                customDataParameter,
-                timeoutMilliseconds);
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/ISpaPrerenderer.cs
@@ -1,28 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.SpaServices.Prerendering
-{
-    /// <summary>
-    /// Represents a service that can perform server-side prerendering for
-    /// JavaScript-based Single Page Applications. This is an alternative
-    /// to using the 'asp-prerender-module' tag helper.
-    /// </summary>
-    public interface ISpaPrerenderer
-    {
-        /// <summary>
-        /// Invokes JavaScript code to perform server-side prerendering for a
-        /// Single-Page Application. This is an alternative to using the
-        /// 'asp-prerender-module' tag helper.
-        /// </summary>
-        /// <param name="moduleName">The JavaScript module that exports a prerendering function.</param>
-        /// <param name="exportName">The name of the export from the JavaScript module, if it is not the default export.</param>
-        /// <param name="customDataParameter">An optional JSON-serializable object to pass to the JavaScript prerendering function.</param>
-        /// <param name="timeoutMilliseconds">If specified, the prerendering task will time out after this duration if not already completed.</param>
-        /// <returns></returns>
-        Task<RenderToStringResult> RenderToString(
-            string moduleName,
-            string exportName = null,
-            object customDataParameter = null,
-            int timeoutMilliseconds = default(int));
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderTagHelper.cs
@@ -1,11 +1,14 @@
 using System;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.NodeServices;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Newtonsoft.Json;

 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
@@ -87,6 +90,19 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
        /// <returns>A <see cref="Task"/> representing the operation.</returns>
        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
        {
+            // We want to pass the original, unencoded incoming URL data through to Node, so that
+            // server-side code has the same view of the URL as client-side code (on the client,
+            // location.pathname returns an unencoded string).
+            // The following logic handles special characters in URL paths in the same way that
+            // Node and client-side JS does. For example, the path "/a=b%20c" gets passed through
+            // unchanged (whereas other .NET APIs do change it - Path.Value will return it as
+            // "/a=b c" and Path.ToString() will return it as "/a%3db%20c")
+            var requestFeature = ViewContext.HttpContext.Features.Get<IHttpRequestFeature>();
+            var unencodedPathAndQuery = requestFeature.RawTarget;
+
+            var request = ViewContext.HttpContext.Request;
+            var unencodedAbsoluteUrl = $"{request.Scheme}://{request.Host}{unencodedPathAndQuery}";
+
            var result = await Prerenderer.RenderToString(
                _applicationBasePath,
                _nodeServices,
@@ -95,9 +111,11 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
                {
                    ExportName = ExportName
                },
-                ViewContext.HttpContext,
+                unencodedAbsoluteUrl,
+                unencodedPathAndQuery,
                CustomDataParameter,
-                TimeoutMillisecondsParameter);
+                TimeoutMillisecondsParameter,
+                request.PathBase.ToString());

            if (!string.IsNullOrEmpty(result.RedirectUrl))
            {
@@ -116,10 +134,19 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering

            // Also attach any specified globals to the 'window' object. This is useful for transferring
            // general state between server and client.
-            var globalsScript = result.CreateGlobalsAssignmentScript();
-            if (!string.IsNullOrEmpty(globalsScript))
+            if (result.Globals != null)
            {
-                output.PostElement.SetHtmlContent($"<script>{globalsScript}</script>");
+                var stringBuilder = new StringBuilder();
+                foreach (var property in result.Globals.Properties())
+                {
+                    stringBuilder.AppendFormat("window.{0} = {1};",
+                        property.Name,
+                        property.Value.ToString(Formatting.None));
+                }
+                if (stringBuilder.Length > 0)
+                {
+                    output.PostElement.SetHtmlContent($"<script>{stringBuilder}</script>");
+                }
            }
        }
    }
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/Prerenderer.cs
@@ -2,8 +2,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.NodeServices;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;

 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
@@ -16,40 +14,6 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering

        private static StringAsTempFile NodeScript;

-        internal static Task<RenderToStringResult> RenderToString(
-            string applicationBasePath,
-            INodeServices nodeServices,
-            CancellationToken applicationStoppingToken,
-            JavaScriptModuleExport bootModule,
-            HttpContext httpContext,
-            object customDataParameter,
-            int timeoutMilliseconds)
-        {
-            // We want to pass the original, unencoded incoming URL data through to Node, so that
-            // server-side code has the same view of the URL as client-side code (on the client,
-            // location.pathname returns an unencoded string).
-            // The following logic handles special characters in URL paths in the same way that
-            // Node and client-side JS does. For example, the path "/a=b%20c" gets passed through
-            // unchanged (whereas other .NET APIs do change it - Path.Value will return it as
-            // "/a=b c" and Path.ToString() will return it as "/a%3db%20c")
-            var requestFeature = httpContext.Features.Get<IHttpRequestFeature>();
-            var unencodedPathAndQuery = requestFeature.RawTarget;
-
-            var request = httpContext.Request;
-            var unencodedAbsoluteUrl = $"{request.Scheme}://{request.Host}{unencodedPathAndQuery}";
-
-            return RenderToString(
-                applicationBasePath,
-                nodeServices,
-                applicationStoppingToken,
-                bootModule,
-                unencodedAbsoluteUrl,
-                unencodedPathAndQuery,
-                customDataParameter,
-                timeoutMilliseconds,
-                request.PathBase.ToString());
-        }
-
        /// <summary>
        /// Performs server-side prerendering by invoking code in Node.js.
        /// </summary>
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/PrerenderingServiceCollectionExtensions.cs
@@ -1,27 +0,0 @@
-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
-{
-    /// <summary>
-    /// Extension methods for setting up prerendering features in an <see cref="IServiceCollection" />.
-    /// </summary>
-    public static class PrerenderingServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Configures the dependency injection system to supply an implementation
-        /// of <see cref="ISpaPrerenderer"/>.
-        /// </summary>
-        /// <param name="serviceCollection">The <see cref="IServiceCollection"/>.</param>
-        public static void AddSpaPrerenderer(this IServiceCollection serviceCollection)
-        {
-            serviceCollection.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-            serviceCollection.AddSingleton<ISpaPrerenderer, DefaultSpaPrerenderer>();
-        }
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Prerendering/RenderToStringResult.cs
@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Text;

 namespace Microsoft.AspNetCore.SpaServices.Prerendering
 {
@@ -32,29 +30,5 @@ namespace Microsoft.AspNetCore.SpaServices.Prerendering
        /// If set, specifies the HTTP status code that should be sent back with the server response.
        /// </summary>
        public int? StatusCode { get; set; }
-
-        /// <summary>
-        /// Constructs a block of JavaScript code that assigns data from the
-        /// <see cref="Globals"/> property to the global namespace.
-        /// </summary>
-        /// <returns>A block of JavaScript code.</returns>
-        public string CreateGlobalsAssignmentScript()
-        {
-            if (Globals == null)
-            {
-                return string.Empty;
-            }
-
-            var stringBuilder = new StringBuilder();
-
-            foreach (var property in Globals.Properties())
-            {
-                stringBuilder.AppendFormat("window.{0} = {1};",
-                    property.Name,
-                    property.Value.ToString(Formatting.None));
-            }
-
-            return stringBuilder.ToString();
-        }
    }
 }
--- a/src/Microsoft.AspNetCore.SpaServices/README.md
+++ b/src/Microsoft.AspNetCore.SpaServices/README.md
@@ -20,7 +20,7 @@ Behind the scenes, it uses the [`Microsoft.AspNetCore.NodeServices`](https://git

 ### Installation into existing projects

- * Install the `Microsoft.AspNetCore.SpaServices` NuGet package
+ * Add `Microsoft.AspNetCore.SpaServices` to the dependencies list in your `project.json` file
 * Run `dotnet restore` (or if you use Visual Studio, just wait a moment - it will restore dependencies automatically)
 * Install supporting NPM packages for the features you'll be using:
   * For **server-side prerendering**, install `aspnet-prerendering`
--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/ConditionalProxyMiddleware.cs
@@ -28,11 +28,6 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack
            string pathPrefix,
            ConditionalProxyMiddlewareOptions options)
        {
-            if (!pathPrefix.StartsWith("/"))
-            {
-                pathPrefix = "/" + pathPrefix;
-            }
-
            _next = next;
            _pathPrefix = pathPrefix;
            _options = options;
@@ -70,7 +65,7 @@ namespace Microsoft.AspNetCore.SpaServices.Webpack

            requestMessage.Headers.Host = _options.Host + ":" + _options.Port;
            var uriString =
-                $"{_options.Scheme}://{_options.Host}:{_options.Port}{context.Request.Path}{context.Request.QueryString}";
+                $"{_options.Scheme}://{_options.Host}:{_options.Port}{context.Request.PathBase}{context.Request.Path}{context.Request.QueryString}";
            requestMessage.RequestUri = new Uri(uriString);
            requestMessage.Method = new HttpMethod(context.Request.Method);

--- a/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
+++ b/src/Microsoft.AspNetCore.SpaServices/Webpack/WebpackDevMiddleware.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using Microsoft.AspNetCore.NodeServices;
 using Microsoft.AspNetCore.SpaServices.Webpack;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;

 namespace Microsoft.AspNetCore.Builder
 {
@@ -15,12 +14,6 @@ namespace Microsoft.AspNetCore.Builder
    {
        private const string DefaultConfigFile = "webpack.config.js";

-        private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings
-        {
-            ContractResolver = new CamelCasePropertyNamesContractResolver(),
-            TypeNameHandling = TypeNameHandling.None
-        };
-
        /// <summary>
        /// Enables Webpack dev middleware support. This hosts an instance of the Webpack compiler in memory
        /// in your application so that you can always serve up-to-date Webpack-built resources without having
@@ -94,7 +87,7 @@ namespace Microsoft.AspNetCore.Builder
            };
            var devServerInfo =
                nodeServices.InvokeExportAsync<WebpackDevServerInfo>(nodeScript.FileName, "createWebpackDevServer",
-                    JsonConvert.SerializeObject(devServerOptions, jsonSerializerSettings)).Result;
+                    JsonConvert.SerializeObject(devServerOptions)).Result;

            // If we're talking to an older version of aspnet-webpack, it will return only a single PublicPath,
            // not an array of PublicPaths. Handle that scenario.
@@ -108,9 +101,9 @@ namespace Microsoft.AspNetCore.Builder
            // plus /__webpack_hmr is proxied with infinite timeout, because it's an EventSource (long-lived request).
            foreach (var publicPath in devServerInfo.PublicPaths)
            {
-                appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath + hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan);
                appBuilder.UseProxyToLocalWebpackDevMiddleware(publicPath, devServerInfo.Port, TimeSpan.FromSeconds(100));
            }
+            appBuilder.UseProxyToLocalWebpackDevMiddleware(hmrEndpoint, devServerInfo.Port, Timeout.InfiniteTimeSpan);
        }

        private static void UseProxyToLocalWebpackDevMiddleware(this IApplicationBuilder appBuilder, string publicPath, int proxyToPort, TimeSpan requestTimeout)
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.gitignore
@@ -1,5 +0,0 @@
-/node_modules/
-**/*.js
-**/*.d.ts
-**/*.metadata.json
-/compiled
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/.npmignore
@@ -1,3 +0,0 @@
-!/*.js
-!/*.d.ts
-/compiled
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/LICENSE.txt
@@ -1,12 +0,0 @@
-Copyright (c) .NET Foundation. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-these files 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.
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/package.json
@@ -1,33 +0,0 @@
-{
-  "name": "aspnet-angular",
-  "version": "0.1.1",
-  "description": "Helpers for using Angular in ASP.NET Core projects",
-  "main": "index.js",
-  "scripts": {
-    "prepublish": "rimraf *.d.ts && ngc && echo 'Finished building NPM package \"aspnet-angular\"'",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/JavaScriptServices.git"
-  },
-  "author": "Microsoft",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/aspnet/JavaScriptServices/issues"
-  },
-  "devDependencies": {
-    "@angular/common": "^4.3.2",
-    "@angular/compiler": "^4.3.2",
-    "@angular/compiler-cli": "^4.3.2",
-    "@angular/core": "^4.3.2",
-    "@angular/http": "^4.3.2",
-    "@angular/platform-browser": "^4.3.2",
-    "rimraf": "^2.6.1",
-    "rxjs": "^5.4.2",
-    "zone.js": "^0.8.16"
-  },
-  "peerDependencies": {
-    "@angular/core": "^4.2.5 || ^5.0.0-beta"
-  }
-}
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/HttpWithStateTransfer.ts
@@ -1,94 +0,0 @@
-import { Provider, NgModule, Inject } from '@angular/core';
-import { Headers, Http, ResponseOptions, RequestOptionsArgs, Response } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/of';
-import 'rxjs/add/operator/map';
-const globalSerializedStateKey = 'HTTP_STATE_TRANSFER';
-const backingStoreDIToken = 'HTTP_STATE_BACKING_STORE';
-
-export interface CacheOptions {
-    permanent: boolean;
-}
-
-export interface CachedHttpResponse {
-    headers: { [name: string]: any } | null;
-    status: number;
-    statusText: string | null;
-    text: string;
-    url: string;
-}
-
-export type BackingStore = { [key: string]: CachedHttpResponse };
-
-export class HttpWithStateTransfer {
-    private backingStore: BackingStore;
-    private http: Http;
-
-    constructor(@Inject(Http) http: Http, @Inject(backingStoreDIToken) backingStore: BackingStore) {
-        this.http = http;
-        this.backingStore = backingStore;
-    }
-
-    public stateForTransfer(): any {
-        return { [globalSerializedStateKey]: this.backingStore };
-    }
-
-    public get(url: string, options?: CacheOptions, requestOptions?: RequestOptionsArgs): Observable<Response> {
-        return this.getCachedResponse(/* cacheKey */ url, () => this.http.get(url, requestOptions), options);
-    }
-
-    private getCachedResponse(cacheKey: string, provider: () => Observable<Response>, options?: CacheOptions): Observable<Response> {        
-        // By default, the cache is only used for the *first* client-side read. So, we're only performing
-        // a one-time transfer of server-side response to the client. If you want to keep and reuse cached
-        // responses continually during server-side and client-side execution, set 'permanent' to 'true.
-        const isClient = typeof window !== 'undefined';
-        const isPermanent = options && options.permanent;
-
-        const allowReadFromCache = isClient || isPermanent;
-        if (allowReadFromCache && this.backingStore.hasOwnProperty(cacheKey)) {
-            const cachedValue = this.backingStore[cacheKey];
-            if (!isPermanent) {
-                delete this.backingStore[cacheKey];
-            }
-            return Observable.of(new Response(new ResponseOptions({
-                body: cachedValue.text,
-                headers: new Headers(cachedValue.headers),
-                status: cachedValue.status,
-                url: cachedValue.url
-            })));
-        }
-
-        return provider()
-            .map(response => {
-                const allowWriteToCache = !isClient || isPermanent;
-                if (allowWriteToCache) {
-                    this.backingStore[cacheKey] = {
-                        headers: response.headers ? response.headers.toJSON() : null,
-                        status: response.status,
-                        statusText: response.statusText,
-                        text: response.text(),
-                        url: response.url
-                    };
-                }
-
-                return response;
-            });
-    }
-}
-
-export function defaultBackingStoreFactory() {
-    const transferredData = typeof window !== 'undefined' ? (window as any)[globalSerializedStateKey] : null;
-    return transferredData || {};
-}
-
-@NgModule({
-    providers: [
-        // The backing store is a separate DI service so you could override exactly how it gets
-        // transferred from server to client
-        { provide: backingStoreDIToken, useFactory: defaultBackingStoreFactory },
-
-        { provide: HttpWithStateTransfer, useClass: HttpWithStateTransfer },
-    ]
-})
-export class HttpWithStateTransferModule {
-}
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/src/index.ts
@@ -1 +0,0 @@
-export * from './HttpWithStateTransfer';
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-angular/tsconfig.json
@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "moduleResolution": "node",
-    "module": "commonjs",
-    "target": "es5",
-    "declaration": true,
-    "outDir": ".",
-    "lib": ["es2015", "dom"]
-  },
-  "files": [
-    "src/index.ts"
-  ],
-  "exclude": [
-    "node_modules"
-  ],
-  "angularCompilerOptions": {
-    "genDir": "compiled"
-  }
-}
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
@@ -1,6 +1,6 @@
 {
  "name": "aspnet-prerendering",
-  "version": "3.0.1",
+  "version": "2.0.5",
  "description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
  "main": "index.js",
  "scripts": {
@@ -17,7 +17,7 @@
    "url": "https://github.com/aspnet/JavaScriptServices.git"
  },
  "dependencies": {
-    "domain-task": "^3.0.0"
+    "domain-task": "^2.0.2"
  },
  "devDependencies": {
    "@types/node": "^6.0.42",
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/Prerendering.ts
@@ -1,8 +1,8 @@
+/// <reference path="./PrerenderingInterfaces.d.ts" />
 import * as url from 'url';
 import * as path from 'path';
 import * as domain from 'domain';
 import { run as domainTaskRun, baseUrl as domainTaskBaseUrl } from 'domain-task/main';
-import { BootFunc, BootFuncParams, BootModuleInfo, RenderToStringCallback, RenderToStringFunc } from './PrerenderingInterfaces';

 const defaultTimeoutMilliseconds = 30 * 1000;

@@ -26,7 +26,6 @@ export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc {
            domainTasks: domainTaskCompletionPromise,
            data: customDataParameter
        };
-        const absoluteBaseUrl = params.origin + params.baseUrl; // Should be same value as page's <base href>

        // Open a new domain that can track all the async tasks involved in the app's execution
        domainTaskRun(/* code to run */ () => {
@@ -36,7 +35,7 @@ export function createServerRenderer(bootFunc: BootFunc): RenderToStringFunc {
            bindPromiseContinuationsToDomain(domainTaskCompletionPromise, domain['active']);

            // Make the base URL available to the 'domain-tasks/fetch' helper within this execution context
-            domainTaskBaseUrl(absoluteBaseUrl);
+            domainTaskBaseUrl(absoluteRequestUrl);

            // Begin rendering, and apply a timeout
            const bootFuncPromise = bootFunc(params);
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/PrerenderingInterfaces.d.ts
@@ -1,28 +1,26 @@
-export interface RenderToStringFunc {
+interface RenderToStringFunc {
    (callback: RenderToStringCallback, applicationBasePath: string, bootModule: BootModuleInfo, absoluteRequestUrl: string, requestPathAndQuery: string, customDataParameter: any, overrideTimeoutMilliseconds: number, requestPathBase: string): void;
 }

-export interface RenderToStringCallback {
-    (error: any, result?: RenderResult): void;
+interface RenderToStringCallback {
+    (error: any, result?: RenderToStringResult): void;
 }

-export interface RenderToStringResult {
+interface RenderToStringResult {
    html: string;
    statusCode?: number;
    globals?: { [key: string]: any };
 }

-export interface RedirectResult {
+interface RedirectResult {
    redirectUrl: string;
 }

-export type RenderResult = RenderToStringResult | RedirectResult;
-
-export interface BootFunc {
-    (params: BootFuncParams): Promise<RenderResult>;
+interface BootFunc {
+    (params: BootFuncParams): Promise<RenderToStringResult>;
 }

-export interface BootFuncParams {
+interface BootFuncParams {
    location: any;              // e.g., Location object containing information '/some/path'
    origin: string;             // e.g., 'https://example.com:1234'
    url: string;                // e.g., '/some/path'
@@ -32,7 +30,7 @@ export interface BootFuncParams {
    data: any;                  // any custom object passed through from .NET
 }

-export interface BootModuleInfo {
+interface BootModuleInfo {
    moduleName: string;
    exportName?: string;
    webpackConfig?: string;
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/src/index.ts
@@ -1,2 +1,5 @@
+/// <reference path="./PrerenderingInterfaces.d.ts" />
+
 export * from './Prerendering';
-export * from './PrerenderingInterfaces';
+
+export type RenderResult = RenderToStringResult | RedirectResult;
--- 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": "3.0.0",
+  "version": "2.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": {
--- 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": "2.0.1",
+  "version": "1.0.29",
  "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
  "main": "index.js",
  "scripts": {
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
@@ -5,11 +5,11 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as querystring from 'querystring';
 import { requireNewCopy } from './RequireNewCopy';
-import { hasSufficientPermissions } from './WebpackTestPermissions';

 export type CreateDevServerResult = {
    Port: number,
-    PublicPaths: string[]
+    PublicPaths: string[],
+    PublicPath: string // For backward compatibility with older verions of Microsoft.AspNetCore.SpaServices. Will be removed soon.
 };

 export interface CreateDevServerCallback {
@@ -108,7 +108,7 @@ function attachWebpackDevMiddleware(app: any, webpackConfig: webpack.Configurati
    const compiler = webpack(webpackConfig);
    app.use(require('webpack-dev-middleware')(compiler, {
        noInfo: true,
-        publicPath: ensureLeadingSlash(webpackConfig.output.publicPath),
+        publicPath: webpackConfig.output.publicPath,
        watchOptions: webpackConfig.watchOptions
    }));

@@ -195,14 +195,6 @@ function copyRecursiveToRealFsSync(from: typeof fs, rootDir: string, exclude: Re
    });
 }

-function ensureLeadingSlash(value: string) {
-    if (value !== null && value.substring(0, 1) !== '/') {
-        value = '/' + value;
-    }
-
-    return value;
-}
-
 function pathJoinSafe(rootPath: string, filePath: string) {
    // On Windows, MemoryFileSystem's readdirSync output produces directory entries like 'C:'
    // which then trigger errors if you call statSync for them. Avoid this by detecting drive
@@ -224,16 +216,6 @@ function beginWebpackWatcher(webpackConfig: webpack.Configuration) {
 export function createWebpackDevServer(callback: CreateDevServerCallback, optionsJson: string) {
    const options: CreateDevServerOptions = JSON.parse(optionsJson);

-    // 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.');
-        callback(null, {
-            Port: 0,
-            PublicPaths: []
-        });
-        return;
-    }
-
    // Read the webpack config's export, and normalize it into the more general 'array of configs' format
    let webpackConfigExport: WebpackConfigFileExport = requireNewCopy(options.webpackConfigPath);
    if (webpackConfigExport instanceof Function) {
@@ -275,32 +257,22 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
                    if (!publicPath) {
                        throw new Error('To use the Webpack dev server, you must specify a value for \'publicPath\' on the \'output\' section of your webpack config (for any configuration that targets browsers)');
                    }
-                    const publicPathNoTrailingSlash = removeTrailingSlash(publicPath);
-                    normalizedPublicPaths.push(publicPathNoTrailingSlash);
+                    normalizedPublicPaths.push(removeTrailingSlash(publicPath));

-                    // This is the URL the client will connect to, except that since it's a relative URL
-                    // (no leading slash), Webpack will resolve it against the runtime <base href> URL
-                    // plus it also adds the publicPath
-                    const hmrClientEndpoint = removeLeadingSlash(options.hotModuleReplacementEndpointUrl);
-
-                    // This is the URL inside the Webpack middleware Node server that we'll proxy to.
-                    // We have to prefix with the public path because Webpack will add the publicPath
-                    // when it resolves hmrClientEndpoint as a relative URL.
-                    const hmrServerEndpoint = ensureLeadingSlash(publicPathNoTrailingSlash + options.hotModuleReplacementEndpointUrl);
+                    // Newer versions of Microsoft.AspNetCore.SpaServices will explicitly pass an HMR endpoint URL
+                    // (because it's relative to the app's URL space root, which the client doesn't otherwise know).
+                    // For back-compatibility, fall back on connecting directly to the underlying HMR server (though
+                    // that won't work if the app is hosted on HTTPS because of the mixed-content rule, and we can't
+                    // run the HMR server itself on HTTPS because in general it has no valid cert).
+                    const hmrClientEndpoint = options.hotModuleReplacementEndpointUrl   // The URL that we'll proxy (e.g., /__asp_webpack_hmr)
+                        || `http://localhost:${listener.address().port}/__webpack_hmr`; // Fall back on absolute URL to bypass proxying
+                    const hmrServerEndpoint = options.hotModuleReplacementEndpointUrl
+                        || '/__webpack_hmr';                                            // URL is relative to webpack dev server root

                    // We always overwrite the 'path' option as it needs to match what the .NET side is expecting
                    const hmrClientOptions = options.suppliedOptions.HotModuleReplacementClientOptions || <StringMap<string>>{};
                    hmrClientOptions['path'] = hmrClientEndpoint;

-                    const dynamicPublicPathKey = 'dynamicPublicPath';
-                    if (!(dynamicPublicPathKey in hmrClientOptions)) {
-                        // dynamicPublicPath default to true, so we can work with nonempty pathbases (virtual directories)
-                        hmrClientOptions[dynamicPublicPathKey] = true;
-                    } else {
-                        // ... but you can set it to any other value explicitly if you want (e.g., false)
-                        hmrClientOptions[dynamicPublicPathKey] = JSON.parse(hmrClientOptions[dynamicPublicPathKey]);
-                    }
-
                    attachWebpackDevMiddleware(app, webpackConfig, enableHotModuleReplacement, enableReactHotModuleReplacement, hmrClientOptions, hmrServerEndpoint);
                }
            });
@@ -308,7 +280,11 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
            // Tell the ASP.NET app what addresses we're listening on, so that it can proxy requests here
            callback(null, {
                Port: listener.address().port,
-                PublicPaths: normalizedPublicPaths
+                PublicPaths: normalizedPublicPaths,
+
+                // For back-compatibility with older versions of Microsoft.AspNetCore.SpaServices, in the case where
+                // you have exactly one webpackConfigArray entry. This will be removed soon.
+                PublicPath: normalizedPublicPaths[0]
            });
        } catch (ex) {
            callback(ex.stack, null);
@@ -316,14 +292,6 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
    });
 }

-function removeLeadingSlash(str: string) {
-    if (str.indexOf('/') === 0) {
-        str = str.substring(1);
-    }
-
-    return str;
-}
-
 function removeTrailingSlash(str: string) {
    if (str.lastIndexOf('/') === str.length - 1) {
        str = str.substring(0, str.length - 1);
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackTestPermissions.ts
@@ -1,58 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-const isWindows = /^win/.test(process.platform);
-
-// On Windows, Node (still as of v8.1.3) has an issue whereby, when locating JavaScript modules
-// on disk, it walks up the directory hierarchy to the disk root, testing whether each directory
-// is a symlink or not. This fails with an exception if the process doesn't have permission to
-// read those directories. This is a problem when hosting in full IIS, because in typical cases
-// the process does not have read permission for higher-level directories.
-//
-// NodeServices itself works around this by injecting a patched version of Node's 'lstat' API that
-// suppresses these irrelevant errors during module loads. This covers most scenarios, but isn't
-// enough to make Webpack dev middleware work, because typical Webpack configs use loaders such as
-// 'awesome-typescript-loader', which works by forking a child process to do some of its work. The
-// child process does not get the patched 'lstat', and hence fails. It's an especially bad failure,
-// because the Webpack compiler doesn't even surface the exception - it just never completes the
-// compilation process, causing the application to hang indefinitely.
-//
-// Additionally, Webpack dev middleware will want to write its output to disk, which is also going
-// to fail in a typical IIS process, because you won't have 'write' permission to the app dir by
-// default. We have to actually write the build output to disk (and not purely keep it in the in-
-// memory file system) because the server-side prerendering Node instance is a separate process
-// that only knows about code changes when it sees the compiled files on disk change.
-//
-// In the future, we'll hopefully get Node to fix its underlying issue, and figure out whether VS
-// could give 'write' access to the app dir when launching sites in IIS. But until then, disable
-// Webpack dev middleware if we detect the server process doesn't have the necessary permissions.
-
-export function hasSufficientPermissions() {
-    if (isWindows) {
-        return canReadDirectoryAndAllAncestors(process.cwd());
-    } else {
-        return true;
-    }
-}
-
-function canReadDirectoryAndAllAncestors(dir: string): boolean {
-    if (!canReadDirectory(dir)) {
-        return false;
-    }
-
-    const parentDir = path.resolve(dir, '..');
-    if (parentDir === dir) {
-        // There are no more parent directories - we've reached the disk root
-        return true;
-    } else {
-        return canReadDirectoryAndAllAncestors(parentDir);
-    }
-}
-
-function canReadDirectory(dir: string): boolean {
-    try {
-        fs.statSync(dir);
-        return true;
-    } catch(ex) {
-        return false;
-    }
-}
--- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
@@ -1,6 +1,6 @@
 {
  "name": "domain-task",
-  "version": "3.0.3",
+  "version": "3.0.0",
  "description": "Tracks outstanding operations for a logical thread of execution",
  "main": "index.js",
  "scripts": {
@@ -18,7 +18,6 @@
  },
  "dependencies": {
    "domain-context": "^0.5.1",
-    "is-absolute-url": "^2.1.0",
    "isomorphic-fetch": "^2.2.1"
  },
  "devDependencies": {
--- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/src/fetch.ts
@@ -1,17 +1,11 @@
 import * as url from 'url';
 import * as domain from 'domain';
 import * as domainContext from 'domain-context';
-import * as isAbsoluteUrl from 'is-absolute-url';
 import { baseUrl } from './main';
 const isomorphicFetch = require('isomorphic-fetch');
 const isNode = typeof process === 'object' && process.versions && !!process.versions.node;
-const nodeHttps = isNode && require('https');
-const isHttpsRegex = /^https\:/;

 function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit): Promise<any> {
-    const reqUrl = (req instanceof Request) ? req.url : req;
-    const isRelativeUrl = reqUrl && !isAbsoluteUrl(reqUrl);
-
    // Resolve relative URLs
    if (baseUrl) {
        if (req instanceof Request) {
@@ -31,45 +25,9 @@ function issueRequest(baseUrl: string, req: string | Request, init?: RequestInit
        `);
    }

-    init = applyHttpsAgentPolicy(init, isRelativeUrl, baseUrl);
    return isomorphicFetch(req, init);
 }

-function applyHttpsAgentPolicy(init: RequestInit, isRelativeUrl: boolean, baseUrl: string): RequestInit {
-    // HTTPS is awkward in Node because it uses a built-in list of CAs, rather than recognizing
-    // the OS's system-level CA list. There are dozens of issues filed against Node about this,
-    // but still (as of v8.0.0) no resolution besides manually duplicating your CA config.
-    //
-    // The biggest problem for typical isomorphic-SPA development this causes is that if you're
-    // using a self-signed localhost cert in development, Node won't be able to make API calls
-    // to it (e.g., https://github.com/aspnet/JavaScriptServices/issues/1089). Developers could
-    // fix this by either manually configuring the cert in Node (which is extremely inconvenient,
-    // especially if multiple devs on a team have different self-signed localhost certs), or by
-    // disabling cert verification on their API requests.
-    //
-    // Fortunately, 'domain-task/fetch' knows when you're making a relative-URL request to your
-    // own web server (as opposed to an arbitrary request to anywhere else). In this specific case,
-    // there's no real point in cert verification, since the request never even leaves the machine
-    // so a MitM attack isn't meaningful. So by default, when your code is running in Node and
-    // is making a relative-URL request, *and* if you haven't explicitly configured any option
-    // for 'agent' (which would let you set up other HTTPS-handling policies), then we automatically
-    // disable cert verification for that request.
-    if (isNode && isRelativeUrl) {
-        const isHttps = baseUrl && isHttpsRegex.test(baseUrl);
-        if (isHttps) {
-            const hasAgentConfig = init && ('agent' in init);
-            if (!hasAgentConfig) {
-                const agentForRequest = new (nodeHttps.Agent)({ rejectUnauthorized: false });
-
-                init = init || {};
-                (init as any).agent = agentForRequest;
-            }
-        }
-    }
-
-    return init;
-}
-
 export function fetch(url: string | Request, init?: RequestInit): Promise<any> {
    // As of domain-task 2.0.0, we no longer auto-add the 'fetch' promise to the current domain task list.
    // This is because it's misleading to do so, and can result in race-condition bugs, e.g.,
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.template.config/icon.png
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/AngularSpa.csproj
@@ -5,21 +5,23 @@
    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
  </ItemGroup>
  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
+    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
  </ItemGroup>

  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-preview2-final" />
  </ItemGroup>

  <ItemGroup>
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.browser.ts
@@ -2,22 +2,16 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppModuleShared } from './app.module.shared';
 import { AppComponent } from './components/app/app.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

@NgModule({
    bootstrap: [ AppComponent ],
    imports: [
        BrowserModule,
-        AppModuleShared,
-        BrowserAnimationsModule
+        AppModuleShared
    ],
    providers: [
-        { provide: 'BASE_URL', useFactory: getBaseUrl }
+        { provide: 'ORIGIN_URL', useValue: location.origin }
    ]
 })
 export class AppModule {
 }
-
-export function getBaseUrl() {
-    return document.getElementsByTagName('base')[0].href;
-}
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.server.ts
@@ -2,14 +2,12 @@ import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
 import { AppModuleShared } from './app.module.shared';
 import { AppComponent } from './components/app/app.component';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';

@NgModule({
    bootstrap: [ AppComponent ],
    imports: [
        ServerModule,
-        AppModuleShared,
-        NoopAnimationsModule
+        AppModuleShared
    ]
 })
 export class AppModule {
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/app.module.shared.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.css
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.html
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/app/app.component.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.html
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.spec.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/counter/counter.component.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/fetchdata/fetchdata.component.html
@@ -14,7 +14,7 @@
        </tr>
    </thead>
    <tbody>
-        <tr *ngFor="let forecast of forecasts" [@itemAnim]>
+        <tr *ngFor="let forecast of forecasts">
            <td>{{ forecast.dateFormatted }}</td>
            <td>{{ forecast.temperatureC }}</td>
            <td>{{ forecast.temperatureF }}</td>
--- a/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts
+++ b/templates/AngularSpa/ClientApp/app/components/fetchdata/fetchdata.component.ts
@@ -0,0 +1,23 @@
+import { Component, Inject } from '@angular/core';
+import { Http } from '@angular/http';
+
+@Component({
+    selector: 'fetchdata',
+    templateUrl: './fetchdata.component.html'
+})
+export class FetchDataComponent {
+    public forecasts: WeatherForecast[];
+
+    constructor(http: Http, @Inject('ORIGIN_URL') originUrl: string) {
+        http.get(originUrl + '/api/SampleData/WeatherForecasts').subscribe(result => {
+            this.forecasts = result.json() as WeatherForecast[];
+        });
+    }
+}
+
+interface WeatherForecast {
+    dateFormatted: string;
+    temperatureC: number;
+    temperatureF: number;
+    summary: string;
+}
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.html
@@ -11,6 +11,6 @@
    <li><strong>Client-side navigation</strong>. For example, click <em>Counter</em> then <em>Back</em> to return here.</li>
    <li><strong>Server-side prerendering</strong>. For faster initial loading and improved SEO, your Angular app is prerendered on the server. The resulting HTML is then transferred to the browser where a client-side copy of the app takes over.</li>
    <li><strong>Webpack dev middleware</strong>. In development mode, there's no need to run the <code>webpack</code> build tool. Your client-side resources are dynamically built on demand. Updates are available as soon as you modify any file.</li>
-    <li><strong>Hot module replacement</strong>. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular app will be rebuilt and a new instance injected into the page.</li>
+    <li><strong>Hot module replacement</strong>. In development mode, you don't even need to reload the page after making most changes. Within seconds of saving changes to files, your Angular app will be rebuilt and a new instance injected is into the page.</li>
    <li><strong>Efficient production builds</strong>. In production mode, development-time features are disabled, and the <code>webpack</code> build tool produces minified static CSS and JavaScript files.</li>
 </ul>
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/home/home.component.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.css
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.html
@@ -7,7 +7,7 @@
                <span class='icon-bar'></span>
                <span class='icon-bar'></span>
            </button>
-            <a class='navbar-brand' [routerLink]="['/home']">AngularSpa</a>
+            <a class='navbar-brand' [routerLink]="['/home']">WebApplicationBasic</a>
        </div>
        <div class='clearfix'></div>
        <div class='navbar-collapse collapse'>
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/app/components/navmenu/navmenu.component.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.browser.ts
@@ -5,13 +5,13 @@ import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module.browser';

-if (module.hot) {
-    module.hot.accept();
-    module.hot.dispose(() => {
+if (module['hot']) {
+    module['hot'].accept();
+    module['hot'].dispose(() => {
        // Before restarting the app, we create a new root element and dispose the old one
        const oldRootElem = document.querySelector('app');
        const newRootElem = document.createElement('app');
-        oldRootElem!.parentNode!.insertBefore(newRootElem, oldRootElem);
+        oldRootElem.parentNode.insertBefore(newRootElem, oldRootElem);
        modulePromise.then(appModule => appModule.destroy());
    });
 } else {
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/boot.server.ts
@@ -1,7 +1,6 @@
 import 'reflect-metadata';
 import 'zone.js';
 import 'rxjs/add/operator/first';
-import { APP_BASE_HREF } from '@angular/common';
 import { enableProdMode, ApplicationRef, NgZone, ValueProvider } from '@angular/core';
 import { platformDynamicServer, PlatformState, INITIAL_CONFIG } from '@angular/platform-server';
 import { createServerRenderer, RenderResult } from 'aspnet-prerendering';
@@ -12,17 +11,16 @@ enableProdMode();
 export default createServerRenderer(params => {
    const providers = [
        { provide: INITIAL_CONFIG, useValue: { document: '<app></app>', url: params.url } },
-        { provide: APP_BASE_HREF, useValue: params.baseUrl },
-        { provide: 'BASE_URL', useValue: params.origin + params.baseUrl },
+        { provide: 'ORIGIN_URL', useValue: params.origin }
    ];

    return platformDynamicServer(providers).bootstrapModule(AppModule).then(moduleRef => {
-        const appRef: ApplicationRef = moduleRef.injector.get(ApplicationRef);
+        const appRef = moduleRef.injector.get(ApplicationRef);
        const state = moduleRef.injector.get(PlatformState);
        const zone = moduleRef.injector.get(NgZone);

        return new Promise<RenderResult>((resolve, reject) => {
-            zone.onError.subscribe((errorInfo: any) => reject(errorInfo));
+            zone.onError.subscribe(errorInfo => reject(errorInfo));
            appRef.isStable.first(isStable => isStable).subscribe(() => {
                // Because 'onStable' fires before 'onError', we have to delay slightly before
                // completing the request in case there's an error to report
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/boot-tests.ts
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/ClientApp/test/karma.conf.js
--- a/templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/vue/Controllers/HomeController.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;

-namespace VueSpa.Controllers
+namespace WebApplicationBasic.Controllers
 {
    public class HomeController : Controller
    {
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Controllers/SampleDataController.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;

-namespace AngularSpa.Controllers
+namespace WebApplicationBasic.Controllers
 {
    [Route("api/[controller]")]
    public class SampleDataController : Controller
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Program.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;

-namespace AureliaSpa
+namespace WebApplicationBasic
 {
    public class Program
    {
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Startup.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

-namespace AureliaSpa
+namespace WebApplicationBasic
 {
    public class Startup
    {
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/Views/Home/Index.cshtml
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/Error.cshtml
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - AureliaSpa</title>
+    <title>@ViewData["Title"] - WebApplicationBasic</title>
    <base href="~/" />

    <link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using AureliaSpa
+@using WebApplicationBasic
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Microsoft.AspNetCore.SpaServices
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/Views/_ViewStart.cshtml
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.Development.json
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/appsettings.json
--- a/templates/AngularSpa/package.json
+++ b/templates/AngularSpa/package.json
@@ -0,0 +1,60 @@
+{
+  "name": "WebApplicationBasic",
+  "version": "0.0.0",
+  "scripts": {
+    "test": "karma start ClientApp/test/karma.conf.js"
+  },
+  "dependencies": {
+    "@angular/animations": "4.1.2",
+    "@angular/common": "4.1.2",
+    "@angular/compiler": "4.1.2",
+    "@angular/core": "4.1.2",
+    "@angular/forms": "4.1.2",
+    "@angular/http": "4.1.2",
+    "@angular/platform-browser": "4.1.2",
+    "@angular/platform-browser-dynamic": "4.1.2",
+    "@angular/platform-server": "4.1.2",
+    "@angular/router": "4.1.2",
+    "@types/node": "7.0.18",
+    "angular2-template-loader": "0.6.2",
+    "aspnet-prerendering": "^2.0.5",
+    "aspnet-webpack": "^1.0.29",
+    "awesome-typescript-loader": "3.1.3",
+    "bootstrap": "3.3.7",
+    "css": "2.2.1",
+    "css-loader": "0.28.1",
+    "es6-shim": "0.35.3",
+    "event-source-polyfill": "0.0.9",
+    "expose-loader": "0.7.3",
+    "extract-text-webpack-plugin": "2.1.0",
+    "file-loader": "0.11.1",
+    "html-loader": "0.4.5",
+    "isomorphic-fetch": "2.2.1",
+    "jquery": "3.2.1",
+    "json-loader": "0.5.4",
+    "preboot": "4.5.2",
+    "raw-loader": "0.5.1",
+    "reflect-metadata": "0.1.10",
+    "rxjs": "5.4.0",
+    "style-loader": "0.17.0",
+    "to-string-loader": "1.1.5",
+    "typescript": "2.3.2",
+    "url-loader": "0.5.8",
+    "webpack": "2.5.1",
+    "webpack-hot-middleware": "2.18.0",
+    "webpack-merge": "4.1.0",
+    "zone.js": "0.8.10"
+  },
+  "devDependencies": {
+    "@types/chai": "3.5.2",
+    "@types/jasmine": "2.5.47",
+    "chai": "3.5.0",
+    "jasmine-core": "2.6.1",
+    "karma": "1.7.0",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "2.1.1",
+    "karma-cli": "1.0.1",
+    "karma-jasmine": "1.1.0",
+    "karma-webpack": "2.0.3"
+  }
+}
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/.gitignore
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/tsconfig.json
@@ -1,16 +1,13 @@
 {
  "compilerOptions": {
-    "module": "es2015",
    "moduleResolution": "node",
    "target": "es5",
    "sourceMap": true,
    "experimentalDecorators": true,
    "emitDecoratorMetadata": true,
    "skipDefaultLibCheck": true,
-    "skipLibCheck": true, // Workaround for https://github.com/angular/angular/issues/17863. Remove this if you upgrade to a fixed version of Angular.
-    "strict": true,
    "lib": [ "es6", "dom" ],
-    "types": [ "webpack-env" ]
+    "types": [ "node" ]
  },
  "exclude": [ "bin", "node_modules" ],
  "atom": { "rewriteTsconfig": false }
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.js
@@ -1,7 +1,6 @@
 const path = require('path');
 const webpack = require('webpack');
 const merge = require('webpack-merge');
-const AotPlugin = require('@ngtools/webpack').AotPlugin;
 const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin;

 module.exports = (env) => {
@@ -13,11 +12,11 @@ module.exports = (env) => {
        resolve: { extensions: [ '.js', '.ts' ] },
        output: {
            filename: '[name].js',
-            publicPath: 'dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix
+            publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix
        },
        module: {
            rules: [
-                { test: /\.ts$/, use: isDevBuild ? ['awesome-typescript-loader?silent=true', 'angular2-template-loader', 'angular2-router-loader'] : '@ngtools/webpack' },
+                { test: /\.ts$/, include: /ClientApp/, use: ['awesome-typescript-loader?silent=true', 'angular2-template-loader'] },
                { test: /\.html$/, use: 'html-loader?minimize=false' },
                { test: /\.css$/, use: [ 'to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] },
                { test: /\.(png|jpg|jpeg|gif|svg)$/, use: 'url-loader?limit=25000' }
@@ -29,7 +28,7 @@ module.exports = (env) => {
    // Configuration for client-side bundle suitable for running in browsers
    const clientBundleOutputDir = './wwwroot/dist';
    const clientBundleConfig = merge(sharedConfig, {
-        entry: { 'main-client': './ClientApp/boot.browser.ts' },
+        entry: { 'main-client': './ClientApp/boot-client.ts' },
        output: { path: path.join(__dirname, clientBundleOutputDir) },
        plugins: [
            new webpack.DllReferencePlugin({
@@ -44,19 +43,14 @@ module.exports = (env) => {
            })
        ] : [
            // Plugins that apply in production builds only
-            new webpack.optimize.UglifyJsPlugin(),
-            new AotPlugin({
-                tsConfigPath: './tsconfig.json',
-                entryModule: path.join(__dirname, 'ClientApp/app/app.module.browser#AppModule'),
-                exclude: ['./**/*.server.ts']
-            })
+            new webpack.optimize.UglifyJsPlugin()
        ])
    });

    // Configuration for server-side (prerendering) bundle suitable for running in Node
    const serverBundleConfig = merge(sharedConfig, {
        resolve: { mainFields: ['main'] },
-        entry: { 'main-server': './ClientApp/boot.server.ts' },
+        entry: { 'main-server': './ClientApp/boot-server.ts' },
        plugins: [
            new webpack.DllReferencePlugin({
                context: __dirname,
@@ -64,14 +58,7 @@ module.exports = (env) => {
                sourceType: 'commonjs2',
                name: './vendor'
            })
-        ].concat(isDevBuild ? [] : [
-            // Plugins that apply in production builds only
-            new AotPlugin({
-                tsConfigPath: './tsconfig.json',
-                entryModule: path.join(__dirname, 'ClientApp/app/app.module.server#AppModule'),
-                exclude: ['./**/*.browser.ts']
-            })
-        ]),
+        ],
        output: {
            libraryTarget: 'commonjs',
            path: path.join(__dirname, './ClientApp/dist')
--- a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js
+++ b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/angular/webpack.config.vendor.js
@@ -2,27 +2,6 @@ const path = require('path');
 const webpack = require('webpack');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const merge = require('webpack-merge');
-const treeShakableModules = [
-    '@angular/animations',
-    '@angular/common',
-    '@angular/compiler',
-    '@angular/core',
-    '@angular/forms',
-    '@angular/http',
-    '@angular/platform-browser',
-    '@angular/platform-browser-dynamic',
-    '@angular/router',
-    'zone.js',
-];
-const nonTreeShakableModules = [
-    'bootstrap',
-    'bootstrap/dist/css/bootstrap.css',
-    'es6-promise',
-    'es6-shim',
-    'event-source-polyfill',
-    'jquery',
-];
-const allModules = treeShakableModules.concat(nonTreeShakableModules);

 module.exports = (env) => {
    const extractCSS = new ExtractTextPlugin('vendor.css');
@@ -35,8 +14,28 @@ module.exports = (env) => {
                { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: 'url-loader?limit=100000' }
            ]
        },
+        entry: {
+            vendor: [
+                '@angular/animations',
+                '@angular/common',
+                '@angular/compiler',
+                '@angular/core',
+                '@angular/forms',
+                '@angular/http',
+                '@angular/platform-browser',
+                '@angular/platform-browser-dynamic',
+                '@angular/router',
+                'bootstrap',
+                'bootstrap/dist/css/bootstrap.css',
+                'es6-shim',
+                'es6-promise',
+                'event-source-polyfill',
+                'jquery',
+                'zone.js',
+            ]
+        },
        output: {
-            publicPath: 'dist/',
+            publicPath: '/dist/',
            filename: '[name].js',
            library: '[name]_[hash]'
        },
@@ -49,11 +48,6 @@ module.exports = (env) => {
    };

    const clientBundleConfig = merge(sharedConfig, {
-        entry: {
-            // To keep development builds fast, include all vendor dependencies in the vendor bundle.
-            // But for production builds, leave the tree-shakable ones out so the AOT compiler can produce a smaller bundle.
-            vendor: isDevBuild ? allModules : nonTreeShakableModules
-        },
        output: { path: path.join(__dirname, 'wwwroot', 'dist') },
        module: {
            rules: [
@@ -74,7 +68,6 @@ module.exports = (env) => {
    const serverBundleConfig = merge(sharedConfig, {
        target: 'node',
        resolve: { mainFields: ['main'] },
-        entry: { vendor: allModules.concat(['aspnet-prerendering']) },
        output: {
            path: path.join(__dirname, 'ClientApp', 'dist'),
            libraryTarget: 'commonjs2',
@@ -82,6 +75,7 @@ module.exports = (env) => {
        module: {
            rules: [ { test: /\.css(\?|$)/, use: ['to-string-loader', isDevBuild ? 'css-loader' : 'css-loader?minimize' ] } ]
        },
+        entry: { vendor: ['aspnet-prerendering'] },
        plugins: [
            new webpack.DllPlugin({
                path: path.join(__dirname, 'ClientApp', 'dist', '[name]-manifest.json'),
--- a/templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/knockout/wwwroot/favicon.ico
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/.template.config/icon.png
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/AureliaSpa.csproj
@@ -5,21 +5,23 @@
    <TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-preview2-final" />
  </ItemGroup>
  <ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
+    <PackageReference Include="NETStandard.Library.NETFramework" Version="2.0.0-preview2-25405-01" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="2.0.0-preview2-final" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-preview2-final" />
  </ItemGroup>

  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
  </ItemGroup>

 <!--/-:cnd:noEmit -->
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.css
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.html
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/app/app.ts
--- a/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html
+++ b/templates/Microsoft.AspNetCore.SpaTemplates/aurelia/ClientApp/app/components/counter/counter.html
--- a/Show More
+++ b/Show More