Update: Ensure we don't create stub for generated stub executables

Squirrel · Jul 30, 2018 · e44d14f · e44d14f
1 parent 250fe4c
commit e44d14f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,7 @@ local.properties
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+.vs
 
 # User-specific files
 *.suo

diff --git a/src/Squirrel/Utility.cs b/src/Squirrel/Utility.cs
@@ -74,7 +74,14 @@ public static IEnumerable<FileInfo> GetAllFilesRecursively(this DirectoryInfo ro
         {
             Contract.Requires(rootPath != null);
 
-            return rootPath.EnumerateFiles("*", SearchOption.AllDirectories);
+            return rootPath.GetAllFilesRecursively("*");
+        }
+
+        public static IEnumerable<FileInfo> GetAllFilesRecursively(this DirectoryInfo rootPath, string searchPattern)
+        {
+            Contract.Requires(rootPath != null);
+
+            return rootPath.EnumerateFiles(searchPattern, SearchOption.AllDirectories);
         }
 
         public static IEnumerable<string> GetAllFilePathsRecursively(string rootPath)

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -392,13 +392,14 @@ public void Releasify(string package, string targetDir = null, string packagesDi
 
                 var rp = new ReleasePackage(file.FullName);
                 rp.CreateReleasePackage(Path.Combine(di.FullName, rp.SuggestedReleaseFileName), packagesDir, contentsPostProcessHook: pkgPath => {
-                    new DirectoryInfo(pkgPath).GetAllFilesRecursively()
-                        .Where(x => x.Name.ToLowerInvariant().EndsWith(".exe"))
-                        .Where(x => !x.Name.ToLowerInvariant().Contains("squirrel.exe"))
-                        .Where(x => Utility.IsFileTopLevelInPackage(x.FullName, pkgPath))
-                        .Where(x => Utility.ExecutableUsesWin32Subsystem(x.FullName))
-                        .ForEachAsync(x => createExecutableStubForExe(x.FullName))
-                        .Wait();
+                    new DirectoryInfo(pkgPath)
+                                    .GetAllFilesRecursively("*.exe")
+                                    .Where(x => !x.Name.ToLowerInvariant().Contains("squirrel.exe"))
+                                    .Where(x => Utility.IsFileTopLevelInPackage(x.FullName, pkgPath))
+                                    .Where(x => Utility.ExecutableUsesWin32Subsystem(x.FullName))
+                                    .ToList()
+                                    .ForEachAsync(x => createExecutableStubForExe(x.FullName))
+                                    .Wait();
 
                     if (signingOpts == null) return;