Fix OutputFileNamesWithoutVersion

Author: gekka

src/NuGet.Core/NuGet.Build.Tasks.Pack/GetPackOutputItemsTask.cs

@@ -39,6 +39,8 @@ public class GetPackOutputItemsTask : Microsoft.Build.Utilities.Task
 
         public string SymbolPackageFormat { get; set; }
 
+        public bool OutputFileNamesWithoutVersion { get; set; }
+
         /// <summary>
         /// Output items
         /// </summary>
@@ -71,17 +73,17 @@ public override bool Execute()
             }
 
             var symbolPackageFormat = PackArgs.GetSymbolPackageFormat(MSBuildStringUtility.TrimAndGetNullForEmpty(SymbolPackageFormat));
-            var nupkgFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: true, symbols: false, symbolPackageFormat: symbolPackageFormat);
-            var nuspecFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: false, symbols: false, symbolPackageFormat: symbolPackageFormat);
+            var nupkgFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: true, symbols: false, symbolPackageFormat: symbolPackageFormat, excludeVersion: OutputFileNamesWithoutVersion);
+            var nuspecFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: false, symbols: false, symbolPackageFormat: symbolPackageFormat, excludeVersion: OutputFileNamesWithoutVersion);
 
             var outputs = new List<ITaskItem>();
             outputs.Add(new TaskItem(Path.Combine(PackageOutputPath, nupkgFileName)));
             outputs.Add(new TaskItem(Path.Combine(NuspecOutputPath, nuspecFileName)));
 
             if (IncludeSource || IncludeSymbols)
             {
-                var nupkgSymbolsFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: true, symbols: true, symbolPackageFormat: symbolPackageFormat);
-                var nuspecSymbolsFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: false, symbols: true, symbolPackageFormat: symbolPackageFormat);
+                var nupkgSymbolsFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: true, symbols: true, symbolPackageFormat: symbolPackageFormat, excludeVersion: OutputFileNamesWithoutVersion);
+                var nuspecSymbolsFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: false, symbols: true, symbolPackageFormat: symbolPackageFormat, excludeVersion: OutputFileNamesWithoutVersion);
 
                 outputs.Add(new TaskItem(Path.Combine(PackageOutputPath, nupkgSymbolsFileName)));
                 outputs.Add(new TaskItem(Path.Combine(NuspecOutputPath, nuspecSymbolsFileName)));

src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs

@@ -1086,24 +1086,25 @@ private static IDictionary<string, string> ParsePropertiesAsDictionary(string[]
 
         internal static void SetPackArgsPropertiesFromNuspecProperties(PackArgs packArgs, string[] nuspecProperties, string nuspecInputFilePath)
         {
-            if (!string.IsNullOrWhiteSpace(nuspecInputFilePath))
+            if (string.IsNullOrWhiteSpace(nuspecInputFilePath) || nuspecProperties == null || !nuspecProperties.Any())
             {
-                if (nuspecProperties != null && nuspecProperties.Any())
+                return;
+            }
+
+            packArgs.Properties.AddRange(ParsePropertiesAsDictionary(nuspecProperties));
+            if (packArgs.Properties.TryGetValue("version", out var packageVersion))
+            {
+                if (!NuGetVersion.TryParse(packageVersion, out var version))
                 {
-                    packArgs.Properties.AddRange(ParsePropertiesAsDictionary(nuspecProperties));
-                    if (packArgs.Properties.TryGetValue("version", out var packageVersion))
-                    {
-                        if (!NuGetVersion.TryParse(packageVersion, out var version))
-                        {
-                            throw new ArgumentException(string.Format(
-                                CultureInfo.CurrentCulture,
-                                Strings.InvalidPackageVersion,
-                                packageVersion));
-                        }
-                        packArgs.Version = version.ToNormalizedString();
-                    }
+                    throw new ArgumentException(string.Format(
+                        CultureInfo.CurrentCulture,
+                        Strings.InvalidPackageVersion,
+                        packageVersion));
                 }
+                packArgs.Version = version.ToNormalizedString();
             }
+
+
         }
 
         private HashSet<string> InitOutputExtensions(IEnumerable<string> outputExtensions)

src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.Pack.targets

@@ -112,13 +112,13 @@ Copyright (c) .NET Foundation. All rights reserved.
         PackageOutputPath="$(PackageOutputAbsolutePath)"
         NuspecOutputPath="$(NuspecOutputAbsolutePath)"
         NuspecInputFilePath="$(NuspecFile)"
-        NuspecProperties="$(NuspecProperties)"        
+        NuspecProperties="$(NuspecProperties)"
         PackageId="$(PackageId)"
         PackageVersion="$(PackageVersion)"
         IncludeSymbols="$(IncludeSymbols)"
         IncludeSource="$(IncludeSource)"
-        SymbolPackageFormat="$(SymbolPackageFormat)">
-
+        SymbolPackageFormat="$(SymbolPackageFormat)"
+        OutputFileNamesWithoutVersion="$(OutputFileNamesWithoutVersion)">
       <Output
         TaskParameter="OutputPackItems"
         ItemName="_OutputPackItems" />