Clean also build markers

Author: jjonescz

src/Cli/dotnet/Commands/Clean/CleanCommand.cs

@@ -45,6 +45,7 @@ public static CommandBase FromParseResult(ParseResult result, string? msbuildPat
                 NoRestore = true,
                 NoCache = true,
                 BuildTarget = "Clean",
+                NoBuildMarkers = true,
             };
         }
 

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

@@ -131,6 +131,12 @@ public VirtualProjectBuildingCommand(
     public bool NoBuild { get; init; }
     public string BuildTarget { get; init; } = "Build";
 
+    /// <summary>
+    /// If <see langword="true"/>, no build markers are written
+    /// (like <see cref="BuildStartCacheFileName"/> and <see cref="BuildSuccessCacheFileName"/>).
+    /// </summary>
+    public bool NoBuildMarkers { get; init; }
+
     public override int Execute()
     {
         Debug.Assert(!(NoRestore && NoBuild));
@@ -402,6 +408,11 @@ Building because previous global properties count ({previousCacheEntry.GlobalPro
 
     private void MarkBuildStart()
     {
+        if (NoBuildMarkers)
+        {
+            return;
+        }
+
         string directory = GetArtifactsPath();
 
         if (OperatingSystem.IsWindows())
@@ -421,6 +432,11 @@ private void MarkBuildStart()
 
     private void MarkBuildSuccess(RunFileBuildCacheEntry cacheEntry)
     {
+        if (NoBuildMarkers)
+        {
+            return;
+        }
+
         string successCacheFile = Path.Join(GetArtifactsPath(), BuildSuccessCacheFileName);
         using var stream = File.Open(successCacheFile, FileMode.Create, FileAccess.Write, FileShare.None);
         JsonSerializer.Serialize(stream, cacheEntry, RunFileJsonSerializerContext.Default.RunFileBuildCacheEntry);
@@ -530,6 +546,9 @@ public static void WriteProjectFile(
         {
             Debug.Assert(!string.IsNullOrWhiteSpace(artifactsPath));
 
+            // Note that ArtifactsPath needs to be specified before Sdk.props
+            // (usually it's recommended to specify it in Directory.Build.props
+            // but importing Sdk.props manually afterwards also works).
             writer.WriteLine($"""
                 <Project>
 
@@ -538,6 +557,10 @@ public static void WriteProjectFile(
                     <ArtifactsPath>{EscapeValue(artifactsPath)}</ArtifactsPath>
                   </PropertyGroup>
 
+                  <ItemGroup>
+                    <Clean Include="{EscapeValue(artifactsPath)}/*" />
+                  </ItemGroup>
+
                   <!-- We need to explicitly import Sdk props/targets so we can override the targets below. -->
                   <Import Project="Sdk.props" Sdk="{EscapeValue(sdkValue)}" />
                 """);

test/dotnet.Tests/CommandTests/Run/RunFileTests.cs

@@ -1030,15 +1030,19 @@ public void Clean()
             .Should().Pass()
             .And.HaveStdOut("Hello from Program");
 
-        var artifactsDir = VirtualProjectBuildingCommand.GetArtifactsPath(programFile);
-        var dllFile = new FileInfo(Path.Join(artifactsDir, "bin", "debug", "Program.dll"));
+        var artifactsDir = new DirectoryInfo(VirtualProjectBuildingCommand.GetArtifactsPath(programFile));
+        artifactsDir.Should().HaveFiles(["build-start.cache", "build-success.cache"]);
+
+        var dllFile = artifactsDir.File("bin/debug/Program.dll");
         dllFile.Should().Exist();
 
         new DotnetCommand(Log, "clean", "Program.cs")
             .WithWorkingDirectory(testInstance.Path)
             .Execute()
             .Should().Pass();
 
+        artifactsDir.EnumerateFiles().Should().BeEmpty();
+
         dllFile.Refresh();
         dllFile.Should().NotExist();
     }
@@ -1517,6 +1521,10 @@ public void Api()
                         <ArtifactsPath>/artifacts</ArtifactsPath>
                       </PropertyGroup>
 
+                      <ItemGroup>
+                        <Clean Include="/artifacts/*" />
+                      </ItemGroup>
+
                       <!-- We need to explicitly import Sdk props/targets so we can override the targets below. -->
                       <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
                       <Import Project="Sdk.props" Sdk="Aspire.Hosting.Sdk" Version="9.1.0" />
@@ -1591,6 +1599,10 @@ public void Api_Diagnostic_01()
                         <ArtifactsPath>/artifacts</ArtifactsPath>
                       </PropertyGroup>
 
+                      <ItemGroup>
+                        <Clean Include="/artifacts/*" />
+                      </ItemGroup>
+
                       <!-- We need to explicitly import Sdk props/targets so we can override the targets below. -->
                       <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
@@ -1658,6 +1670,10 @@ public void Api_Diagnostic_02()
                         <ArtifactsPath>/artifacts</ArtifactsPath>
                       </PropertyGroup>
 
+                      <ItemGroup>
+                        <Clean Include="/artifacts/*" />
+                      </ItemGroup>
+
                       <!-- We need to explicitly import Sdk props/targets so we can override the targets below. -->
                       <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />