Merge branch 'release/2.1' into release/2.2

# Conflicts:
#	tools-local/prebuilt-baseline-online.xml

Author: dagood

.gitmodules

@@ -66,3 +66,6 @@
 [submodule "src/linker"]
 	path = src/linker
 	url = https://github.com/mono/linker.git
+[submodule "src/aspnet-razor"]
+	path = src/aspnet-razor
+	url = https://github.com/aspnet/Razor

patches/aspnet-razor/0001-Remove-Internal.AspNetCore.Sdk-avoid-prebuilt.patch

@@ -0,0 +1,25 @@
+From c5c693544b006014e6dfd7e8161e091a1ff19ca5 Mon Sep 17 00:00:00 2001
+From: Davis Goodin <dagood@microsoft.com>
+Date: Wed, 24 Oct 2018 12:27:13 -0500
+Subject: [PATCH] Remove Internal.AspNetCore.Sdk: avoid prebuilt
+
+Internal.AspNetCore.Sdk is not used for the very specific build source-build needs to perform. Remove it to avoid adding prebuilt packages.
+---
+ Directory.Build.props | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 8260b6f3..6a18283d 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -20,7 +20,6 @@
+   </PropertyGroup>
+ 
+   <ItemGroup>
+-    <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
+   </ItemGroup>
+ 
+ </Project>
+-- 
+2.17.1.windows.2
+

repos/aspnet-razor.proj

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
+  <PropertyGroup>
+    <RazorSdkProjectDir>$(ProjectDirectory)src/Microsoft.NET.Sdk.Razor/</RazorSdkProjectDir>
+    <RazorSdkProjectFile>$(RazorSdkProjectDir)Microsoft.NET.Sdk.Razor.csproj</RazorSdkProjectFile>
+
+    <BuildNumber>30932</BuildNumber>
+
+    <BuildCommandArgs>pack</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) $(RazorSdkProjectFile)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:IsFinalBuild=$(UseStableVersions)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:BuildNumber=$(BuildNumber)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /bl</BuildCommandArgs>
+
+    <BuildCommand>$(DotnetToolCommand) $(BuildCommandArgs)</BuildCommand>
+
+    <PackagesOutput>$(RazorSdkProjectDir)bin/$(Configuration)/</PackagesOutput>
+
+    <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
+
+    <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
+</Project>

repos/cli.proj

@@ -58,6 +58,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="application-insights" />
+    <RepositoryReference Include="aspnet-razor" />
     <RepositoryReference Include="cli-migrate" />
     <RepositoryReference Include="clicommandlineparser" />
     <RepositoryReference Include="core-setup" />

repos/known-good.proj

@@ -12,6 +12,7 @@
 
     <!-- Tier 1 -->
     <RepositoryReference Include="application-insights" />
+    <RepositoryReference Include="aspnet-razor" />
     <RepositoryReference Include="common" />
     <RepositoryReference Include="netcorecli-fsc" />
     <RepositoryReference Include="newtonsoft-json" />

src/aspnet-razor

@@ -2,6 +2,7 @@
   <CreatedByRid>centos.7-x64</CreatedByRid>
   <ProjectDirectories>
     <Dir>src/application-insights/</Dir>
+    <Dir>src/aspnet-razor/</Dir>
     <Dir>src/cli-migrate/</Dir>
     <Dir>src/cli/</Dir>
     <Dir>src/clicommandlineparser/</Dir>