Add an option not to repack assemblies

realm · Jun 28, 2021 · 4663d80 · 4663d80
1 parent 415a8f0
commit 4663d80
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/Tools/SetupUnityPackage/CommandLineOptions/OptionsBase.cs b/Tools/SetupUnityPackage/CommandLineOptions/OptionsBase.cs
@@ -17,11 +17,15 @@
 ////////////////////////////////////////////////////////////////////////////
 
 using System.Collections.Generic;
+using CommandLine;
 
 namespace SetupUnityPackage
 {
     internal abstract class OptionsBase
     {
+        [Option("no-ilrepack", Default = true, Required = false, HelpText = "Specify whether to skip bundling dependencies into the main package. This should not be used for release builds")]
+        public bool NoRepack { get; set; }
+
         public abstract PackageInfo[] Files { get; }
 
         public abstract string PackageBasePath { get; }

diff --git a/Tools/SetupUnityPackage/Helpers.cs b/Tools/SetupUnityPackage/Helpers.cs
@@ -49,7 +49,7 @@ public static void CopyFiles(string from, string to, Func<string, bool> shouldIn
             foreach (var file in testFiles)
             {
                 var relativePath = Path.GetRelativePath(from, file);
-                if (shouldIncludeFile != null && !shouldIncludeFile(relativePath))
+                if (shouldIncludeFile?.Invoke(relativePath) == false)
                 {
                     continue;
                 }

diff --git a/Tools/SetupUnityPackage/Program.cs b/Tools/SetupUnityPackage/Program.cs
@@ -173,20 +173,29 @@ private static async Task CopyDependencies(OptionsBase opts, Queue<PackageDepend
                 }
             }
 
-            var assembliesToRepack = new List<string> { Path.Combine(opts.PackageBasePath, opts.MainPackagePath) };
-            assembliesToRepack.AddRange(Directory.EnumerateFiles(tempPath));
+            if (opts.NoRepack)
+            {
+                var targetFolder = Path.Combine(opts.PackageBasePath, Path.GetDirectoryName(opts.MainPackagePath), "Dependencies");
 
-            var repack = new ILRepack(new RepackOptions
+                Helpers.CopyFiles(tempPath, targetFolder);
+            }
+            else
             {
-                InputAssemblies = assembliesToRepack.ToArray(),
-                Internalize = true,
-                OutputFile = assembliesToRepack[0],
-                SearchDirectories = searchDirectories,
-                XmlDocumentation = false,
-                ExcludeInternalizeMatches = { new Regex("MongoDB\\.Bson") }
-            });
+                var assembliesToRepack = new List<string> { Path.Combine(opts.PackageBasePath, opts.MainPackagePath) };
+                assembliesToRepack.AddRange(Directory.EnumerateFiles(tempPath));
 
-            repack.Repack();
+                var repack = new ILRepack(new RepackOptions
+                {
+                    InputAssemblies = assembliesToRepack.ToArray(),
+                    Internalize = true,
+                    OutputFile = assembliesToRepack[0],
+                    SearchDirectories = searchDirectories,
+                    XmlDocumentation = false,
+                    ExcludeInternalizeMatches = { new Regex("MongoDB\\.Bson") }
+                });
+
+                repack.Repack();
+            }
 
             Directory.Delete(tempPath, recursive: true);
         }