(#509) Get pack compiling

This gets pack working, if the package is using the NuGet compatible schema without the added Chocolatey specific elements
chocolatey · Jun 17, 2022 · 8b2cd72 · 8b2cd72
1 parent 8d91810
commit 8b2cd72
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/src/chocolatey/infrastructure.app/nuget/DictionaryPropertyProvider.cs b/src/chocolatey/infrastructure.app/nuget/DictionaryPropertyProvider.cs
@@ -21,7 +21,7 @@ namespace chocolatey.infrastructure.app.nuget
 
     // ReSharper disable InconsistentNaming
 
-    public sealed class DictionaryPropertyProvider : IPropertyProvider
+    public sealed class DictionaryPropertyProvider
     {
         private readonly IDictionary<string, string> _properties;
 
@@ -30,7 +30,7 @@ public DictionaryPropertyProvider(IDictionary<string, string> properties)
             _properties = properties;
         }
 
-        public dynamic GetPropertyValue(string propertyName)
+        public string GetPropertyValue(string propertyName)
         {
             string value;
             if (_properties.TryGetValue(propertyName, out value))

diff --git a/src/chocolatey/infrastructure.app/nuget/NugetPack.cs b/src/chocolatey/infrastructure.app/nuget/NugetPack.cs
@@ -20,7 +20,6 @@ namespace chocolatey.infrastructure.app.nuget
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using NuGet;
     using IFileSystem = filesystem.IFileSystem;
     using chocolatey.infrastructure.platforms;
     using NuGet.Common;
@@ -31,9 +30,10 @@ namespace chocolatey.infrastructure.app.nuget
 
     public sealed class NugetPack
     {
-        public static IPackage BuildPackage(PackageBuilder builder, IFileSystem fileSystem, string outputPath = null)
+        public static bool BuildPackage(PackageBuilder builder, IFileSystem fileSystem, string outputPath)
         {
             ExcludeFiles(builder.Files);
+
             // Track if the package file was already present on disk
             bool isExistingPackage = fileSystem.file_exists(outputPath);
             try
@@ -57,7 +57,7 @@ public static IPackage BuildPackage(PackageBuilder builder, IFileSystem fileSyst
                 throw;
             }
 
-            return new OptimizedZipPackage(outputPath);
+            return true;
         }
 
         private static void ExcludeFiles(ICollection<IPackageFile> packageFiles)
@@ -67,7 +67,7 @@ private static void ExcludeFiles(ICollection<IPackageFile> packageFiles)
             // manifest file.
             var filter = Platform.get_platform() == PlatformType.Windows ? @"**\*" : "**/*";
             var excludes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            var wildCards = excludes.Concat(new[] { filter + Constants.ManifestExtension, filter + Constants.PackageExtension });
+            var wildCards = excludes.Concat(new[] { filter + PackagingConstants.ManifestExtension, filter + NuGetConstants.PackageExtension });
 
             PathResolver.FilterPackageFiles(packageFiles, ResolvePath, wildCards);
         }

diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -263,7 +263,7 @@ public virtual string validate_and_return_package_file(ChocolateyConfiguration c
 
         public virtual void pack_run(ChocolateyConfiguration config)
         {
-            var nuspecFilePath = validate_and_return_package_file(config, Constants.ManifestExtension);
+            var nuspecFilePath = validate_and_return_package_file(config, PackagingConstants.ManifestExtension);
             var nuspecDirectory = _fileSystem.get_full_path(_fileSystem.get_directory_name(nuspecFilePath));
             if (string.IsNullOrWhiteSpace(nuspecDirectory)) nuspecDirectory = _fileSystem.get_current_directory();
 
@@ -292,23 +292,30 @@ public virtual void pack_run(ChocolateyConfiguration config)
             // Initialize the property provider based on what was passed in using the properties flag
             var propertyProvider = new DictionaryPropertyProvider(properties);
 
-            var builder = new PackageBuilder(nuspecFilePath, nuspecDirectory, propertyProvider, includeEmptyDirectories: true);
+            //Allows empty directories to be distributed in templates via .template packages, issue #1003
+            bool includeEmptyDirectories = true;
+            //No need to be deterministic, it's ok to include timestamps 
+            bool deterministic = false;
+
+            var builder = new PackageBuilder(nuspecFilePath, nuspecDirectory, propertyProvider.GetPropertyValue, includeEmptyDirectories, deterministic, _nugetLogger);
             if (!string.IsNullOrWhiteSpace(config.Version))
             {
-                builder.Version = new SemanticVersion(config.Version);
+                builder.Version = new NuGetVersion(config.Version);
             }
-
-            string outputFile = builder.Id + "." + builder.Version + Constants.PackageExtension;
+            
+            string outputFile = builder.Id + "." + builder.Version + NuGetConstants.PackageExtension;
             string outputFolder = config.OutputDirectory ?? _fileSystem.get_current_directory();
             string outputPath = _fileSystem.combine_paths(outputFolder, outputFile);
 
             config.Sources = outputFolder;
 
             this.Log().Info(config.QuietOutput ? ChocolateyLoggers.LogFileOnly : ChocolateyLoggers.Normal, () => "Attempting to build package from '{0}'.".format_with(_fileSystem.get_file_name(nuspecFilePath)));
+
+            _fileSystem.create_directory_if_not_exists(outputFolder);
 
-            IPackage package = NugetPack.BuildPackage(builder, _fileSystem, outputPath);
+            var createdPackage = NugetPack.BuildPackage(builder, _fileSystem, outputPath);
             // package.Validate().Any(v => v.Level == PackageIssueLevel.Error)
-            if (package == null)
+            if (!createdPackage)
             {
                 throw new ApplicationException("Unable to create nupkg. See the log for error details.");
             }