Merge release/dev17.11 to main (#10483)

This is an automatically generated pull request from release/dev17.11
into main.


Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯

## Troubleshooting conflicts

### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.11
- https://github.com/dotnet/razor/find/main

Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.

### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.11-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.11
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.11-to-main --force
```

Author: dotnet-bot

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/TestTagHelperDescriptors.cs

@@ -44,10 +44,19 @@ public static IEnumerable<TagHelperDescriptor> SimpleTagHelperDescriptors
                                 .Name("age")
                                 .Metadata(PropertyName("AgeProp"))
                                 .TypeName("System.Int32"),
+                            builder => builder
+                                .Name("alive")
+                                .Metadata(PropertyName("AliveProp"))
+                                .TypeName("System.Boolean"),
                             builder => builder
                                 .Name("tag")
                                 .Metadata(PropertyName("TagProp"))
                                 .TypeName("System.Object"),
+                            builder => builder
+                                .Name("tuple-dictionary")
+                                .Metadata(PropertyName("DictionaryOfBoolAndStringTupleProperty"))
+                                .TypeName(typeof(IDictionary<string, int>).Namespace + ".IDictionary<System.String, (System.Boolean, System.String)>")
+                                .AsDictionaryAttribute("tuple-prefix-", typeof((bool, string)).FullName)
                         })
                 };
         }

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperBlockRewriterTest.cs

@@ -475,6 +475,11 @@ public void CreatesErrorForMalformedTagHelper8()
                 .Name("name")
                 .Metadata(PropertyName("Name"))
                 .TypeName(typeof(string).FullName))
+            .BoundAttributeDescriptor(attribute =>
+                attribute
+                .Name("alive")
+                .Metadata(PropertyName("Alive"))
+                .TypeName(typeof(bool).FullName))
             .BoundAttributeDescriptor(attribute =>
                 attribute
                 .Name("tag")
@@ -638,6 +643,61 @@ public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes19()
             """);
     }
 
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10186")]
+    public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes20()
+    {
+        EvaluateData(CodeTagHelperAttributes_Descriptors, """
+            @{ 
+                var isAlive = true;
+            }
+            <person alive="!@isAlive" />
+            """);
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10186")]
+    public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes21()
+    {
+        EvaluateData(CodeTagHelperAttributes_Descriptors, """
+            @{ 
+                var obj = new { Prop = (object)1 };
+            }
+            <person age="(int)@obj.Prop" />
+            """);
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10186")]
+    public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes22()
+    {
+        EvaluateData(CodeTagHelperAttributes_Descriptors, """
+            @{ 
+                var obj = new { Prop = (object)1 };
+            }
+            <person tag="new { @params = 1 }" />
+            """);
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10186")]
+    public void CreatesMarkupCodeSpansForNonStringTagHelperAttributes23()
+    {
+        EvaluateData(
+            [TagHelperDescriptorBuilder
+                .Create("InputTagHelper", "SomeAssembly")
+                .TagMatchingRuleDescriptor(rule => rule.RequireTagName("input"))
+                .BoundAttributeDescriptor(attribute =>
+                    attribute
+                        .Name("tuple-dictionary")
+                        .Metadata(PropertyName("DictionaryOfBoolAndStringTupleProperty"))
+                        .TypeName(typeof(IDictionary<string, int>).Namespace + ".IDictionary<System.String, (System.Boolean, System.String)>")
+                        .AsDictionaryAttribute("tuple-prefix-", typeof((bool, string)).FullName))
+                    .Build()],
+            """
+            @{ 
+                var item = new { Items = new System.List<string>() { "one", "two" } };
+            }
+            <input tuple-prefix-test='(@item. Items.Where(i=>i.Contains("one")). Count()>0, @item. Items.FirstOrDefault(i=>i.Contains("one"))?. Replace("one",""))' />
+            """);
+    }
+
     [Fact, WorkItem("https://github.com/dotnet/razor/issues/10426")]
     public void CreatesMarkupCodeSpans_EscapedExpression_01()
     {

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml

@@ -2,5 +2,10 @@
 
 @{
     var count = "1";
+    var alive = true;
+    var obj = new { age = (object)1 };
+    var item = new { Items = new System.List<string>() { "one", "two" } };
 }
-<input age="Convert.ToInt32(@count)" />
+<input age="Convert.ToInt32(@count)" alive="!@alive" />
+<input age="(int)@obj.age" tag="new { @params = 1 }" />
+<input tuple-prefix-test='(@item. Items.Where(i=>i.Contains("one")). Count()>0, @item. Items.FirstOrDefault(i=>i.Contains("one"))?. Replace("one",""))' />

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier_DesignTime.codegen.cs

@@ -49,15 +49,50 @@ private void __RazorDirectiveTokenHelpers__() {
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
 
     var count = "1";
+    var alive = true;
+    var obj = new { age = (object)1 };
+    var item = new { Items = new System.List<string>() { "one", "two" } };
 
 #line default
 #line hidden
 #nullable disable
             __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
 #nullable restore
-#line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
 __InputTagHelper.AgeProp = Convert.ToInt32(@count);
 
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 9 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
+               __InputTagHelper.AliveProp = !@alive;
+
+#line default
+#line hidden
+#nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
+__InputTagHelper.AgeProp = (int)@obj.age;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 10 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
+     __InputTagHelper.TagProp = new { @params = 1 };
+
+#line default
+#line hidden
+#nullable disable
+            await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
+            __InputTagHelper = CreateTagHelper<global::InputTagHelper>();
+#nullable restore
+#line 11 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml"
+__InputTagHelper.DictionaryOfBoolAndStringTupleProperty["test"] = (@item. Items.Where(i=>i.Contains("one")). Count()>0, @item. Items.FirstOrDefault(i=>i.Contains("one"))?. Replace("one",""));
+
 #line default
 #line hidden
 #nullable disable

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier_DesignTime.codegen.html

@@ -2,5 +2,10 @@
 
 ~~
     ~~~ ~~~~~ ~ ~~~~
+    ~~~ ~~~~~ ~ ~~~~~
+    ~~~ ~~~ ~ ~~~ ~ ~~~ ~ ~~~~~~~~~ ~~
+    ~~~ ~~~~ ~ ~~~ ~ ~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~ ~ ~~~~~~ ~~~~~ ~ ~~
 ~
-<input age="~~~~~~~~~~~~~~~~~~~~~~~" />
+<input age="~~~~~~~~~~~~~~~~~~~~~~~" alive="~~~~~~~" />
+<input age="~~~~~~~~~~~~~" tag="~~~ ~ ~~~~~~~ ~ ~ ~" />
+<input tuple-prefix-test='~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~' />

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier_DesignTime.cs-diagnostics.txt

@@ -0,0 +1,3 @@
+// TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml(7,41): error CS0234: The type or namespace name 'List<>' does not exist in the namespace 'System' (are you missing an assembly reference?)
+//     var item = new { Items = new System.List<string>() { "one", "two" } };
+Diagnostic(ErrorCode.ERR_DottedTypeNameNotFoundInNS, "List<string>").WithArguments("List<>", "System").WithLocation(7, 41)

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier_DesignTime.html.mappings.txt

@@ -12,17 +12,41 @@ Generated Location: (31:0,31 [4] )
 
 |
 
-Source Location: (62:4,1 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+Source Location: (201:7,1 [14] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
 |
 <input age="|
-Generated Location: (62:4,1 [14] )
+Generated Location: (201:7,1 [14] )
 |
 <input age="|
 
-Source Location: (99:5,35 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+Source Location: (238:8,35 [9] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|" alive="|
+Generated Location: (238:8,35 [9] )
+|" alive="|
+
+Source Location: (254:8,51 [18] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
 |" />
-|
-Generated Location: (99:5,35 [6] )
+<input age="|
+Generated Location: (254:8,51 [18] )
+|" />
+<input age="|
+
+Source Location: (285:9,25 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|" tag="|
+Generated Location: (285:9,25 [7] )
+|" tag="|
+
+Source Location: (311:9,51 [32] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|" />
+<input tuple-prefix-test='|
+Generated Location: (311:9,51 [32] )
 |" />
+<input tuple-prefix-test='|
+
+Source Location: (467:10,150 [6] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|' />
+|
+Generated Location: (467:10,150 [6] )
+|' />
 |
 

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier_DesignTime.ir.txt

@@ -37,16 +37,36 @@
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 HtmlContent - (31:0,31 [4] EscapedIdentifier.cshtml)
                     LazyIntermediateToken - (31:0,31 [4] EscapedIdentifier.cshtml) - Html - \n\n
-                CSharpCode - (37:2,2 [24] EscapedIdentifier.cshtml)
-                    LazyIntermediateToken - (37:2,2 [24] EscapedIdentifier.cshtml) - CSharp - \n    var count = "1";\n
-                TagHelper - (64:5,0 [39] EscapedIdentifier.cshtml) - input - TagMode.SelfClosing
+                CSharpCode - (37:2,2 [163] EscapedIdentifier.cshtml)
+                    LazyIntermediateToken - (37:2,2 [163] EscapedIdentifier.cshtml) - CSharp - \n    var count = "1";\n    var alive = true;\n    var obj = new { age = (object)1 };\n    var item = new { Items = new System.List<string>() { "one", "two" } };\n
+                TagHelper - (203:8,0 [55] EscapedIdentifier.cshtml) - input - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTagHelper
-                    DefaultTagHelperProperty - (76:5,12 [23] EscapedIdentifier.cshtml) - age - int InputTagHelper.AgeProp - HtmlAttributeValueStyle.DoubleQuotes
-                        LazyIntermediateToken - (76:5,12 [23] EscapedIdentifier.cshtml) - CSharp - Convert.ToInt32(@count)
+                    DefaultTagHelperProperty - (215:8,12 [23] EscapedIdentifier.cshtml) - age - int InputTagHelper.AgeProp - HtmlAttributeValueStyle.DoubleQuotes
+                        LazyIntermediateToken - (215:8,12 [23] EscapedIdentifier.cshtml) - CSharp - Convert.ToInt32(@count)
+                    DefaultTagHelperProperty - (247:8,44 [7] EscapedIdentifier.cshtml) - alive - bool InputTagHelper.AliveProp - HtmlAttributeValueStyle.DoubleQuotes
+                        LazyIntermediateToken - (247:8,44 [7] EscapedIdentifier.cshtml) - CSharp - !@alive
                     DefaultTagHelperExecute - 
-                HtmlContent - (103:5,39 [2] EscapedIdentifier.cshtml)
-                    LazyIntermediateToken - (103:5,39 [2] EscapedIdentifier.cshtml) - Html - \n
+                HtmlContent - (258:8,55 [2] EscapedIdentifier.cshtml)
+                    LazyIntermediateToken - (258:8,55 [2] EscapedIdentifier.cshtml) - Html - \n
+                TagHelper - (260:9,0 [55] EscapedIdentifier.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (272:9,12 [13] EscapedIdentifier.cshtml) - age - int InputTagHelper.AgeProp - HtmlAttributeValueStyle.DoubleQuotes
+                        LazyIntermediateToken - (272:9,12 [13] EscapedIdentifier.cshtml) - CSharp - (int)@obj.age
+                    DefaultTagHelperProperty - (292:9,32 [19] EscapedIdentifier.cshtml) - tag - object InputTagHelper.TagProp - HtmlAttributeValueStyle.DoubleQuotes
+                        LazyIntermediateToken - (292:9,32 [19] EscapedIdentifier.cshtml) - CSharp - new { @params = 1 }
+                    DefaultTagHelperExecute - 
+                HtmlContent - (315:9,55 [2] EscapedIdentifier.cshtml)
+                    LazyIntermediateToken - (315:9,55 [2] EscapedIdentifier.cshtml) - Html - \n
+                TagHelper - (317:10,0 [154] EscapedIdentifier.cshtml) - input - TagMode.SelfClosing
+                    DefaultTagHelperBody - 
+                    DefaultTagHelperCreate -  - InputTagHelper
+                    DefaultTagHelperProperty - (343:10,26 [124] EscapedIdentifier.cshtml) - tuple-prefix-test - System.Collections.Generic.IDictionary<System.String, (System.Boolean, System.String)> InputTagHelper.DictionaryOfBoolAndStringTupleProperty - HtmlAttributeValueStyle.SingleQuotes
+                        LazyIntermediateToken - (343:10,26 [124] EscapedIdentifier.cshtml) - CSharp - (@item. Items.Where(i=>i.Contains("one")). Count()>0, @item. Items.FirstOrDefault(i=>i.Contains("one"))?. Replace("one",""))
+                    DefaultTagHelperExecute - 
+                HtmlContent - (471:10,154 [2] EscapedIdentifier.cshtml)
+                    LazyIntermediateToken - (471:10,154 [2] EscapedIdentifier.cshtml) - Html - \n
             Inject - 
             Inject - 
             Inject - 

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier_DesignTime.mappings.txt

@@ -3,17 +3,43 @@
 Generated Location: (1707:32,37 [17] )
 |"*, TestAssembly"|
 
-Source Location: (37:2,2 [24] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+Source Location: (37:2,2 [163] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
 |
     var count = "1";
+    var alive = true;
+    var obj = new { age = (object)1 };
+    var item = new { Items = new System.List<string>() { "one", "two" } };
 |
-Generated Location: (2215:49,2 [24] )
+Generated Location: (2215:49,2 [163] )
 |
     var count = "1";
+    var alive = true;
+    var obj = new { age = (object)1 };
+    var item = new { Items = new System.List<string>() { "one", "two" } };
 |
 
-Source Location: (76:5,12 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+Source Location: (215:8,12 [23] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
 |Convert.ToInt32(@count)|
-Generated Location: (2503:58,27 [23] )
+Generated Location: (2642:61,27 [23] )
 |Convert.ToInt32(@count)|
 
+Source Location: (247:8,44 [7] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|!@alive|
+Generated Location: (2874:68,44 [7] )
+|!@alive|
+
+Source Location: (272:9,12 [13] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|(int)@obj.age|
+Generated Location: (3225:77,27 [13] )
+|(int)@obj.age|
+
+Source Location: (292:9,32 [19] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|new { @params = 1 }|
+Generated Location: (3436:84,32 [19] )
+|new { @params = 1 }|
+
+Source Location: (343:10,26 [124] TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EscapedIdentifier.cshtml)
+|(@item. Items.Where(i=>i.Contains("one")). Count()>0, @item. Items.FirstOrDefault(i=>i.Contains("one"))?. Replace("one",""))|
+Generated Location: (3838:93,66 [124] )
+|(@item. Items.Where(i=>i.Contains("one")). Count()>0, @item. Items.FirstOrDefault(i=>i.Contains("one"))?. Replace("one",""))|
+