Skip to content

Commit c6a13b3

Browse files
sharwellsharwell
authored
Merge pull request #8326 from jjonescz/7091-Object-wo-global
Fix `System.Object` without `global::` prefix
2 parents d7ad748 + 83f074e commit c6a13b3

File tree

1,217 files changed

+2150
-2150
lines changed

Some content is hidden

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

1,217 files changed

+2150
-2150
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private void __RazorDirectiveTokenHelpers__() {
1818
}
1919
#pragma warning restore 219
2020
#pragma warning disable 0414
21-
private static System.Object __o = null;
21+
private static object __o = null;
2222
#pragma warning restore 0414
2323
#pragma warning disable 1998
2424
public async override global::System.Threading.Tasks.Task ExecuteAsync()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
CSharpCode -
2525
IntermediateToken - - CSharp - #pragma warning disable 0414
2626
CSharpCode -
27-
IntermediateToken - - CSharp - private static System.Object __o = null;
27+
IntermediateToken - - CSharp - private static object __o = null;
2828
CSharpCode -
2929
IntermediateToken - - CSharp - #pragma warning restore 0414
3030
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync

‎src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/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: (1030:26,13 [15] )
3+
Generated Location: (1023:26,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: (1166:31,6 [29] )
8+
Generated Location: (1159:31,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: (1312:36,2 [25] )
15+
Generated Location: (1305:36,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: (1460:42,11 [18] )
22+
Generated Location: (1453:42,11 [18] )
2323
|if(cls != null) { |
2424

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void __RazorDirectiveTokenHelpers__() {
4242
}
4343
#pragma warning restore 219
4444
#pragma warning disable 0414
45-
private static System.Object __o = null;
45+
private static object __o = null;
4646
#pragma warning restore 0414
4747
#pragma warning disable 1998
4848
public async override global::System.Threading.Tasks.Task ExecuteAsync()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
CSharpCode -
2828
IntermediateToken - - CSharp - #pragma warning disable 0414
2929
CSharpCode -
30-
IntermediateToken - - CSharp - private static System.Object __o = null;
30+
IntermediateToken - - CSharp - private static object __o = null;
3131
CSharpCode -
3232
IntermediateToken - - CSharp - #pragma warning restore 0414
3333
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private void __RazorDirectiveTokenHelpers__() {
3434
}
3535
#pragma warning restore 219
3636
#pragma warning disable 0414
37-
private static System.Object __o = null;
37+
private static object __o = null;
3838
#pragma warning restore 0414
3939
#pragma warning disable 1998
4040
public async override global::System.Threading.Tasks.Task ExecuteAsync()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
CSharpCode -
2727
IntermediateToken - - CSharp - #pragma warning disable 0414
2828
CSharpCode -
29-
IntermediateToken - - CSharp - private static System.Object __o = null;
29+
IntermediateToken - - CSharp - private static object __o = null;
3030
CSharpCode -
3131
IntermediateToken - - CSharp - #pragma warning restore 0414
3232
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private void __RazorDirectiveTokenHelpers__() {
2626
}
2727
#pragma warning restore 219
2828
#pragma warning disable 0414
29-
private static System.Object __o = null;
29+
private static object __o = null;
3030
#pragma warning restore 0414
3131
#pragma warning disable 1998
3232
public async override global::System.Threading.Tasks.Task ExecuteAsync()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
CSharpCode -
2727
IntermediateToken - - CSharp - #pragma warning disable 0414
2828
CSharpCode -
29-
IntermediateToken - - CSharp - private static System.Object __o = null;
29+
IntermediateToken - - CSharp - private static object __o = null;
3030
CSharpCode -
3131
IntermediateToken - - CSharp - #pragma warning restore 0414
3232
MethodDeclaration - - public async override - global::System.Threading.Tasks.Task - ExecuteAsync

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private void __RazorDirectiveTokenHelpers__() {
5858
}
5959
#pragma warning restore 219
6060
#pragma warning disable 0414
61-
private static System.Object __o = null;
61+
private static object __o = null;
6262
#pragma warning restore 0414
6363
#pragma warning disable 1998
6464
public async override global::System.Threading.Tasks.Task ExecuteAsync()

0 commit comments

Comments
 (0)