From c7726df3452c67a1f0ac76cab3bbcead02bf39e0 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Mon, 14 Jul 2025 12:28:57 +0200
Subject: [PATCH 1/4] Override default properties with custom file-level
 directives

---
 .../Run/VirtualProjectBuildingCommand.cs      | 68 +++++++++++--------
 .../Convert/DotnetProjectConvertTests.cs      | 41 ++++++++++-
 .../CommandTests/Run/RunFileTests.cs          |  1 -
 3 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
index bf80f0b8c9b6..5fcfac82dd8c 100644
--- a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
+++ b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
@@ -61,6 +61,18 @@ internal sealed class VirtualProjectBuildingCommand : CommandBase
         "MSBuild.rsp",
     ];
 
+    /// <remarks>
+    /// Kept in sync with the default <c>dotnet new console</c> project file (enforced by <c>DotnetProjectAddTests.SameAsTemplate</c>).
+    /// </remarks>
+    private static readonly FrozenDictionary<string, string> s_defaultProperties = FrozenDictionary.Create<string, string>(StringComparer.OrdinalIgnoreCase,
+    [
+        new("OutputType", "Exe"),
+        new("TargetFramework", "net10.0"),
+        new("ImplicitUsings", "enable"),
+        new("Nullable", "enable"),
+        new("PublishAot", "true"),
+    ]);
+
     internal static readonly string TargetOverrides = """
           <!--
             Override targets which don't work with project files that are not present on disk.
@@ -645,33 +657,37 @@ public static void WriteProjectFile(
             writer.WriteLine();
         }
 
-        // Kept in sync with the default `dotnet new console` project file (enforced by `DotnetProjectAddTests.SameAsTemplate`).
-        writer.WriteLine($"""
-              <PropertyGroup>
-                <OutputType>Exe</OutputType>
-                <TargetFramework>net10.0</TargetFramework>
-                <ImplicitUsings>enable</ImplicitUsings>
-                <Nullable>enable</Nullable>
-                <PublishAot>true</PublishAot>
-              </PropertyGroup>
-            """);
+        // Write default properties unless they are overridden by custom directives.
+        var propertyDirectiveNames = propertyDirectives.Select(d => d.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
+        if (!s_defaultProperties.Keys.All(propertyDirectiveNames.Contains))
+        {
+            writer.WriteLine("  <PropertyGroup>");
+            foreach (var (name, value) in s_defaultProperties)
+            {
+                if (!propertyDirectiveNames.Contains(name))
+                {
+                    writer.WriteLine($"""
+                            <{name}>{EscapeValue(value)}</{name}>
+                        """);
+                }
+            }
+            writer.WriteLine("  </PropertyGroup>");
+            writer.WriteLine();
+        }
 
         if (isVirtualProject)
         {
             writer.WriteLine("""
-
                   <PropertyGroup>
                     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
                   </PropertyGroup>
+
                 """);
         }
 
         if (propertyDirectives.Any())
         {
-            writer.WriteLine("""
-
-                  <PropertyGroup>
-                """);
+            writer.WriteLine("  <PropertyGroup>");
 
             foreach (var property in propertyDirectives)
             {
@@ -683,25 +699,23 @@ public static void WriteProjectFile(
             }
 
             writer.WriteLine("  </PropertyGroup>");
+            writer.WriteLine();
         }
 
         if (isVirtualProject)
         {
             // After `#:property` directives so they don't override this.
             writer.WriteLine("""
-
                   <PropertyGroup>
                     <Features>$(Features);FileBasedProgram</Features>
                   </PropertyGroup>
+
                 """);
         }
 
         if (packageDirectives.Any())
         {
-            writer.WriteLine("""
-
-                  <ItemGroup>
-                """);
+            writer.WriteLine("  <ItemGroup>");
 
             foreach (var package in packageDirectives)
             {
@@ -722,14 +736,12 @@ public static void WriteProjectFile(
             }
 
             writer.WriteLine("  </ItemGroup>");
+            writer.WriteLine();
         }
 
         if (projectDirectives.Any())
         {
-            writer.WriteLine("""
-
-                  <ItemGroup>
-                """);
+            writer.WriteLine("  <ItemGroup>");
 
             foreach (var projectReference in projectDirectives)
             {
@@ -741,6 +753,7 @@ public static void WriteProjectFile(
             }
 
             writer.WriteLine("  </ItemGroup>");
+            writer.WriteLine();
         }
 
         Debug.Assert(processedDirectives + directives.OfType<CSharpDirective.Shebang>().Count() == directives.Length);
@@ -750,7 +763,6 @@ public static void WriteProjectFile(
             Debug.Assert(targetFilePath is not null);
 
             writer.WriteLine($"""
-
                   <ItemGroup>
                     <Compile Include="{EscapeValue(targetFilePath)}" />
                   </ItemGroup>
@@ -784,12 +796,10 @@ public static void WriteProjectFile(
 
             writer.WriteLine();
             writer.WriteLine(TargetOverrides);
+            writer.WriteLine();
         }
 
-        writer.WriteLine("""
-
-            </Project>
-            """);
+        writer.WriteLine("</Project>");
 
         static string EscapeValue(string value) => SecurityElement.Escape(value);
 
diff --git a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
index 8c955857a1f2..4456f08ee98d 100644
--- a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
+++ b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
@@ -640,14 +640,13 @@ public void Directives()
                 #:property LangVersion=preview
                 Console.WriteLine();
                 """,
-            expectedProject: $"""
+            expectedProject: """
                 <Project Sdk="Microsoft.NET.Sdk">
 
                   <Sdk Name="Aspire.Hosting.Sdk" Version="9.1.0" />
 
                   <PropertyGroup>
                     <OutputType>Exe</OutputType>
-                    <TargetFramework>{ToolsetInfo.CurrentTargetFramework}</TargetFramework>
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
@@ -670,6 +669,44 @@ public void Directives()
                 """);
     }
 
+    /// <summary>
+    /// There should be only one <c>PropertyGroup</c> element when the default properties are overridden.
+    /// </summary>
+    [Fact]
+    public void Directives_AllDefaultOverridden()
+    {
+        VerifyConversion(
+            inputCSharp: """
+                #!/program
+                #:sdk Microsoft.NET.Web.Sdk
+                #:property OutputType=Exe
+                #:property TargetFramework=net11.0
+                #:property Nullable=disable
+                #:property PublishAot=false
+                #:property Custom=1
+                #:property ImplicitUsings=disable
+                Console.WriteLine();
+                """,
+            expectedProject: """
+                <Project Sdk="Microsoft.NET.Web.Sdk">
+
+                  <PropertyGroup>
+                    <OutputType>Exe</OutputType>
+                    <TargetFramework>net11.0</TargetFramework>
+                    <Nullable>disable</Nullable>
+                    <PublishAot>false</PublishAot>
+                    <Custom>1</Custom>
+                    <ImplicitUsings>disable</ImplicitUsings>
+                  </PropertyGroup>
+
+                </Project>
+
+                """,
+            expectedCSharp: """
+                Console.WriteLine();
+                """);
+    }
+
     [Fact]
     public void Directives_Variable()
     {
diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
index 98b62c75dd06..664002da2077 100644
--- a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
+++ b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
@@ -1858,7 +1858,6 @@ public void Api()
 
                       <PropertyGroup>
                         <OutputType>Exe</OutputType>
-                        <TargetFramework>{ToolsetInfo.CurrentTargetFramework}</TargetFramework>
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>

From 6c2e743c87fba9eb5df0e3d05ec6a73e89687b3b Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Wed, 16 Jul 2025 13:06:57 +0200
Subject: [PATCH 2/4] Clarify tests

---
 .../Project/Convert/DotnetProjectConvertTests.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
index 4456f08ee98d..be99d8fe6e81 100644
--- a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
+++ b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
@@ -635,7 +635,7 @@ public void Directives()
                 #!/program
                 #:sdk Microsoft.NET.Sdk
                 #:sdk Aspire.Hosting.Sdk@9.1.0
-                #:property TargetFramework=net11.0
+                #:property TargetFramework=net472
                 #:package System.CommandLine@2.0.0-beta4.22272.1
                 #:property LangVersion=preview
                 Console.WriteLine();
@@ -653,7 +653,7 @@ public void Directives()
                   </PropertyGroup>
 
                   <PropertyGroup>
-                    <TargetFramework>net11.0</TargetFramework>
+                    <TargetFramework>net472</TargetFramework>
                     <LangVersion>preview</LangVersion>
                   </PropertyGroup>
 
@@ -680,7 +680,7 @@ public void Directives_AllDefaultOverridden()
                 #!/program
                 #:sdk Microsoft.NET.Web.Sdk
                 #:property OutputType=Exe
-                #:property TargetFramework=net11.0
+                #:property TargetFramework=net472
                 #:property Nullable=disable
                 #:property PublishAot=false
                 #:property Custom=1
@@ -692,7 +692,7 @@ public void Directives_AllDefaultOverridden()
 
                   <PropertyGroup>
                     <OutputType>Exe</OutputType>
-                    <TargetFramework>net11.0</TargetFramework>
+                    <TargetFramework>net472</TargetFramework>
                     <Nullable>disable</Nullable>
                     <PublishAot>false</PublishAot>
                     <Custom>1</Custom>

From a595df9ddd2437f6fe4e34fe20ae46710b349546 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Tue, 22 Jul 2025 11:36:35 +0200
Subject: [PATCH 3/4] Merge all property groups

---
 .../Run/VirtualProjectBuildingCommand.cs      | 52 ++++++++-----------
 .../Convert/DotnetProjectConvertTests.cs      | 24 ---------
 .../CommandTests/Run/RunFileTests.cs          | 21 --------
 3 files changed, 21 insertions(+), 76 deletions(-)

diff --git a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
index 5fcfac82dd8c..14a4c122e5e9 100644
--- a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
+++ b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
@@ -657,38 +657,31 @@ public static void WriteProjectFile(
             writer.WriteLine();
         }
 
-        // Write default properties unless they are overridden by custom directives.
-        var propertyDirectiveNames = propertyDirectives.Select(d => d.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
-        if (!s_defaultProperties.Keys.All(propertyDirectiveNames.Contains))
+        // Write default and custom properties.
         {
             writer.WriteLine("  <PropertyGroup>");
+
+            // First write the default properties except those specified by the user.
+            var customPropertyNames = propertyDirectives.Select(d => d.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
             foreach (var (name, value) in s_defaultProperties)
             {
-                if (!propertyDirectiveNames.Contains(name))
+                if (!customPropertyNames.Contains(name))
                 {
                     writer.WriteLine($"""
                             <{name}>{EscapeValue(value)}</{name}>
                         """);
                 }
             }
-            writer.WriteLine("  </PropertyGroup>");
-            writer.WriteLine();
-        }
-
-        if (isVirtualProject)
-        {
-            writer.WriteLine("""
-                  <PropertyGroup>
-                    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-                  </PropertyGroup>
 
-                """);
-        }
-
-        if (propertyDirectives.Any())
-        {
-            writer.WriteLine("  <PropertyGroup>");
+            // Write virtual-only properties.
+            if (isVirtualProject)
+            {
+                writer.WriteLine("""
+                        <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+                    """);
+            }
 
+            // Write custom properties.
             foreach (var property in propertyDirectives)
             {
                 writer.WriteLine($"""
@@ -698,21 +691,18 @@ public static void WriteProjectFile(
                 processedDirectives++;
             }
 
+            // Write virtual-only properties which cannot be overridden.
+            if (isVirtualProject)
+            {
+                writer.WriteLine("""
+                        <Features>$(Features);FileBasedProgram</Features>
+                    """);
+            }
+
             writer.WriteLine("  </PropertyGroup>");
             writer.WriteLine();
         }
 
-        if (isVirtualProject)
-        {
-            // After `#:property` directives so they don't override this.
-            writer.WriteLine("""
-                  <PropertyGroup>
-                    <Features>$(Features);FileBasedProgram</Features>
-                  </PropertyGroup>
-
-                """);
-        }
-
         if (packageDirectives.Any())
         {
             writer.WriteLine("  <ItemGroup>");
diff --git a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
index be99d8fe6e81..4c7e48f6429c 100644
--- a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
+++ b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
@@ -650,9 +650,6 @@ public void Directives()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <TargetFramework>net472</TargetFramework>
                     <LangVersion>preview</LangVersion>
                   </PropertyGroup>
@@ -724,9 +721,6 @@ public void Directives_Variable()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <MyProp>MyValue</MyProp>
                   </PropertyGroup>
 
@@ -802,9 +796,6 @@ public void Directives_Separators()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <Prop1>One=a/b</Prop1>
                     <Prop2>Two/a=b</Prop2>
                   </PropertyGroup>
@@ -914,9 +905,6 @@ public void Directives_Escaping()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <Prop>&lt;test&quot;&gt;</Prop>
                   </PropertyGroup>
 
@@ -951,9 +939,6 @@ public void Directives_Whitespace()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <Name>Value</Name>
                     <NugetPackageDescription>&quot;My package with spaces&quot;</NugetPackageDescription>
                   </PropertyGroup>
@@ -998,9 +983,6 @@ public void Directives_AfterToken()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <Prop1>1</Prop1>
                     <Prop2>2</Prop2>
                   </PropertyGroup>
@@ -1047,9 +1029,6 @@ public void Directives_AfterIf()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <Prop1>1</Prop1>
                     <Prop2>2</Prop2>
                   </PropertyGroup>
@@ -1093,9 +1072,6 @@ public void Directives_Comments()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
-                  </PropertyGroup>
-
-                  <PropertyGroup>
                     <Prop1>1</Prop1>
                     <Prop2>2</Prop2>
                   </PropertyGroup>
diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
index 664002da2077..3467b480a2c3 100644
--- a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
+++ b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
@@ -1861,18 +1861,9 @@ public void Api()
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <TargetFramework>net11.0</TargetFramework>
                         <LangVersion>preview</LangVersion>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <Features>$(Features);FileBasedProgram</Features>
                       </PropertyGroup>
 
@@ -1939,13 +1930,7 @@ public void Api_Diagnostic_01()
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <Features>$(Features);FileBasedProgram</Features>
                       </PropertyGroup>
 
@@ -2011,13 +1996,7 @@ public void Api_Diagnostic_02()
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-                      </PropertyGroup>
-
-                      <PropertyGroup>
                         <Features>$(Features);FileBasedProgram</Features>
                       </PropertyGroup>
 

From 2c29c3c4ee89fe05abd6a623fa6a18ef7694ffa2 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Tue, 22 Jul 2025 11:40:38 +0200
Subject: [PATCH 4/4] Unify writing code style

---
 .../Run/VirtualProjectBuildingCommand.cs      | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
index 14a4c122e5e9..ee9092628ff5 100644
--- a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
+++ b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
@@ -659,7 +659,9 @@ public static void WriteProjectFile(
 
         // Write default and custom properties.
         {
-            writer.WriteLine("  <PropertyGroup>");
+            writer.WriteLine("""
+                  <PropertyGroup>
+                """);
 
             // First write the default properties except those specified by the user.
             var customPropertyNames = propertyDirectives.Select(d => d.Name).ToHashSet(StringComparer.OrdinalIgnoreCase);
@@ -699,13 +701,17 @@ public static void WriteProjectFile(
                     """);
             }
 
-            writer.WriteLine("  </PropertyGroup>");
-            writer.WriteLine();
+            writer.WriteLine("""
+                  </PropertyGroup>
+
+                """);
         }
 
         if (packageDirectives.Any())
         {
-            writer.WriteLine("  <ItemGroup>");
+            writer.WriteLine("""
+                  <ItemGroup>
+                """);
 
             foreach (var package in packageDirectives)
             {
@@ -725,13 +731,17 @@ public static void WriteProjectFile(
                 processedDirectives++;
             }
 
-            writer.WriteLine("  </ItemGroup>");
-            writer.WriteLine();
+            writer.WriteLine("""
+                  </ItemGroup>
+
+                """);
         }
 
         if (projectDirectives.Any())
         {
-            writer.WriteLine("  <ItemGroup>");
+            writer.WriteLine("""
+                  <ItemGroup>
+                """);
 
             foreach (var projectReference in projectDirectives)
             {
@@ -742,8 +752,10 @@ public static void WriteProjectFile(
                 processedDirectives++;
             }
 
-            writer.WriteLine("  </ItemGroup>");
-            writer.WriteLine();
+            writer.WriteLine("""
+                  </ItemGroup>
+
+                """);
         }
 
         Debug.Assert(processedDirectives + directives.OfType<CSharpDirective.Shebang>().Count() == directives.Length);
@@ -763,12 +775,12 @@ public static void WriteProjectFile(
             {
                 var targetDirectory = Path.GetDirectoryName(targetFilePath) ?? "";
                 writer.WriteLine($"""
-                  <ItemGroup>
-                    <RuntimeHostConfigurationOption Include="EntryPointFilePath" Value="{EscapeValue(targetFilePath)}" />
-                    <RuntimeHostConfigurationOption Include="EntryPointFileDirectoryPath" Value="{EscapeValue(targetDirectory)}" />
-                  </ItemGroup>
+                      <ItemGroup>
+                        <RuntimeHostConfigurationOption Include="EntryPointFilePath" Value="{EscapeValue(targetFilePath)}" />
+                        <RuntimeHostConfigurationOption Include="EntryPointFileDirectoryPath" Value="{EscapeValue(targetDirectory)}" />
+                      </ItemGroup>
 
-                """);
+                    """);
             }
 
             foreach (var sdk in sdkDirectives)
@@ -784,12 +796,16 @@ public static void WriteProjectFile(
                     """);
             }
 
-            writer.WriteLine();
-            writer.WriteLine(TargetOverrides);
-            writer.WriteLine();
+            writer.WriteLine($"""
+
+                {TargetOverrides}
+
+                """);
         }
 
-        writer.WriteLine("</Project>");
+        writer.WriteLine("""
+            </Project>
+            """);
 
         static string EscapeValue(string value) => SecurityElement.Escape(value);