Merge pull request #56 from nunit/issue-55

Update zip packaging
nunit · Jan 10, 2025 · 5091c5d · 5091c5d
2 parents 2dcb530 + 17bae2d
commit 5091c5d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/publish-recipe.yml b/.github/workflows/publish-recipe.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish-recipe:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - name: ⤵️ Checkout Source

diff --git a/recipe/recipe-package.cake b/recipe/recipe-package.cake
@@ -40,6 +40,7 @@ public class RecipePackage : NuGetPackage
         foreach (FilePath filePath in _cakeFiles)
             settings.Files.Add(new NuSpecContent() { Source=$"recipe/{filePath}", Target="content" });
 
+        _context.Information("Calling NuGetPack");
         _context.NuGetPack(PackageSource, settings);
     }
 }
diff --git a/recipe/zip-package.cake b/recipe/zip-package.cake
@@ -65,13 +65,6 @@ public class ZipPackage : PackageDefinition
             BuildSettings.OutputDirectory,
             BuildSettings.ZipImageDirectory + "bin/" );
 
-        var addinsDir = BuildSettings.ZipImageDirectory + "bin/net462/addins/";
-        _context.CreateDirectory(addinsDir);
-
-        foreach (var packageDir in SIO.Directory.GetDirectories(BuildSettings.ExtensionsDirectory))
-        {
-            var files = _context.GetFiles(packageDir + "/tools/*").Concat(_context.GetFiles(packageDir + "/tools/net462/*"));
-            _context.CopyFiles(files.Where(f => f.GetExtension() != ".addins"), addinsDir);
-        }
+        _context.CopyDirectory(BuildSettings.ExtensionsDirectory, BuildSettings.ZipImageDirectory);
     }
 }