From 7eb0610df1fc7f61f2deea0da4ad6fec46ce77bd Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Wed, 5 Jun 2024 04:35:29 -0700 Subject: [PATCH] (#310) Fix path to chocolatey.lib files When progressing the release of 2.3.0, it was found that the chocolatey.lib nupkg didn't contain any files. This was due to a change in the folder structure which wasn't caught during testing. This commit fixes this folder structure, pointing directly to the chocolatey.lib folder, so that running nuget pack works as expected. There may be additional changes required to this portion of the build, to make sure that everything is being created in the same way, but that can be picked up post release/ --- recipe.cake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe.cake b/recipe.cake index 90b0dd3b1e..9bdbb6dc49 100644 --- a/recipe.cake +++ b/recipe.cake @@ -329,14 +329,14 @@ Task("Prepare-NuGet-Packages") .IsDependeeOf("Sign-Assemblies") .Does(() => { - CleanDirectory(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib"); - EnsureDirectoryExists(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/net48"); + CleanDirectory(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/chocolatey.lib/lib"); + EnsureDirectoryExists(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/chocolatey.lib/lib/net48"); // Copy legal documents - CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/CREDITS.txt"); + CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/chocolatey.lib/lib/CREDITS.txt"); - CopyFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey_merged/*", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/net48"); - CopyFile(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.xml", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/net48/chocolatey.xml"); + CopyFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey_merged/*", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/chocolatey.lib/lib/net48"); + CopyFile(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.xml", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/chocolatey.lib/lib/net48/chocolatey.xml"); }); Task("Prepare-MSI")