Skip to content

Fix System.Action without global:: prefix #8385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjonescz merged 3 commits into from
Mar 7, 2023
Merged

Fix System.Action without global:: prefix #8385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
680eb75
Fix `System.Action` without `global::` prefix
jjonescz Mar 3, 2023
5ebe272
Update baselines
jjonescz Mar 3, 2023
dd3d9a8
Merge branch 'main' into 7091-Action-wo-global
jjonescz Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Incomplete
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"


#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"


#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
MyService<TModel> __typeHelper = default;

Expand Down
6 changes: 3 additions & 3 deletions ...tegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Source Location: (102:3,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
||
Generated Location: (776:19,0 [0] )
Generated Location: (784:19,0 [0] )
||

Source Location: (123:6,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
||
Generated Location: (966:27,0 [0] )
Generated Location: (982:27,0 [0] )
||

Source Location: (133:7,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
|MyService<TModel>|
Generated Location: (1156:35,0 [17] )
Generated Location: (1180:35,0 [17] )
|MyService<TModel>|

4 changes: 2 additions & 2 deletions ...es/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsVi
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
MyBasePageForViews<TModel> __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
MyModel __typeHelper = default;

Expand Down
4 changes: 2 additions & 2 deletions .../IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Source Location: (10:0,10 [26] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
|MyBasePageForViews<TModel>|
Generated Location: (740:19,0 [26] )
Generated Location: (748:19,0 [26] )
|MyBasePageForViews<TModel>|

Source Location: (45:1,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml)
|MyModel|
Generated Location: (976:27,0 [7] )
Generated Location: (992:27,0 [7] )
|MyModel|

2 changes: 1 addition & 1 deletion ...egrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWi
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml"
MyModel __typeHelper = default;

Expand Down
2 changes: 1 addition & 1 deletion ...rationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml)
|MyModel|
Generated Location: (752:19,0 [7] )
Generated Location: (760:19,0 [7] )
|MyModel|

10 changes: 5 additions & 5 deletions ...iles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,39 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
MyModel __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
MyApp __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
global::System.Object MyPropertyName = null;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
MyService<TModel> __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml"
global::System.Object Html = null;

Expand Down
10 changes: 5 additions & 5 deletions ...es/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
|MyModel|
Generated Location: (766:19,0 [7] )
Generated Location: (774:19,0 [7] )
|MyModel|

Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
|MyApp|
Generated Location: (981:27,0 [5] )
Generated Location: (997:27,0 [5] )
|MyApp|

Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
|MyPropertyName|
Generated Location: (1216:35,22 [14] )
Generated Location: (1240:35,22 [14] )
|MyPropertyName|

Source Location: (54:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
|MyService<TModel>|
Generated Location: (1422:43,0 [17] )
Generated Location: (1454:43,0 [17] )
|MyService<TModel>|

Source Location: (72:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel.cshtml)
|Html|
Generated Location: (1669:51,22 [4] )
Generated Location: (1709:51,22 [4] )
|Html|

18 changes: 9 additions & 9 deletions .../IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,71 +15,71 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InjectWith
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
MyModel __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
MyApp __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 2 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
global::System.Object MyPropertyName = null;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
MyService<TModel> __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
global::System.Object Html = null;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
MyApp __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 4 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
global::System.Object MyPropertyName2 = null;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
MyService<TModel> __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml"
global::System.Object Html2 = null;

Expand Down
18 changes: 9 additions & 9 deletions ...ntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
Source Location: (7:0,7 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyModel|
Generated Location: (774:19,0 [7] )
Generated Location: (782:19,0 [7] )
|MyModel|

Source Location: (24:1,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyApp|
Generated Location: (993:27,0 [5] )
Generated Location: (1009:27,0 [5] )
|MyApp|

Source Location: (30:1,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyPropertyName|
Generated Location: (1232:35,22 [14] )
Generated Location: (1256:35,22 [14] )
|MyPropertyName|

Source Location: (58:2,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyService<TModel>|
Generated Location: (1442:43,0 [17] )
Generated Location: (1474:43,0 [17] )
|MyService<TModel>|

Source Location: (76:2,26 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|Html|
Generated Location: (1693:51,22 [4] )
Generated Location: (1733:51,22 [4] )
|Html|

Source Location: (93:3,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyApp|
Generated Location: (1893:59,0 [5] )
Generated Location: (1941:59,0 [5] )
|MyApp|

Source Location: (99:3,14 [15] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyPropertyName2|
Generated Location: (2132:67,22 [15] )
Generated Location: (2188:67,22 [15] )
|MyPropertyName2|

Source Location: (129:4,8 [17] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|MyService<TModel>|
Generated Location: (2343:75,0 [17] )
Generated Location: (2407:75,0 [17] )
|MyService<TModel>|

Source Location: (147:4,26 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon.cshtml)
|Html2|
Generated Location: (2594:83,22 [5] )
Generated Location: (2666:83,22 [5] )
|Html2|

4 changes: 2 additions & 2 deletions ...est/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Inject : g
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
MyApp __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml"
global::System.Object MyPropertyName = null;

Expand Down
4 changes: 2 additions & 2 deletions ...t/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Source Location: (8:0,8 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
|MyApp|
Generated Location: (748:19,0 [5] )
Generated Location: (756:19,0 [5] )
|MyApp|

Source Location: (14:0,14 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject.cshtml)
|MyPropertyName|
Generated Location: (974:27,22 [14] )
Generated Location: (990:27,22 [14] )
|MyPropertyName|

4 changes: 2 additions & 2 deletions ...grationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre
private global::InputTestTagHelper __InputTestTagHelper;
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
DateTime __typeHelper = default;

#line default
#line hidden
}
))();
((System.Action)(() => {
((global::System.Action)(() => {
#line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml"
global::System.Object __typeHelper = "InputTestTagHelper, AppCode";

Expand Down
8 changes: 4 additions & 4 deletions ...ationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Source Location: (7:0,7 [8] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
|DateTime|
Generated Location: (1259:25,0 [8] )
Generated Location: (1267:25,0 [8] )
|DateTime|

Source Location: (33:2,14 [29] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
|"InputTestTagHelper, AppCode"|
Generated Location: (1521:33,37 [29] )
Generated Location: (1537:33,37 [29] )
|"InputTestTagHelper, AppCode"|

Source Location: (83:4,17 [4] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
|Date|
Generated Location: (2193:49,102 [4] )
Generated Location: (2209:49,102 [4] )
|Date|

Source Location: (111:5,18 [5] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml)
|Model|
Generated Location: (2585:56,94 [5] )
Generated Location: (2601:56,94 [5] )
|Model|

2 changes: 1 addition & 1 deletion ...test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Model : gl
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((System.Action)(() => {
((global::System.Action)(() => {
#line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml"
System.Collections.IEnumerable __typeHelper = default;

Expand Down
2 changes: 1 addition & 1 deletion ...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.mappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source Location: (7:0,7 [30] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model.cshtml)
|System.Collections.IEnumerable|
Generated Location: (769:19,0 [30] )
Generated Location: (777:19,0 [30] )
|System.Collections.IEnumerable|

Loading