Skip to content

Commit f35b6c6

Browse files
chsienkichsienki
authored
Change UseConsolidatedMvcViews to default to true (#10795)
* Change UseConsolidatedMvcViews to default to true * Update baselines * Update LSP test
1 parent 8e11180 commit f35b6c6

File tree

572 files changed

+1780
-1780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

572 files changed

+1780
-1780
lines changed

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// <auto-generated/>
22
#pragma warning disable 1591
3-
namespace AspNetCore
3+
namespace AspNetCoreGeneratedDocument
44
{
55
#line default
66
using TModel = global::System.Object;
@@ -34,7 +34,7 @@ namespace AspNetCore
3434
[global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml")]
3535
[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
3636
#nullable restore
37-
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
37+
internal sealed class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
3838
#nullable disable
3939
{
4040
#pragma warning disable 219

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.ir.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Document -
2-
NamespaceDeclaration - - AspNetCore
2+
NamespaceDeclaration - - AspNetCoreGeneratedDocument
33
UsingDirective - - TModel = global::System.Object
44
UsingDirective - (24:1,1 [40] ) - global::System.Collections.Generic
55
UsingDirective - (67:2,1 [25] ) - global::System.Linq
@@ -14,7 +14,7 @@
1414
IntermediateToken - (11:0,11 [14] AttributeDirectiveWithViewImports.cshtml) - CSharp - [Serializable]
1515
RazorCompiledItemMetadataAttribute -
1616
CreateNewOnMetadataUpdateAttribute -
17-
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
17+
ClassDeclaration - - internal sealed - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
1818
DesignTimeDirective -
1919
DirectiveToken - (287:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
2020
DirectiveToken - (350:7,71 [4] ) - Html

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.mappings.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Source Location: (11:0,11 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml)
22
|[Serializable]|
3-
Generated Location: (903:28,11 [14] )
3+
Generated Location: (920:28,11 [14] )
44
|[Serializable]|
55

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.codegen.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9a963ab17d89a7739e64cf5d94e1dc35aa41cf1004222067bca2328b832666d9"
22
// <auto-generated/>
33
#pragma warning disable 1591
4-
[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml")]
5-
namespace AspNetCore
4+
[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCoreGeneratedDocument.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml")]
5+
namespace AspNetCoreGeneratedDocument
66
{
77
#line default
88
using global::System.Collections.Generic;
@@ -40,7 +40,7 @@ namespace AspNetCore
4040
[global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports.cshtml")]
4141
[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
4242
#nullable restore
43-
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
43+
internal sealed class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
4444
#nullable disable
4545
{
4646
#pragma warning disable 1998

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_Runtime.ir.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Document -
22
RazorCompiledItemAttribute -
3-
NamespaceDeclaration - - AspNetCore
3+
NamespaceDeclaration - - AspNetCoreGeneratedDocument
44
UsingDirective - (24:1,1 [42] ) - global::System.Collections.Generic
55
UsingDirective - (67:2,1 [27] ) - global::System.Linq
66
UsingDirective - (95:3,1 [38] ) - global::System.Threading.Tasks
@@ -16,7 +16,7 @@
1616
RazorSourceChecksumAttribute -
1717
RazorCompiledItemMetadataAttribute -
1818
CreateNewOnMetadataUpdateAttribute -
19-
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
19+
ClassDeclaration - - internal sealed - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_AttributeDirectiveWithViewImports - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
2020
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
2121
Inject -
2222
Inject -

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// <auto-generated/>
22
#pragma warning disable 1591
3-
namespace AspNetCore
3+
namespace AspNetCoreGeneratedDocument
44
{
55
#line default
66
using TModel = global::System.Object;
@@ -16,7 +16,7 @@ namespace AspNetCore
1616
[global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
1717
[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
1818
#nullable restore
19-
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
19+
internal sealed class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
2020
#nullable disable
2121
{
2222
#pragma warning disable 219

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.ir.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Document -
2-
NamespaceDeclaration - - AspNetCore
2+
NamespaceDeclaration - - AspNetCoreGeneratedDocument
33
UsingDirective - - TModel = global::System.Object
44
UsingDirective - (1:0,1 [20] ) - global::System
55
UsingDirective - (24:1,1 [40] ) - global::System.Collections.Generic
@@ -10,7 +10,7 @@
1010
UsingDirective - (226:6,1 [51] ) - global::Microsoft.AspNetCore.Mvc.ViewFeatures
1111
RazorCompiledItemMetadataAttribute -
1212
CreateNewOnMetadataUpdateAttribute -
13-
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
13+
ClassDeclaration - - internal sealed - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
1414
DesignTimeDirective -
1515
DirectiveToken - (287:7,8 [62] ) - global::Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper<TModel>
1616
DirectiveToken - (350:7,71 [4] ) - Html

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.mappings.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
Source Location: (13:0,13 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
22
|this.ToString()|
3-
Generated Location: (1437:33,13 [15] )
3+
Generated Location: (1463:33,13 [15] )
44
|this.ToString()|
55

66
Source Location: (54:2,5 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
77
|string.Format("{0}", "Hello")|
8-
Generated Location: (1611:40,6 [29] )
8+
Generated Location: (1637:40,6 [29] )
99
|string.Format("{0}", "Hello")|
1010

1111
Source Location: (95:4,2 [25] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
1212
|
1313
var cls = "foo";
1414
|
15-
Generated Location: (1795:47,2 [25] )
15+
Generated Location: (1821:47,2 [25] )
1616
|
1717
var cls = "foo";
1818
|
1919

2020
Source Location: (134:7,11 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
2121
|if(cls != null) { |
22-
Generated Location: (1981:55,11 [18] )
22+
Generated Location: (2007:55,11 [18] )
2323
|if(cls != null) { |
2424

2525
Source Location: (153:7,30 [3] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
2626
|cls|
27-
Generated Location: (2181:62,30 [3] )
27+
Generated Location: (2207:62,30 [3] )
2828
|cls|
2929

3030
Source Location: (156:7,33 [2] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml)
3131
| }|
32-
Generated Location: (2370:69,33 [2] )
32+
Generated Location: (2396:69,33 [2] )
3333
| }|
3434

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma checksum "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "3b732a30f94dc763cbd74d150cca70825dbddec2bddfba4e4d82547d5ced9a82"
22
// <auto-generated/>
33
#pragma warning disable 1591
4-
[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCore.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
5-
namespace AspNetCore
4+
[assembly: global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemAttribute(typeof(AspNetCoreGeneratedDocument.TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic), @"mvc.1.0.view", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
5+
namespace AspNetCoreGeneratedDocument
66
{
77
#line default
88
using global::System;
@@ -18,7 +18,7 @@ namespace AspNetCore
1818
[global::Microsoft.AspNetCore.Razor.Hosting.RazorCompiledItemMetadataAttribute("Identifier", "/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml")]
1919
[global::System.Runtime.CompilerServices.CreateNewOnMetadataUpdateAttribute]
2020
#nullable restore
21-
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
21+
internal sealed class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic : global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic>
2222
#nullable disable
2323
{
2424
#pragma warning disable 1998

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Document -
22
RazorCompiledItemAttribute -
3-
NamespaceDeclaration - - AspNetCore
3+
NamespaceDeclaration - - AspNetCoreGeneratedDocument
44
UsingDirective - (1:0,1 [22] ) - global::System
55
UsingDirective - (24:1,1 [42] ) - global::System.Collections.Generic
66
UsingDirective - (67:2,1 [27] ) - global::System.Linq
@@ -11,7 +11,7 @@
1111
RazorSourceChecksumAttribute -
1212
RazorCompiledItemMetadataAttribute -
1313
CreateNewOnMetadataUpdateAttribute -
14-
ClassDeclaration - - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
14+
ClassDeclaration - - internal sealed - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> -
1515
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
1616
HtmlContent - (0:0,0 [4] Basic.cshtml)
1717
LazyIntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div

0 commit comments

Comments
 (0)