Use AspNetCore.Mvc.RazorPages

This commit is contained in:
Ryan Brandenburg 2017-03-24 13:08:07 -07:00
parent 9ffc745e76
commit b4640f8bb8
27 changed files with 46 additions and 46 deletions

View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method); base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
@class.Name = ClassName.GetClassNameFromPath(filePath); @class.Name = ClassName.GetClassNameFromPath(filePath);
@class.BaseType = "global::Microsoft.AspNetCore.Razor.RazorPage<TModel>"; @class.BaseType = "global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>";
@class.AccessModifier = "public"; @class.AccessModifier = "public";
@namespace.Content = "AspNetCore"; @namespace.Content = "AspNetCore";
method.Name = "ExecuteAsync"; method.Name = "ExecuteAsync";

View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var filePath = codeDocument.GetRelativePath() ?? codeDocument.Source.FileName; var filePath = codeDocument.GetRelativePath() ?? codeDocument.Source.FileName;
base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method); base.OnDocumentStructureCreated(codeDocument, @namespace, @class, method);
@class.BaseType = "global::Microsoft.AspNetCore.RazorPages.Page"; @class.BaseType = "global::Microsoft.AspNetCore.Mvc.RazorPages.Page";
@class.Name = ClassName.GetClassNameFromPath(filePath); @class.Name = ClassName.GetClassNameFromPath(filePath);
@class.AccessModifier = "public"; @class.AccessModifier = "public";
@namespace.Content = "AspNetCore"; @namespace.Content = "AspNetCore";

View File

@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
visitor.Visit(irDocument); visitor.Visit(irDocument);
// Assert // Assert
Assert.Equal("global::Microsoft.AspNetCore.Razor.RazorPage<TModel>", visitor.Class.BaseType); Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("public", visitor.Class.AccessModifier); Assert.Equal("public", visitor.Class.AccessModifier);
Assert.Equal("Test_cshtml", visitor.Class.Name); Assert.Equal("Test_cshtml", visitor.Class.Name);
} }

View File

@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
visitor.Visit(irDocument); visitor.Visit(irDocument);
// Assert // Assert
Assert.Equal("global::Microsoft.AspNetCore.RazorPages.Page", visitor.Class.BaseType); Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
Assert.Equal("public", visitor.Class.AccessModifier); Assert.Equal("public", visitor.Class.AccessModifier);
Assert.Equal("Test_cshtml", visitor.Class.Name); Assert.Equal("Test_cshtml", visitor.Class.Name);
} }

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<dynamic> public class TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,10 +1,10 @@
Source Location: (13:0,13 [4] TestFiles/Input/Basic.cshtml) Source Location: (13:0,13 [4] TestFiles/Input/Basic.cshtml)
|logo| |logo|
Generated Location: (2321:85,13 [4] ) Generated Location: (2325:85,13 [4] )
|logo| |logo|
Source Location: (43:2,5 [21] TestFiles/Input/Basic.cshtml) Source Location: (43:2,5 [21] TestFiles/Input/Basic.cshtml)
|Html.Input("SomeKey")| |Html.Input("SomeKey")|
Generated Location: (2405:90,6 [21] ) Generated Location: (2409:90,6 [21] )
|Html.Input("SomeKey")| |Html.Input("SomeKey")|

View File

@ -33,7 +33,7 @@ using MyNamespace;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<dynamic> public class TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,10 +1,10 @@
Source Location: (28:1,8 [5] TestFiles/Input/Inject.cshtml) Source Location: (28:1,8 [5] TestFiles/Input/Inject.cshtml)
|MyApp| |MyApp|
Generated Location: (2166:84,0 [5] ) Generated Location: (2170:84,0 [5] )
|MyApp| |MyApp|
Source Location: (34:1,14 [14] TestFiles/Input/Inject.cshtml) Source Location: (34:1,14 [14] TestFiles/Input/Inject.cshtml)
|MyPropertyName| |MyPropertyName|
Generated Location: (2268:88,14 [14] ) Generated Location: (2272:88,14 [14] )
|MyPropertyName| |MyPropertyName|

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<MyModel> public class TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,25 +1,25 @@
Source Location: (7:0,7 [7] TestFiles/Input/InjectWithModel.cshtml) Source Location: (7:0,7 [7] TestFiles/Input/InjectWithModel.cshtml)
|MyModel| |MyModel|
Generated Location: (2083:79,0 [7] ) Generated Location: (2087:79,0 [7] )
|MyModel| |MyModel|
Source Location: (24:1,8 [5] TestFiles/Input/InjectWithModel.cshtml) Source Location: (24:1,8 [5] TestFiles/Input/InjectWithModel.cshtml)
|MyApp| |MyApp|
Generated Location: (2173:83,0 [5] ) Generated Location: (2177:83,0 [5] )
|MyApp| |MyApp|
Source Location: (30:1,14 [14] TestFiles/Input/InjectWithModel.cshtml) Source Location: (30:1,14 [14] TestFiles/Input/InjectWithModel.cshtml)
|MyPropertyName| |MyPropertyName|
Generated Location: (2275:87,14 [14] ) Generated Location: (2279:87,14 [14] )
|MyPropertyName| |MyPropertyName|
Source Location: (54:2,8 [17] TestFiles/Input/InjectWithModel.cshtml) Source Location: (54:2,8 [17] TestFiles/Input/InjectWithModel.cshtml)
|MyService<TModel>| |MyService<TModel>|
Generated Location: (2359:91,0 [17] ) Generated Location: (2363:91,0 [17] )
|MyService<TModel>| |MyService<TModel>|
Source Location: (72:2,26 [4] TestFiles/Input/InjectWithModel.cshtml) Source Location: (72:2,26 [4] TestFiles/Input/InjectWithModel.cshtml)
|Html| |Html|
Generated Location: (2473:95,14 [4] ) Generated Location: (2477:95,14 [4] )
|Html| |Html|

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<MyModel> public class TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,45 +1,45 @@
Source Location: (7:0,7 [7] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (7:0,7 [7] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyModel| |MyModel|
Generated Location: (2087:79,0 [7] ) Generated Location: (2091:79,0 [7] )
|MyModel| |MyModel|
Source Location: (24:1,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (24:1,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyApp| |MyApp|
Generated Location: (2177:83,0 [5] ) Generated Location: (2181:83,0 [5] )
|MyApp| |MyApp|
Source Location: (30:1,14 [14] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (30:1,14 [14] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyPropertyName| |MyPropertyName|
Generated Location: (2279:87,14 [14] ) Generated Location: (2283:87,14 [14] )
|MyPropertyName| |MyPropertyName|
Source Location: (58:2,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (58:2,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyService<TModel>| |MyService<TModel>|
Generated Location: (2363:91,0 [17] ) Generated Location: (2367:91,0 [17] )
|MyService<TModel>| |MyService<TModel>|
Source Location: (76:2,26 [4] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (76:2,26 [4] TestFiles/Input/InjectWithSemicolon.cshtml)
|Html| |Html|
Generated Location: (2477:95,14 [4] ) Generated Location: (2481:95,14 [4] )
|Html| |Html|
Source Location: (93:3,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (93:3,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyApp| |MyApp|
Generated Location: (2551:99,0 [5] ) Generated Location: (2555:99,0 [5] )
|MyApp| |MyApp|
Source Location: (99:3,14 [15] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (99:3,14 [15] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyPropertyName2| |MyPropertyName2|
Generated Location: (2653:103,14 [15] ) Generated Location: (2657:103,14 [15] )
|MyPropertyName2| |MyPropertyName2|
Source Location: (129:4,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (129:4,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml)
|MyService<TModel>| |MyService<TModel>|
Generated Location: (2738:107,0 [17] ) Generated Location: (2742:107,0 [17] )
|MyService<TModel>| |MyService<TModel>|
Source Location: (147:4,26 [5] TestFiles/Input/InjectWithSemicolon.cshtml) Source Location: (147:4,26 [5] TestFiles/Input/InjectWithSemicolon.cshtml)
|Html2| |Html2|
Generated Location: (2852:111,14 [5] ) Generated Location: (2856:111,14 [5] )
|Html2| |Html2|

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<System.Collections.IEnumerable> public class TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,5 +1,5 @@
Source Location: (7:0,7 [30] TestFiles/Input/Model.cshtml) Source Location: (7:0,7 [30] TestFiles/Input/Model.cshtml)
|System.Collections.IEnumerable| |System.Collections.IEnumerable|
Generated Location: (2096:79,0 [30] ) Generated Location: (2100:79,0 [30] )
|System.Collections.IEnumerable| |System.Collections.IEnumerable|

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<DateTime> public class TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,20 +1,20 @@
Source Location: (7:0,7 [8] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (7:0,7 [8] TestFiles/Input/ModelExpressionTagHelper.cshtml)
|DateTime| |DateTime|
Generated Location: (2093:79,0 [8] ) Generated Location: (2097:79,0 [8] )
|DateTime| |DateTime|
Source Location: (33:2,14 [108] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (33:2,14 [108] TestFiles/Input/ModelExpressionTagHelper.cshtml)
|Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test| |Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test|
Generated Location: (2214:83,30 [108] ) Generated Location: (2218:83,30 [108] )
|Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test| |Microsoft.AspNetCore.Mvc.Razor.Extensions.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Extensions.Test|
Source Location: (162:4,17 [3] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (162:4,17 [3] TestFiles/Input/ModelExpressionTagHelper.cshtml)
|Now| |Now|
Generated Location: (3108:95,144 [3] ) Generated Location: (3112:95,144 [3] )
|Now| |Now|
Source Location: (189:5,18 [5] TestFiles/Input/ModelExpressionTagHelper.cshtml) Source Location: (189:5,18 [5] TestFiles/Input/ModelExpressionTagHelper.cshtml)
|Model| |Model|
Generated Location: (3508:101,136 [5] ) Generated Location: (3512:101,136 [5] )
|Model| |Model|

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_MultipleModels_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<System.Collections.IEnumerable> public class TestFiles_Input_MultipleModels_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,10 +1,10 @@
Source Location: (7:0,7 [21] TestFiles/Input/MultipleModels.cshtml) Source Location: (7:0,7 [21] TestFiles/Input/MultipleModels.cshtml)
|ThisShouldBeGenerated| |ThisShouldBeGenerated|
Generated Location: (2105:79,0 [21] ) Generated Location: (2109:79,0 [21] )
|ThisShouldBeGenerated| |ThisShouldBeGenerated|
Source Location: (37:1,7 [30] TestFiles/Input/MultipleModels.cshtml) Source Location: (37:1,7 [30] TestFiles/Input/MultipleModels.cshtml)
|System.Collections.IEnumerable| |System.Collections.IEnumerable|
Generated Location: (2209:83,0 [30] ) Generated Location: (2213:83,0 [30] )
|System.Collections.IEnumerable| |System.Collections.IEnumerable|

View File

@ -28,7 +28,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<dynamic> public class TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 219 #pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() { private void __RazorDirectiveTokenHelpers__() {

View File

@ -1,10 +1,10 @@
Source Location: (8:0,8 [19] TestFiles/Input/_ViewImports.cshtml) Source Location: (8:0,8 [19] TestFiles/Input/_ViewImports.cshtml)
|IHtmlHelper<TModel>| |IHtmlHelper<TModel>|
Generated Location: (2080:79,0 [19] ) Generated Location: (2084:79,0 [19] )
|IHtmlHelper<TModel>| |IHtmlHelper<TModel>|
Source Location: (28:0,28 [5] TestFiles/Input/_ViewImports.cshtml) Source Location: (28:0,28 [5] TestFiles/Input/_ViewImports.cshtml)
|Model| |Model|
Generated Location: (2196:83,14 [5] ) Generated Location: (2200:83,14 [5] )
|Model| |Model|

View File

@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<dynamic> public class TestFiles_Input_Basic_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

View File

@ -34,7 +34,7 @@ using MyNamespace;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<dynamic> public class TestFiles_Input_Inject_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

View File

@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<MyModel> public class TestFiles_Input_InjectWithModel_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

View File

@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<MyModel> public class TestFiles_Input_InjectWithSemicolon_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<MyModel>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

View File

@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<System.Collections.IEnumerable> public class TestFiles_Input_Model_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<System.Collections.IEnumerable>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()

View File

@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<DateTime> public class TestFiles_Input_ModelExpressionTagHelper_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<DateTime>
{ {
#line hidden #line hidden
#pragma warning disable 0414 #pragma warning disable 0414

View File

@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
#line default #line default
#line hidden #line hidden
public class TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Razor.RazorPage<dynamic> public class TestFiles_Input__ViewImports_cshtml : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
{ {
#pragma warning disable 1998 #pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync() public async override global::System.Threading.Tasks.Task ExecuteAsync()