From dfe576f4fa235324908e8b098fac0bf5fab1f62d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <rynowak@microsoft.com>
Date: Wed, 21 Feb 2018 16:11:24 -0800
Subject: [PATCH] Add new Razor bits

- Adds the aspnetcore-dev feed as a package source
- Updates Razor to a relatively new build
- Fixes a few issues encountered with new bits
---
 Directory.Build.props                                     | 5 +++++
 nuget.config                                              | 8 ++++++++
 .../Core/RazorCompilation/RazorCompiler.cs                | 2 +-
 .../BlazorCodeTarget.cs                                   | 6 ++----
 .../Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj   | 4 ++--
 .../Microsoft.VisualStudio.LanguageServices.Blazor.csproj | 4 ++++
 6 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 Directory.Build.props
 create mode 100644 nuget.config

diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000000..b05fa4fafe
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <RazorPackageVersion>2.1.0-preview2-30159</RazorPackageVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000000..652928f5e4
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <packageSources>
+    <clear />
+    <add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+ </packageSources>
+</configuration>
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs
index b573bdcf00..ce3d4cb726 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Build/Core/RazorCompilation/RazorCompiler.cs
@@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Core.RazorCompilation
                 var engine = new BlazorRazorEngine();
                 var blazorTemplateEngine = new BlazorTemplateEngine(
                     engine.Engine,
-                    RazorProject.Create(inputRootPath));
+                    RazorProjectFileSystem.Create(inputRootPath));
                 var codeDoc = blazorTemplateEngine.CreateCodeDocument(
                     new BlazorProjectItem(inputRootPath, inputFilePath, inputFileContents));
                 codeDoc.Items[BlazorCodeDocItems.Namespace] = combinedNamespace;
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorCodeTarget.cs b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorCodeTarget.cs
index a4fe680d67..c2f2557d6d 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorCodeTarget.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/BlazorCodeTarget.cs
@@ -14,10 +14,8 @@ namespace Microsoft.AspNetCore.Blazor.Razor
         public override IntermediateNodeWriter CreateNodeWriter()
             => new BlazorIntermediateNodeWriter();
 
-        public override TExtension GetExtension<TExtension>()
-            => throw new NotImplementedException();
+        public override TExtension GetExtension<TExtension>() => null;
 
-        public override bool HasExtension<TExtension>()
-            => throw new NotImplementedException();
+        public override bool HasExtension<TExtension>() => false;
     }
 }
diff --git a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj
index 1c876ecf1c..afcdc8d1dd 100644
--- a/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Razor.Extensions/Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="2.0.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(RazorPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(RazorPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj b/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj
index ad44878f0a..9b3ca0d3e8 100644
--- a/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj
+++ b/tooling/Microsoft.VisualStudio.LanguageServices.Blazor/Microsoft.VisualStudio.LanguageServices.Blazor.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="$(RazorPackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\anglesharp\AngleSharpBuilder\AngleSharpBuilder.csproj">
       <Name>AngleSharpBuilder</Name>