Browse Source

Fix build Clean target (#17531)

Julien Lebosquain 11 months ago
parent
commit
29232ff077
2 changed files with 5 additions and 2 deletions
  1. 0 1
      nukebuild/Build.cs
  2. 5 1
      nukebuild/BuildParameters.cs

+ 0 - 1
nukebuild/Build.cs

@@ -108,7 +108,6 @@ partial class Build : NukeBuild
     Target Clean => _ => _.Executes(() =>
     {
         Parameters.BuildDirs.ForEach(DeleteDirectory);
-        Parameters.BuildDirs.ForEach(EnsureCleanDirectory);
         EnsureCleanDirectory(Parameters.ArtifactsDir);
         EnsureCleanDirectory(Parameters.NugetIntermediateRoot);
         EnsureCleanDirectory(Parameters.NugetRoot);

+ 5 - 1
nukebuild/BuildParameters.cs

@@ -145,7 +145,11 @@ public partial class Build
             NugetIntermediateRoot = RootDirectory / "build-intermediate" / "nuget";
             ZipRoot = ArtifactsDir / "zip";
             TestResultsRoot = ArtifactsDir / "test-results";
-            BuildDirs = GlobDirectories(RootDirectory, "**bin").Concat(GlobDirectories(RootDirectory, "**obj")).ToList();
+            BuildDirs = GlobDirectories(RootDirectory, "**/bin")
+                .Concat(GlobDirectories(RootDirectory, "**/obj"))
+                .Where(dir => !dir.Contains("nukebuild"))
+                .Concat(GlobDirectories(RootDirectory, "**/node_modules"))
+                .ToList();
             DirSuffix = Configuration;
             FileZipSuffix = Version + ".zip";
             ZipCoreArtifacts = ZipRoot / ("Avalonia-" + FileZipSuffix);