Skip to content

Commit

Permalink
(#310) Fix path to chocolatey.lib files
Browse files Browse the repository at this point in the history
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/
  • Loading branch information
gep13 committed Jun 5, 2024
1 parent 604538f commit 7eb0610
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions recipe.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 7eb0610

Please sign in to comment.