diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/IMvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/IMvcRazorHost.cs index 3bf4a0975b..023479e13c 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/IMvcRazorHost.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/IMvcRazorHost.cs @@ -8,6 +8,6 @@ namespace Microsoft.AspNet.Mvc.Razor { public interface IMvcRazorHost { - GeneratorResults GenerateCode(string rootNamespace, string rootRelativePath, Stream inputStream); + GeneratorResults GenerateCode(string rootRelativePath, Stream inputStream); } } diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs index 4f744c1310..478d2284d1 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs @@ -11,6 +11,8 @@ namespace Microsoft.AspNet.Mvc.Razor { public class MvcRazorHost : RazorEngineHost, IMvcRazorHost { + private const string ViewNamespace = "ASP"; + private static readonly string[] _defaultNamespaces = new[] { "System", @@ -53,13 +55,13 @@ namespace Microsoft.AspNet.Mvc.Razor } } - public GeneratorResults GenerateCode(string rootNamespace, string rootRelativePath, Stream inputStream) + public GeneratorResults GenerateCode(string rootRelativePath, Stream inputStream) { string className = ParserHelpers.SanitizeClassName(rootRelativePath); using (var reader = new StreamReader(inputStream)) { var engine = new RazorTemplateEngine(this); - return engine.GenerateCode(reader, className, rootNamespace, rootRelativePath); + return engine.GenerateCode(reader, className, ViewNamespace, rootRelativePath); } } diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs index d10bb81edf..c5fff474ec 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs @@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Mvc.Razor { Contract.Assert(file.PhysicalPath.StartsWith(_appRoot, StringComparison.OrdinalIgnoreCase)); var rootRelativePath = file.PhysicalPath.Substring(_appRoot.Length); - results = _razorHost.GenerateCode(_environment.ApplicationName, rootRelativePath, inputStream); + results = _razorHost.GenerateCode(rootRelativePath, inputStream); } if (!results.Success) diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs index e6aa716e59..c64bb3e077 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test env.SetupGet(e => e.ApplicationName).Returns("MyTestApplication"); env.SetupGet(e => e.ApplicationBasePath).Returns(appPath); var host = new Mock(); - host.Setup(h => h.GenerateCode("MyTestApplication", @"views\index\home.cshtml", It.IsAny())) + host.Setup(h => h.GenerateCode(@"views\index\home.cshtml", It.IsAny())) .Returns(new GeneratorResults(new Block(new BlockBuilder { Type = BlockType.Comment }), new RazorError[0], new CodeBuilderResult("", new LineMapping[0]))) .Verifiable(); var compiler = new Mock();