From 88fa650138a775b9dfa101c419d638586fb600d3 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 14 Sep 2016 15:30:23 -0700 Subject: [PATCH] Reacting to Mvc changes --- .../Internal/PrecompileRunCommand.cs | 2 +- .../Internal/ViewInfoContainerCodeGenerator.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/PrecompileRunCommand.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/PrecompileRunCommand.cs index 2f776d041c..03922fd1af 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/PrecompileRunCommand.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/PrecompileRunCommand.cs @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design.Internal return 1; } - var precompileAssemblyName = $"{ApplicationNameOption.Value()}{AssemblyPart.PrecompiledViewsAssemblySuffix}"; + var precompileAssemblyName = $"{ApplicationNameOption.Value()}{ViewsFeatureProvider.PrecompiledViewsAssemblySuffix}"; var compilation = CompileViews(results, precompileAssemblyName); var resources = GetResources(results); diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs index 00619f6ada..2e1973d7fc 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design/Internal/ViewInfoContainerCodeGenerator.cs @@ -7,6 +7,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; using Microsoft.AspNetCore.Mvc.ApplicationParts; +using Microsoft.AspNetCore.Mvc.Razor.Compilation; using Microsoft.AspNetCore.Mvc.Razor.Internal; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; @@ -39,11 +40,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Precompilation.Design.Internal } var factoryContent = $@" -namespace {AssemblyPart.ViewInfoContainerNamespace} +namespace {ViewsFeatureProvider.ViewInfoContainerNamespace} {{ - public class {AssemblyPart.ViewInfoContainerTypeName} : global::{typeof(ViewInfoContainer).FullName} + public class {ViewsFeatureProvider.ViewInfoContainerTypeName} : global::{typeof(ViewInfoContainer).FullName} {{ - public {AssemblyPart.ViewInfoContainerTypeName}() : base(new[] + public {ViewsFeatureProvider.ViewInfoContainerTypeName}() : base(new[] {{ {precompiledViewsArray} }})