From 17bae2d52bea7435b3ca62f94d90d7aa2f95a526 Mon Sep 17 00:00:00 2001 From: Charlie Poole Date: Fri, 10 Jan 2025 11:42:22 -0800 Subject: [PATCH] Update zip packaging --- .github/workflows/publish-recipe.yml | 2 +- recipe/recipe-package.cake | 1 + recipe/zip-package.cake | 9 +-------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-recipe.yml b/.github/workflows/publish-recipe.yml index 7262e54..5c223e7 100644 --- 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 index 2e0c66b..7076858 100644 --- 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); } } \ No newline at end of file diff --git a/recipe/zip-package.cake b/recipe/zip-package.cake index 37fe031..15e249f 100644 --- 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); } }