From 7f95687e5ea79409282d112d93889715403802e4 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Fri, 22 Aug 2025 11:07:50 +0200
Subject: [PATCH] Pack file-based apps as tools by default

---
 .../Run/VirtualProjectBuildingCommand.cs      |  1 +
 .../Convert/DotnetProjectConvertTests.cs      | 25 +++++++++++++++++--
 .../CommandTests/Run/RunFileTests.cs          |  5 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
index 632fc6f86541..3bcabeab3287 100644
--- a/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
+++ b/src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs
@@ -82,6 +82,7 @@ internal sealed class VirtualProjectBuildingCommand : CommandBase
         new("ImplicitUsings", "enable"),
         new("Nullable", "enable"),
         new("PublishAot", "true"),
+        new("PackAsTool", "true"),
     ]);
 
     /// <summary>
diff --git a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
index 507d36c0da98..34adc6ac9d1a 100644
--- a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
+++ b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
@@ -58,9 +58,13 @@ public void SameAsTemplate()
         var dotnetProjectConvertProjectText = File.ReadAllText(dotnetProjectConvertProject);
         var dotnetNewConsoleProjectText = File.ReadAllText(dotnetNewConsoleProject);
 
-        // There are some differences: we add PublishAot=true and UserSecretsId.
+        // There are some differences: we add PublishAot=true, PackAsTool=true, and UserSecretsId.
         var patchedDotnetProjectConvertProjectText = dotnetProjectConvertProjectText
-            .Replace("    <PublishAot>true</PublishAot>" + Environment.NewLine, string.Empty);
+            .Replace("""
+                    <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
+
+                """, string.Empty);
         patchedDotnetProjectConvertProjectText = Regex.Replace(patchedDotnetProjectConvertProjectText,
             """    <UserSecretsId>[^<]*<\/UserSecretsId>""" + Environment.NewLine, string.Empty);
 
@@ -661,6 +665,7 @@ public void ProcessingSucceeds()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <UserSecretsId>Program-*</UserSecretsId>
                   </PropertyGroup>
 
@@ -708,6 +713,7 @@ public void UserSecretsId_Overridden_ViaDirective(bool hasDirectiveBuildProps)
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <UserSecretsId>MyIdFromDirective</UserSecretsId>
                   </PropertyGroup>
 
@@ -747,6 +753,7 @@ public void UserSecretsId_Overridden_ViaDirectoryBuildProps()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                   </PropertyGroup>
 
                 </Project>
@@ -791,6 +798,7 @@ public void UserSecretsId_Overridden_SameAsImplicit(bool hasDirective, bool hasD
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <UserSecretsId>{(hasDirective ? SecurityElement.Escape(implicitValue) : "Program-*")}</UserSecretsId>
                   </PropertyGroup>
 
@@ -822,6 +830,7 @@ public void Directives()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <TargetFramework>net472</TargetFramework>
                     <LangVersion>preview</LangVersion>
                   </PropertyGroup>
@@ -852,6 +861,7 @@ public void Directives_AllDefaultOverridden()
                 #:property TargetFramework=net472
                 #:property Nullable=disable
                 #:property PublishAot=false
+                #:property PackAsTool=false
                 #:property Custom=1
                 #:property ImplicitUsings=disable
                 Console.WriteLine();
@@ -864,6 +874,7 @@ public void Directives_AllDefaultOverridden()
                     <TargetFramework>net472</TargetFramework>
                     <Nullable>disable</Nullable>
                     <PublishAot>false</PublishAot>
+                    <PackAsTool>false</PackAsTool>
                     <Custom>1</Custom>
                     <ImplicitUsings>disable</ImplicitUsings>
                   </PropertyGroup>
@@ -893,6 +904,7 @@ public void Directives_Variable()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <MyProp>MyValue</MyProp>
                   </PropertyGroup>
 
@@ -930,6 +942,7 @@ public void Directives_DirectoryPath()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                   </PropertyGroup>
 
                   <ItemGroup>
@@ -968,6 +981,7 @@ public void Directives_Separators()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <Prop1>One=a/b</Prop1>
                     <Prop2>Two/a=b</Prop2>
                   </PropertyGroup>
@@ -1077,6 +1091,7 @@ public void Directives_Escaping()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <Prop>&lt;test&quot;&gt;</Prop>
                   </PropertyGroup>
 
@@ -1111,6 +1126,7 @@ public void Directives_Whitespace()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <Name>Value</Name>
                     <NugetPackageDescription>&quot;My package with spaces&quot;</NugetPackageDescription>
                   </PropertyGroup>
@@ -1137,6 +1153,7 @@ public void Directives_BlankLines()
                 <ImplicitUsings>enable</ImplicitUsings>
                 <Nullable>enable</Nullable>
                 <PublishAot>true</PublishAot>
+                <PackAsTool>true</PackAsTool>
               </PropertyGroup>
 
               <ItemGroup>
@@ -1202,6 +1219,7 @@ public void Directives_AfterToken()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <Prop1>1</Prop1>
                     <Prop2>2</Prop2>
                   </PropertyGroup>
@@ -1248,6 +1266,7 @@ public void Directives_AfterIf()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <Prop1>1</Prop1>
                     <Prop2>2</Prop2>
                   </PropertyGroup>
@@ -1291,6 +1310,7 @@ public void Directives_Comments()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                     <Prop1>1</Prop1>
                     <Prop2>2</Prop2>
                   </PropertyGroup>
@@ -1398,6 +1418,7 @@ public void Directives_VersionedSdkFirst()
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <PublishAot>true</PublishAot>
+                    <PackAsTool>true</PackAsTool>
                   </PropertyGroup>
 
                 </Project>
diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
index 3ecc85f05580..634ed52a3e46 100644
--- a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
+++ b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
@@ -1695,7 +1695,6 @@ public void Pack()
         var testInstance = _testAssetsManager.CreateTestDirectory();
         var programFile = Path.Join(testInstance.Path, "MyFileBasedTool.cs");
         File.WriteAllText(programFile, """
-            #:property PackAsTool=true
             Console.WriteLine($"Hello; EntryPointFilePath set? {AppContext.GetData("EntryPointFilePath") is string}");
             #if !DEBUG
             Console.WriteLine("Release config");
@@ -1742,7 +1741,6 @@ public void Pack_CustomPath()
         var testInstance = _testAssetsManager.CreateTestDirectory();
         var programFile = Path.Join(testInstance.Path, "MyFileBasedTool.cs");
         File.WriteAllText(programFile, """
-            #:property PackAsTool=true
             #:property PackageOutputPath=custom
             Console.WriteLine($"Hello; EntryPointFilePath set? {AppContext.GetData("EntryPointFilePath") is string}");
             """);
@@ -3309,6 +3307,7 @@ public void Api()
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>
+                        <PackAsTool>true</PackAsTool>
                         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
                         <DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
                         <RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
@@ -3379,6 +3378,7 @@ public void Api_Diagnostic_01()
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>
+                        <PackAsTool>true</PackAsTool>
                         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
                         <DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
                         <RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
@@ -3446,6 +3446,7 @@ public void Api_Diagnostic_02()
                         <ImplicitUsings>enable</ImplicitUsings>
                         <Nullable>enable</Nullable>
                         <PublishAot>true</PublishAot>
+                        <PackAsTool>true</PackAsTool>
                         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
                         <DisableDefaultItemsInProjectFolder>true</DisableDefaultItemsInProjectFolder>
                         <RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>