Merge pull request #182 from nygula/master

PublishFolderCleaner增加排除命令参数

Author: lindexi

PublishFolderCleaner/PublishFolderCleaner.NuGet/Assets/package.targets

@@ -2,7 +2,7 @@
   <Target Name="MoveThePublishFolderToLibFolder" AfterTargets="Publish">
 
     <PropertyGroup>
-      <PublishFolderCleanerCommandArgs>dotnet "$(MSBuildThisFileDirectory)..\tools\net6.0\PublishFolderCleaner.dll" -p "$(PublishDir) " -a "$(AssemblyName)"</PublishFolderCleanerCommandArgs>
+      <PublishFolderCleanerCommandArgs>dotnet "$(MSBuildThisFileDirectory)..\tools\net6.0\PublishFolderCleaner.dll" -p "$(PublishDir) " -a "$(AssemblyName)" -e "$(PublishFolderCleanerExcludeFiles)"</PublishFolderCleanerCommandArgs>
     </PropertyGroup>
 
     <Exec Command="$(PublishFolderCleanerCommandArgs)"></Exec>

PublishFolderCleaner/PublishFolderCleaner/Options.cs

@@ -9,5 +9,8 @@ public class Options
 
         [Option('a', "ApplicationName")]
         public string ApplicationName { set; get; } = null!;
+
+        [Option('e', "Exclude")]
+        public string Exclude { set; get; } = "";
     }
 }

PublishFolderCleaner/PublishFolderCleaner/Program.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using dotnetCampus.Cli;
 
 namespace PublishFolderCleaner
@@ -13,10 +14,39 @@ static void Main(string[] args)
             const string libFolderName = "lib";
             var publishFolder = options.PublishFolder.Trim();
             var libFolder = Path.GetFullPath(Path.Combine(publishFolder, libFolderName));
-            var tempFolder = Path.GetFullPath(Path.Combine(publishFolder, @"..", Path.GetRandomFileName()));
-            Directory.Move(publishFolder, tempFolder);
-            Directory.CreateDirectory(publishFolder);
-            Directory.Move(tempFolder, libFolder);
+
+            Directory.CreateDirectory(libFolder);
+
+            var excludeItems = options.Exclude
+                .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(e => e.Trim())
+                .Where(e => !string.IsNullOrEmpty(e))
+                .ToList();
+
+            var entries = Directory.GetFileSystemEntries(publishFolder);
+            foreach (var entry in entries)
+            {
+                var name = Path.GetFileName(entry);
+                if (name.Equals(libFolderName, StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                if (ShouldExclude(name, excludeItems))
+                {
+                    continue;
+                }
+
+                var dest = Path.Combine(libFolder, name);
+                if (File.Exists(entry))
+                {
+                    File.Move(entry, dest);
+                }
+                else if (Directory.Exists(entry))
+                {
+                    Directory.Move(entry, dest);
+                }
+            }
 
             var appHostFilePath = Path.Combine(libFolder, options.ApplicationName + ".exe");
             var newAppHostFilePath = Path.Combine(publishFolder, options.ApplicationName + ".exe");
@@ -25,5 +55,12 @@ static void Main(string[] args)
 
             AppHostPatcher.Patch(newAppHostFilePath, Path.Combine("lib", options.ApplicationName + ".dll"));
         }
+
+        static bool ShouldExclude(string name, System.Collections.Generic.List<string> excludeItems)
+        {
+            return excludeItems.Any(e =>
+                name.Equals(e, StringComparison.OrdinalIgnoreCase) ||
+                name.Equals(e.TrimStart('.'), StringComparison.OrdinalIgnoreCase));
+        }
     }
 }