From 5fca8da66576608473adc70f6be0e3bab9102f12 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 29 Mar 2017 16:45:37 -0700 Subject: [PATCH] React to razor changes --- .../TestFiles/Output/DesignTime/Basic.cs | 52 ------------------- .../Output/DesignTime/Basic.mappings.txt | 4 +- .../TestFiles/Output/DesignTime/Inject.cs | 52 ------------------- .../Output/DesignTime/Inject.mappings.txt | 4 +- .../Output/DesignTime/InjectWithModel.cs | 52 ------------------- .../DesignTime/InjectWithModel.mappings.txt | 10 ++-- .../Output/DesignTime/InjectWithSemicolon.cs | 52 ------------------- .../InjectWithSemicolon.mappings.txt | 18 +++---- .../TestFiles/Output/DesignTime/Model.cs | 52 ------------------- .../Output/DesignTime/Model.mappings.txt | 2 +- .../DesignTime/ModelExpressionTagHelper.cs | 52 ------------------- .../ModelExpressionTagHelper.mappings.txt | 16 +++--- .../Output/DesignTime/MultipleModels.cs | 52 ------------------- .../DesignTime/MultipleModels.mappings.txt | 4 +- .../Output/DesignTime/_ViewImports.cs | 52 ------------------- .../DesignTime/_ViewImports.mappings.txt | 4 +- 16 files changed, 31 insertions(+), 447 deletions(-) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.cs index fa37322d97..31f86135f8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.cs @@ -32,58 +32,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; { #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); } #pragma warning restore 219 private static System.Object __o = null; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.mappings.txt index 395437131c..f2c7597e01 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Basic.mappings.txt @@ -1,10 +1,10 @@ Source Location: (13:0,13 [4] TestFiles/Input/Basic.cshtml) |logo| -Generated Location: (2691:93,13 [4] ) +Generated Location: (979:41,13 [4] ) |logo| Source Location: (43:2,5 [21] TestFiles/Input/Basic.cshtml) |Html.Input("SomeKey")| -Generated Location: (2775:98,6 [21] ) +Generated Location: (1063:46,6 [21] ) |Html.Input("SomeKey")| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.cs index 944511195e..f771f95ba2 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.cs @@ -38,58 +38,6 @@ using MyNamespace; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { MyApp __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.mappings.txt index 58fbcf5188..100e65d173 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Inject.mappings.txt @@ -1,10 +1,10 @@ Source Location: (28:1,8 [5] TestFiles/Input/Inject.cshtml) |MyApp| -Generated Location: (2536:92,0 [5] ) +Generated Location: (824:40,0 [5] ) |MyApp| Source Location: (34:1,14 [14] TestFiles/Input/Inject.cshtml) |MyPropertyName| -Generated Location: (2638:96,14 [14] ) +Generated Location: (926:44,14 [14] ) |MyPropertyName| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.cs index cd16d5ca90..588bf18452 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.cs @@ -33,58 +33,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { MyModel __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.mappings.txt index 27ff0c5d43..4a880f71c2 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithModel.mappings.txt @@ -1,25 +1,25 @@ Source Location: (7:0,7 [7] TestFiles/Input/InjectWithModel.cshtml) |MyModel| -Generated Location: (2453:87,0 [7] ) +Generated Location: (741:35,0 [7] ) |MyModel| Source Location: (24:1,8 [5] TestFiles/Input/InjectWithModel.cshtml) |MyApp| -Generated Location: (2543:91,0 [5] ) +Generated Location: (831:39,0 [5] ) |MyApp| Source Location: (30:1,14 [14] TestFiles/Input/InjectWithModel.cshtml) |MyPropertyName| -Generated Location: (2645:95,14 [14] ) +Generated Location: (933:43,14 [14] ) |MyPropertyName| Source Location: (54:2,8 [17] TestFiles/Input/InjectWithModel.cshtml) |MyService| -Generated Location: (2729:99,0 [17] ) +Generated Location: (1017:47,0 [17] ) |MyService| Source Location: (72:2,26 [4] TestFiles/Input/InjectWithModel.cshtml) |Html| -Generated Location: (2843:103,14 [4] ) +Generated Location: (1131:51,14 [4] ) |Html| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.cs index 5f95c72be4..93834779ca 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.cs @@ -33,58 +33,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { MyModel __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.mappings.txt index 8663eb24b0..2030a05f31 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/InjectWithSemicolon.mappings.txt @@ -1,45 +1,45 @@ Source Location: (7:0,7 [7] TestFiles/Input/InjectWithSemicolon.cshtml) |MyModel| -Generated Location: (2457:87,0 [7] ) +Generated Location: (745:35,0 [7] ) |MyModel| Source Location: (24:1,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml) |MyApp| -Generated Location: (2547:91,0 [5] ) +Generated Location: (835:39,0 [5] ) |MyApp| Source Location: (30:1,14 [14] TestFiles/Input/InjectWithSemicolon.cshtml) |MyPropertyName| -Generated Location: (2649:95,14 [14] ) +Generated Location: (937:43,14 [14] ) |MyPropertyName| Source Location: (58:2,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml) |MyService| -Generated Location: (2733:99,0 [17] ) +Generated Location: (1021:47,0 [17] ) |MyService| Source Location: (76:2,26 [4] TestFiles/Input/InjectWithSemicolon.cshtml) |Html| -Generated Location: (2847:103,14 [4] ) +Generated Location: (1135:51,14 [4] ) |Html| Source Location: (93:3,8 [5] TestFiles/Input/InjectWithSemicolon.cshtml) |MyApp| -Generated Location: (2921:107,0 [5] ) +Generated Location: (1209:55,0 [5] ) |MyApp| Source Location: (99:3,14 [15] TestFiles/Input/InjectWithSemicolon.cshtml) |MyPropertyName2| -Generated Location: (3023:111,14 [15] ) +Generated Location: (1311:59,14 [15] ) |MyPropertyName2| Source Location: (129:4,8 [17] TestFiles/Input/InjectWithSemicolon.cshtml) |MyService| -Generated Location: (3108:115,0 [17] ) +Generated Location: (1396:63,0 [17] ) |MyService| Source Location: (147:4,26 [5] TestFiles/Input/InjectWithSemicolon.cshtml) |Html2| -Generated Location: (3222:119,14 [5] ) +Generated Location: (1510:67,14 [5] ) |Html2| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.cs index 265c7288ab..435a45f7b5 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.cs @@ -33,58 +33,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { System.Collections.IEnumerable __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.mappings.txt index 095b2cb70b..d8293c7986 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/Model.mappings.txt @@ -1,5 +1,5 @@ Source Location: (7:0,7 [30] TestFiles/Input/Model.cshtml) |System.Collections.IEnumerable| -Generated Location: (2466:87,0 [30] ) +Generated Location: (754:35,0 [30] ) |System.Collections.IEnumerable| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs index b4974b77be..36e089e011 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.cs @@ -33,58 +33,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { DateTime __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.mappings.txt index 98f9ca0e3d..4d0526f06f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/ModelExpressionTagHelper.mappings.txt @@ -1,40 +1,40 @@ Source Location: (7:0,7 [8] TestFiles/Input/ModelExpressionTagHelper.cshtml) |DateTime| -Generated Location: (2463:87,0 [8] ) +Generated Location: (751:35,0 [8] ) |DateTime| Source Location: (33:2,14 [91] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Microsoft.AspNetCore.Mvc.Razor.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Host.Test| -Generated Location: (2584:91,30 [91] ) +Generated Location: (872:39,30 [91] ) |Microsoft.AspNetCore.Mvc.Razor.InputTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Host.Test| Source Location: (140:3,14 [102] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Microsoft.AspNetCore.Mvc.Razor.DictionaryPrefixTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Host.Test| -Generated Location: (2769:95,30 [102] ) +Generated Location: (1057:43,30 [102] ) |Microsoft.AspNetCore.Mvc.Razor.DictionaryPrefixTestTagHelper, Microsoft.AspNetCore.Mvc.Razor.Host.Test| Source Location: (263:5,17 [3] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Now| -Generated Location: (3759:108,133 [3] ) +Generated Location: (2047:56,133 [3] ) |Now| Source Location: (290:6,18 [5] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Model| -Generated Location: (4126:114,125 [5] ) +Generated Location: (2414:62,125 [5] ) |Model| Source Location: (322:8,19 [5] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Model| -Generated Location: (4545:120,153 [5] ) +Generated Location: (2833:68,153 [5] ) |Model| Source Location: (357:9,19 [4] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Hour| -Generated Location: (4973:126,161 [4] ) +Generated Location: (3261:74,161 [4] ) |Hour| Source Location: (378:9,40 [6] TestFiles/Input/ModelExpressionTagHelper.cshtml) |Minute| -Generated Location: (5235:131,163 [6] ) +Generated Location: (3523:79,163 [6] ) |Minute| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.cs index 317625163e..baaeb0842e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.cs @@ -33,58 +33,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { ThisShouldBeGenerated __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.mappings.txt index acb55a2032..7ae5da4684 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/MultipleModels.mappings.txt @@ -1,10 +1,10 @@ Source Location: (7:0,7 [21] TestFiles/Input/MultipleModels.cshtml) |ThisShouldBeGenerated| -Generated Location: (2475:87,0 [21] ) +Generated Location: (763:35,0 [21] ) |ThisShouldBeGenerated| Source Location: (37:1,7 [30] TestFiles/Input/MultipleModels.cshtml) |System.Collections.IEnumerable| -Generated Location: (2579:91,0 [30] ) +Generated Location: (867:39,0 [30] ) |System.Collections.IEnumerable| diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.cs index 0b863511e1..0a61b4636c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.cs @@ -33,58 +33,6 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures; #pragma warning disable 219 private void __RazorDirectiveTokenHelpers__() { ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Html = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Json = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Component = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.IUrlHelper __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object Url = null; - } - ))(); - ((System.Action)(() => { -global::Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider __typeHelper = null; - } - ))(); - ((System.Action)(() => { -System.Object ModelExpressionProvider = null; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.HeadTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { -System.Object __typeHelper = "Microsoft.AspNetCore.Mvc.Razor.TagHelpers.BodyTagHelper, Microsoft.AspNetCore.Mvc.Razor"; - } - ))(); - ((System.Action)(() => { IHtmlHelper __typeHelper = null; } ))(); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.mappings.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.mappings.txt index 97c297ced8..5c7b32d060 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.mappings.txt +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/TestFiles/Output/DesignTime/_ViewImports.mappings.txt @@ -1,10 +1,10 @@ Source Location: (8:0,8 [19] TestFiles/Input/_ViewImports.cshtml) |IHtmlHelper| -Generated Location: (2450:87,0 [19] ) +Generated Location: (738:35,0 [19] ) |IHtmlHelper| Source Location: (28:0,28 [5] TestFiles/Input/_ViewImports.cshtml) |Model| -Generated Location: (2566:91,14 [5] ) +Generated Location: (854:39,14 [5] ) |Model|