Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit 5ad1a27

Browse files
committed
- Updated `MvcRazorHost` to configure `Type` full names. - Updated code generation tests.
1 parent d361c3a commit 5ad1a27

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ internal MvcRazorHost(IChunkTreeCache chunkTreeCache, RazorPathNormalizer pathNo
9595
ScopeManagerBeginMethodName = nameof(TagHelperScopeManager.Begin),
9696
ScopeManagerEndMethodName = nameof(TagHelperScopeManager.End),
9797

98-
TagHelperContentTypeName = nameof(TagHelperContent),
98+
TagHelperContentTypeName = typeof(TagHelperContent).FullName,
9999

100100
// Can't use nameof because RazorPage is not accessible here.
101101
CreateTagHelperMethodName = "CreateTagHelper",

test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ public void MvcRazorHost_GeneratesTagHelperModelExpressionCode_DesignTime()
148148
documentAbsoluteIndex: 139,
149149
documentLineIndex: 4,
150150
documentCharacterIndex: 17,
151-
generatedAbsoluteIndex: 2284,
151+
generatedAbsoluteIndex: 2300,
152152
generatedLineIndex: 53,
153153
generatedCharacterIndex: 95,
154154
contentLength: 3),
155155
BuildLineMapping(
156156
documentAbsoluteIndex: 166,
157157
documentLineIndex: 5,
158158
documentCharacterIndex: 18,
159-
generatedAbsoluteIndex: 2597,
159+
generatedAbsoluteIndex: 2621,
160160
generatedLineIndex: 59,
161161
generatedCharacterIndex: 87,
162162
contentLength: 5),

test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private void @__RazorDesignTimeHelpers__()
2929
#pragma warning restore 219
3030
}
3131
#line hidden
32-
private Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null;
32+
private global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null;
3333
#line hidden
3434
public ASPV_testfiles_input_modelexpressiontaghelper_cshtml()
3535
{
@@ -49,13 +49,13 @@ public ASPV_testfiles_input_modelexpressiontaghelper_cshtml()
4949
#pragma warning disable 1998
5050
public override async Task ExecuteAsync()
5151
{
52-
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
52+
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
5353
#line 5 "testfiles/input/modelexpressiontaghelper.cshtml"
5454
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
5555

5656
#line default
5757
#line hidden
58-
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
58+
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
5959
#line 6 "testfiles/input/modelexpressiontaghelper.cshtml"
6060
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => Model);
6161

test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "fd1207a6d248f0e3aeabecaa338dca0ffb99d10d"
22
namespace Asp
33
{
4-
using Microsoft.AspNet.Razor.TagHelpers;
5-
using Microsoft.AspNet.Razor.Runtime.TagHelpers;
64
using System;
75
using System.Linq;
86
using System.Collections.Generic;
@@ -14,12 +12,12 @@ public class ASPV_TestFiles_Input_ModelExpressionTagHelper_cshtml : Microsoft.As
1412
{
1513
#line hidden
1614
#pragma warning disable 0414
17-
private TagHelperContent __tagHelperStringValueBuffer = null;
15+
private global::Microsoft.AspNet.Razor.TagHelpers.TagHelperContent __tagHelperStringValueBuffer = null;
1816
#pragma warning restore 0414
19-
private Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext = null;
20-
private Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = null;
21-
private Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager = new Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager();
22-
private Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null;
17+
private global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperExecutionContext __tagHelperExecutionContext = null;
18+
private global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner __tagHelperRunner = null;
19+
private global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperScopeManager();
20+
private global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = null;
2321
#line hidden
2422
public ASPV_TestFiles_Input_ModelExpressionTagHelper_cshtml()
2523
{
@@ -39,14 +37,14 @@ public ASPV_TestFiles_Input_ModelExpressionTagHelper_cshtml()
3937
#pragma warning disable 1998
4038
public override async Task ExecuteAsync()
4139
{
42-
__tagHelperRunner = __tagHelperRunner ?? new Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner();
40+
__tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelpers.TagHelperRunner();
4341
BeginContext(120, 2, true);
4442
WriteLiteral("\r\n");
4543
EndContext();
46-
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", TagMode.SelfClosing, "test", async() => {
44+
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
4745
}
4846
, StartTagHelperWritingScope, EndTagHelperWritingScope);
49-
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
47+
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
5048
__tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper);
5149
#line 5 "TestFiles/Input/ModelExpressionTagHelper.cshtml"
5250
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
@@ -62,10 +60,10 @@ public override async Task ExecuteAsync()
6260
BeginContext(146, 2, true);
6361
WriteLiteral("\r\n");
6462
EndContext();
65-
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", TagMode.SelfClosing, "test", async() => {
63+
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
6664
}
6765
, StartTagHelperWritingScope, EndTagHelperWritingScope);
68-
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
66+
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<global::Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
6967
__tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper);
7068
#line 6 "TestFiles/Input/ModelExpressionTagHelper.cshtml"
7169
__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => Model);

0 commit comments

Comments
 (0)