Merge pull request chocolatey#2264 from TheCakeIsNaOH/pack-anywhere

(chocolatey#2263) Pack on Mono pass absolute path to PackageBuilder
AdmiringWorm · May 10, 2021 · aa8b18d · aa8b18d
2 parents 1046251 + 0c73a8e
commit aa8b18d
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -287,14 +287,7 @@ 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 basePath = nuspecDirectory;
-            if (config.Information.PlatformType != PlatformType.Windows)
-            {
-                //bug with nuspec and tools/** folder location on Windows.
-                basePath = "./";
-            }
-
-            var builder = new PackageBuilder(nuspecFilePath, basePath, propertyProvider, includeEmptyDirectories: true);
+            var builder = new PackageBuilder(nuspecFilePath, nuspecDirectory, propertyProvider, includeEmptyDirectories: true);
             if (!string.IsNullOrWhiteSpace(config.Version))
             {
                 builder.Version = new SemanticVersion(config.Version);