Fix minimized attributes when using 5.0 SDK with 3.x target

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentRuntimeNodeWriter.cs

@@ -852,11 +852,20 @@ protected override void WriteReferenceCaptureInnards(CodeRenderingContext contex
         private void WriteAttribute(CodeRenderingContext context, string key, IList<IntermediateToken> value)
         {
             BeginWriteAttribute(context, key);
+
             if (value.Count > 0)
             {
                 context.CodeWriter.WriteParameterSeparator();
                 WriteAttributeValue(context, value);
             }
+            else if (!context.Options.OmitMinimizedComponentAttributeValues)
+            {
+                // In version 5+, there's no need to supply a value for a minimized attribute.
+                // But for older language versions, minimized attributes were represented as "true".
+                context.CodeWriter.WriteParameterSeparator();
+                context.CodeWriter.WriteBooleanLiteral(true);
+            }
+
             context.CodeWriter.WriteEndMethodInvocation();
         }
 

src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -13,7 +13,8 @@ public DefaultRazorCodeGenerationOptions(
             bool suppressChecksum,
             bool suppressMetadataAttributes,
             bool suppressPrimaryMethodBody,
-            bool suppressNullabilityEnforcement)
+            bool suppressNullabilityEnforcement,
+            bool omitMinimizedComponentAttributeValues)
         {
             IndentWithTabs = indentWithTabs;
             IndentSize = indentSize;
@@ -23,6 +24,7 @@ public DefaultRazorCodeGenerationOptions(
             SuppressMetadataAttributes = suppressMetadataAttributes;
             SuppressPrimaryMethodBody = suppressPrimaryMethodBody;
             SuppressNullabilityEnforcement = suppressNullabilityEnforcement;
+            OmitMinimizedComponentAttributeValues = omitMinimizedComponentAttributeValues;
         }
 
         public override bool DesignTime { get; }
@@ -36,5 +38,7 @@ public DefaultRazorCodeGenerationOptions(
         public override bool SuppressChecksum { get; }
 
         public override bool SuppressNullabilityEnforcement { get; }
+
+        public override bool OmitMinimizedComponentAttributeValues { get; }
     }
 }

src/Razor/Microsoft.AspNetCore.Razor.Language/src/DefaultRazorCodeGenerationOptionsBuilder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -39,6 +39,8 @@ public DefaultRazorCodeGenerationOptionsBuilder(bool designTime)
 
         public override bool SuppressNullabilityEnforcement { get; set; }
 
+        public override bool OmitMinimizedComponentAttributeValues { get; set; }
+
         public override RazorCodeGenerationOptions Build()
         {
             return new DefaultRazorCodeGenerationOptions(
@@ -49,7 +51,8 @@ public override RazorCodeGenerationOptions Build()
                 SuppressChecksum,
                 SuppressMetadataAttributes,
                 SuppressPrimaryMethodBody,
-                SuppressNullabilityEnforcement);
+                SuppressNullabilityEnforcement,
+                OmitMinimizedComponentAttributeValues);
         }
 
         public override void SetDesignTime(bool designTime)

src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -17,7 +17,8 @@ public static RazorCodeGenerationOptions CreateDefault()
                 rootNamespace: null,
                 suppressMetadataAttributes: false,
                 suppressPrimaryMethodBody: false,
-                suppressNullabilityEnforcement: false);
+                suppressNullabilityEnforcement: false,
+                omitMinimizedComponentAttributeValues: false);
         }
 
         public static RazorCodeGenerationOptions CreateDesignTimeDefault()
@@ -30,7 +31,8 @@ public static RazorCodeGenerationOptions CreateDesignTimeDefault()
                 suppressChecksum: false,
                 suppressMetadataAttributes: true,
                 suppressPrimaryMethodBody: false,
-                suppressNullabilityEnforcement: false);
+                suppressNullabilityEnforcement: false,
+                omitMinimizedComponentAttributeValues: false);
         }
 
         public static RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
@@ -114,5 +116,10 @@ public static RazorCodeGenerationOptions CreateDesignTime(Action<RazorCodeGenera
         /// Gets a value that determines if nullability type enforcement should be suppressed for user code.
         /// </summary>
         public virtual bool SuppressNullabilityEnforcement { get; }
+
+        /// <summary>
+        /// Gets a value that determines if the components code writer may omit values for minimized attributes.
+        /// </summary>
+        public virtual bool OmitMinimizedComponentAttributeValues { get; }
     }
 }

src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorCodeGenerationOptionsBuilder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 namespace Microsoft.AspNetCore.Razor.Language
@@ -59,6 +59,11 @@ public abstract class RazorCodeGenerationOptionsBuilder
         /// </summary>
         public virtual bool SuppressNullabilityEnforcement { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value that determines if the components code writer may omit values for minimized attributes.
+        /// </summary>
+        public virtual bool OmitMinimizedComponentAttributeValues { get; set; }
+
         public abstract RazorCodeGenerationOptions Build();
 
         public virtual void SetDesignTime(bool designTime)

src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs

@@ -9,10 +9,14 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 {
     public abstract class ComponentCodeGenerationTestBase : RazorBaselineIntegrationTestBase
     {
+        private RazorConfiguration _configuration;
+
         internal override string FileKind => FileKinds.Component;
 
         internal override bool UseTwoPhaseCompilation => true;
 
+        internal override RazorConfiguration Configuration => _configuration ?? base.Configuration;
+
         protected ComponentCodeGenerationTestBase()
             : base(generateBaselines: null)
         {
@@ -364,6 +368,38 @@ public void MarkupComment_IsNotIncluded()
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void OmitsMinimizedAttributeValueParameter()
+        {
+            // Act
+            var generated = CompileToCSharp(@"
+<elem normal-attr=""@(""val"")"" minimized-attr empty-string-atttr=""""></elem>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void IncludesMinimizedAttributeValueParameterBeforeLanguageVersion5()
+        {
+            // Arrange
+            _configuration = RazorConfiguration.Create(
+                RazorLanguageVersion.Version_3_0,
+                base.Configuration.ConfigurationName,
+                base.Configuration.Extensions);
+
+            // Act
+            var generated = CompileToCSharp(@"
+<elem normal-attr=""@(""val"")"" minimized-attr empty-string-atttr=""""></elem>");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         [Fact]
         public void Component_WithFullyQualifiedTagNames()
         {

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/IncludesMinimizedAttributeValueParameterBeforeLanguageVersion5/TestComponent.codegen.cs

@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "val"
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/IncludesMinimizedAttributeValueParameterBeforeLanguageVersion5/TestComponent.ir.txt

@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  normal-attr=" - "
+                        CSharpExpressionAttributeValue - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            LazyIntermediateToken - (21:0,21 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "val"
+                    HtmlAttribute - (28:0,28 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  minimized-attr - 
+                    HtmlAttribute - (43:0,43 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  empty-string-atttr=" - "

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/IncludesMinimizedAttributeValueParameterBeforeLanguageVersion5/TestComponent.mappings.txt

@@ -0,0 +1,5 @@
+Source Location: (21:0,21 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|"val"|
+Generated Location: (893:25,21 [5] )
+|"val"|
+

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/OmitsMinimizedAttributeValueParameter/TestComponent.codegen.cs

@@ -0,0 +1,36 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "val"
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/OmitsMinimizedAttributeValueParameter/TestComponent.ir.txt

@@ -0,0 +1,22 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  normal-attr=" - "
+                        CSharpExpressionAttributeValue - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            LazyIntermediateToken - (21:0,21 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "val"
+                    HtmlAttribute - (28:0,28 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  minimized-attr - 
+                    HtmlAttribute - (43:0,43 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  empty-string-atttr=" - "

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/OmitsMinimizedAttributeValueParameter/TestComponent.mappings.txt

@@ -0,0 +1,5 @@
+Source Location: (21:0,21 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+|"val"|
+Generated Location: (893:25,21 [5] )
+|"val"|
+

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/IncludesMinimizedAttributeValueParameterBeforeLanguageVersion5/TestComponent.codegen.cs

@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "elem");
+            __builder.AddAttribute(1, "normal-attr", 
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+                     "val"
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.AddAttribute(2, "minimized-attr", true);
+            __builder.AddAttribute(3, "empty-string-atttr", true);
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591

src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/IncludesMinimizedAttributeValueParameterBeforeLanguageVersion5/TestComponent.ir.txt

@@ -0,0 +1,15 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [73] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (5:0,5 [23] x:\dir\subdir\Test\TestComponent.cshtml) -  normal-attr=" - "
+                        CSharpExpressionAttributeValue - (19:0,19 [8] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            LazyIntermediateToken - (21:0,21 [5] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "val"
+                    HtmlAttribute - (28:0,28 [15] x:\dir\subdir\Test\TestComponent.cshtml) -  minimized-attr - 
+                    HtmlAttribute - (43:0,43 [22] x:\dir\subdir\Test\TestComponent.cshtml) -  empty-string-atttr=" - "