From 5ad1a27f6e89689f4eebcc51b31337107d3396b0 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 28 Oct 2015 15:51:36 -0700 Subject: [PATCH] React to aspnet/Razor#580. - Updated `MvcRazorHost` to configure `Type` full names. - Updated code generation tests. --- .../MvcRazorHost.cs | 2 +- .../MvcRazorHostTest.cs | 4 ++-- .../DesignTime/ModelExpressionTagHelper.cs | 6 ++--- .../Runtime/ModelExpressionTagHelper.cs | 22 +++++++++---------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs index 0d9ce8c857..8ec53daa49 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs @@ -95,7 +95,7 @@ namespace Microsoft.AspNet.Mvc.Razor ScopeManagerBeginMethodName = nameof(TagHelperScopeManager.Begin), ScopeManagerEndMethodName = nameof(TagHelperScopeManager.End), - TagHelperContentTypeName = nameof(TagHelperContent), + TagHelperContentTypeName = typeof(TagHelperContent).FullName, // Can't use nameof because RazorPage is not accessible here. CreateTagHelperMethodName = "CreateTagHelper", diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs index 9684cb4058..683944de2a 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs @@ -148,7 +148,7 @@ namespace Microsoft.AspNet.Mvc.Razor documentAbsoluteIndex: 139, documentLineIndex: 4, documentCharacterIndex: 17, - generatedAbsoluteIndex: 2284, + generatedAbsoluteIndex: 2300, generatedLineIndex: 53, generatedCharacterIndex: 95, contentLength: 3), @@ -156,7 +156,7 @@ namespace Microsoft.AspNet.Mvc.Razor documentAbsoluteIndex: 166, documentLineIndex: 5, documentCharacterIndex: 18, - generatedAbsoluteIndex: 2597, + generatedAbsoluteIndex: 2621, generatedLineIndex: 59, generatedCharacterIndex: 87, contentLength: 5), diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs index ee349a2b1c..68074634b1 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs @@ -29,7 +29,7 @@ var __modelHelper = default(DateTime); #pragma warning restore 219 } #line hidden - private Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null; + private global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null; #line hidden public ASPV_testfiles_input_modelexpressiontaghelper_cshtml() { @@ -49,13 +49,13 @@ var __modelHelper = default(DateTime); #pragma warning disable 1998 public override async Task ExecuteAsync() { - __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); + __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); #line 5 "testfiles/input/modelexpressiontaghelper.cshtml" __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now); #line default #line hidden - __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); + __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); #line 6 "testfiles/input/modelexpressiontaghelper.cshtml" __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => Model); diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs index f161a0a5dc..61ba3f406b 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs @@ -1,8 +1,6 @@ #pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fd1207a6d248f0e3aeabecaa338dca0ffb99d10d" namespace Asp { - using Microsoft.AspNet.Razor.TagHelpers; - using Microsoft.AspNet.Razor.Runtime.TagHelpers; using System; using System.Linq; using System.Collections.Generic; @@ -14,12 +12,12 @@ namespace Asp { #line hidden #pragma warning disable 0414 - private TagHelperContent __tagHelperStringValueBuffer = null; + private global::Microsoft.AspNet.Razor.TagHelpers.TagHelperContent __tagHelperStringValueBuffer = null; #pragma warning restore 0414 - private Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext = null; - private Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = null; - private Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager = new Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager(); - private Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = null; + private global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager(); + private global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null; #line hidden public ASPV_TestFiles_Input_ModelExpressionTagHelper_cshtml() { @@ -39,14 +37,14 @@ namespace Asp #pragma warning disable 1998 public override async Task ExecuteAsync() { - __tagHelperRunner = __tagHelperRunner ?? new Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner(); + __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner(); BeginContext(120, 2, true); WriteLiteral("\r\n"); EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); + __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper); #line 5 "TestFiles/Input/ModelExpressionTagHelper.cshtml" __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now); @@ -62,10 +60,10 @@ __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__mo BeginContext(146, 2, true); WriteLiteral("\r\n"); EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", TagMode.SelfClosing, "test", async() => { + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { } , StartTagHelperWritingScope, EndTagHelperWritingScope); - __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); + __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper); #line 6 "TestFiles/Input/ModelExpressionTagHelper.cshtml" __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => Model);