Skip to content

Commit

Permalink
Suppress unique ids (#10791)
Browse files Browse the repository at this point in the history 
* Use more obvious SuppressUniqueIds value
* Update baselines
  • Loading branch information
@chsienki
chsienki authored Aug 27, 2024
1 parent 1ea1552 commit 6045ef2
Show file tree
Hide file tree
Showing 57 changed files with 176 additions and 176 deletions.
2 changes: 1 addition & 1 deletion ...es/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Incomplete

#line default
#line hidden
Member_test { get; private set; }
Member___UniqueIdSuppressedForTesting__ { get; private set; }
#line (7,9)-(7,9) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"

#line default
Expand Down
4 changes: 2 additions & 2 deletions .../IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.mappings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Generated Location: (1895:33,0 [9] )

Source Location: (123:6,8 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
||
Generated Location: (2096:39,0 [0] )
Generated Location: (2124:39,0 [0] )
||

Source Location: (113:5,7 [0] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml)
||
Generated Location: (2233:43,0 [0] )
Generated Location: (2261:43,0 [0] )
||

2 changes: 1 addition & 1 deletion ...es/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Incomplete

#line default
#line hidden
Member_test { get; private set; }
Member___UniqueIdSuppressedForTesting__ { get; private set; }
#line (11,9)-(11,9) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"

#line default
Expand Down
4 changes: 2 additions & 2 deletions ...ntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre
WriteLiteral("\r\n");
EndContext();
BeginContext(66, 25, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
Expand All @@ -74,7 +74,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre
WriteLiteral("\r\n");
EndContext();
BeginContext(93, 27, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
Expand Down
10 changes: 5 additions & 5 deletions .../IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n ");
EndContext();
BeginContext(456, 31, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__DivTagHelper = CreateTagHelper<global::DivTagHelper>();
Expand All @@ -78,7 +78,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n ");
EndContext();
BeginContext(493, 237, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(517, 48, true);
WriteLiteral("\r\n <label class=\"col-md-2 control-label\">");
EndContext();
Expand All @@ -95,7 +95,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("</label>\r\n ");
EndContext();
BeginContext(588, 130, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(611, 101, true);
WriteLiteral("\r\n <input class=\"form-control\" />\r\n <span class=\"text-danger\"></span>\r\n ");
EndContext();
Expand Down Expand Up @@ -132,12 +132,12 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n ");
EndContext();
BeginContext(736, 174, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(760, 10, true);
WriteLiteral("\r\n ");
EndContext();
BeginContext(770, 128, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(809, 83, true);
WriteLiteral("\r\n <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n ");
EndContext();
Expand Down
10 changes: 5 additions & 5 deletions ...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\" >\r\n ");
EndContext();
BeginContext(551, 31, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__DivTagHelper = CreateTagHelper<global::DivTagHelper>();
Expand All @@ -78,7 +78,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n ");
EndContext();
BeginContext(588, 243, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(612, 48, true);
WriteLiteral("\r\n <label class=\"col-md-2 control-label\">");
EndContext();
Expand All @@ -95,7 +95,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("</label>\r\n ");
EndContext();
BeginContext(689, 130, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(712, 101, true);
WriteLiteral("\r\n <input class=\"form-control\" />\r\n <span class=\"text-danger\"></span>\r\n ");
EndContext();
Expand Down Expand Up @@ -132,12 +132,12 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n ");
EndContext();
BeginContext(837, 174, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(861, 10, true);
WriteLiteral("\r\n ");
EndContext();
BeginContext(871, 128, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(910, 83, true);
WriteLiteral("\r\n <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n ");
EndContext();
Expand Down
2 changes: 1 addition & 1 deletion ...test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Sections :
WriteLiteral("\r\n <div>This is in Section 1</div>\r\n ");
EndContext();
BeginContext(205, 25, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
Expand Down
2 changes: 1 addition & 1 deletion .../IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewCompon
WriteLiteral("\r\n");
EndContext();
BeginContext(61, 50, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__AllTagHelper = CreateTagHelper<global::AllTagHelper>();
Expand Down
4 changes: 2 additions & 2 deletions ...X/test/TestFiles/IntegrationTests/InstrumentationPassIntegrationTest/BasicTest.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ public class TestFiles_IntegrationTests_InstrumentationPassIntegrationTest_Basic
EndContext();
BeginContext(71, 87, false);
BeginContext(71, 87, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("form", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("form", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
BeginContext(91, 6, true);
BeginContext(91, 6, true);
WriteLiteral("\r\n ");
EndContext();
EndContext();
BeginContext(97, 52, false);
BeginContext(97, 52, false);
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__InputTagHelper = CreateTagHelper<global::InputTagHelper>();
Expand Down
2 changes: 1 addition & 1 deletion ...es/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Incomplete
#line default
#line hidden
#nullable disable
Member_test { get; private set; }
Member___UniqueIdSuppressedForTesting__ { get; private set; }
= default!;
#nullable restore
#line (11,9)-(11,9) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives.cshtml"
Expand Down
4 changes: 2 additions & 2 deletions ...ntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre
{
WriteLiteral("\r\n");
WriteLiteral("\r\n");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
Expand All @@ -70,7 +70,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ModelExpre
Write(__tagHelperExecutionContext.Output);
__tagHelperExecutionContext = __tagHelperScopeManager.End();
WriteLiteral("\r\n");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__InputTestTagHelper = CreateTagHelper<global::InputTestTagHelper>();
Expand Down
4 changes: 2 additions & 2 deletions ...estFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPage_WithCssScope.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_test : glo
#nullable disable

WriteLiteral("<div TestCssScope class=\"text-center\">\r\n <h1 TestCssScope class=\"display-4\">Welcome</h1>\r\n <p TestCssScope>Learn about<a TestCssScope href= \"https://docs.microsoft.com/aspnet/core\" > building Web apps with ASP.NET Core</a>.</p>\r\n</div>\r\n");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("all", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("all", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__AllTagHelper = CreateTagHelper<global::AllTagHelper>();
Expand All @@ -74,7 +74,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_test : glo
Write(__tagHelperExecutionContext.Output);
__tagHelperExecutionContext = __tagHelperScopeManager.End();
WriteLiteral("\r\n");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("form", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("form", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
WriteLiteral("\r\n <input TestCssScope name=\"regular input\" />\r\n");
}
);
Expand Down
10 changes: 5 additions & 5 deletions .../IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
WriteLiteral("\r\n");
WriteLiteral("\r\n");
WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n ");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
}
);
__DivTagHelper = CreateTagHelper<global::DivTagHelper>();
Expand All @@ -72,7 +72,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
Write(__tagHelperExecutionContext.Output);
__tagHelperExecutionContext = __tagHelperScopeManager.End();
WriteLiteral("\r\n ");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
WriteLiteral("\r\n <label class=\"col-md-2 control-label\">");
Write(
#nullable restore
Expand All @@ -84,7 +84,7 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
#nullable disable
);
WriteLiteral("</label>\r\n ");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
WriteLiteral("\r\n <input class=\"form-control\" />\r\n <span class=\"text-danger\"></span>\r\n ");
}
);
Expand Down Expand Up @@ -112,9 +112,9 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPages
Write(__tagHelperExecutionContext.Output);
__tagHelperExecutionContext = __tagHelperScopeManager.End();
WriteLiteral("\r\n ");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
WriteLiteral("\r\n ");
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "__UniqueIdSuppressedForTesting__", async() => {
WriteLiteral("\r\n <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n ");
}
);
Expand Down
Loading

0 comments on commit 6045ef2

Please sign in to comment.