Fix Nuget package file name that generated by _GetTargetFrameworksOutput target in Nuget.Build.Tasks.Pack.targets.

Author: gekka

NuGet.sln

@@ -161,6 +161,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.XPlat.FuncTest", "test\NuGet.Core.FuncTests\NuGet.XPlat.FuncTest\NuGet.XPlat.FuncTest.csproj", "{2034C981-C938-4F0F-8F3B-528B83CB8F7D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Build.Tasks.Pack.Test", "test\NuGet.Core.Tests\NuGet.Build.Tasks.Pack.Test\NuGet.Build.Tasks.Pack.Test.csproj", "{8BF8279D-196F-481A-9659-488864D93D2D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3B96F91B-3B58-40ED-B06E-5CD133A79A63} = {3B96F91B-3B58-40ED-B06E-5CD133A79A63}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGet.Build.Tasks.Pack", "src\NuGet.Core\NuGet.Build.Tasks.Pack\NuGet.Build.Tasks.Pack.csproj", "{16863138-7C0E-49ED-A1C8-B9165FED9920}"
 EndProject

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

@@ -29,6 +29,10 @@ public class GetPackOutputItemsTask : Microsoft.Build.Utilities.Task
         [Required]
         public string NuspecOutputPath { get; set; }
 
+        public string NuspecInputFilePath { get; set; }
+
+        public string[] NuspecProperties { get; set; }
+
         public bool IncludeSymbols { get; set; }
 
         public bool IncludeSource { get; set; }
@@ -43,27 +47,41 @@ public class GetPackOutputItemsTask : Microsoft.Build.Utilities.Task
 
         public override bool Execute()
         {
+            var packageId = PackageId;
+            var packageVersion = PackageVersion;
+
+            if (!string.IsNullOrWhiteSpace(NuspecInputFilePath))
+            {
+                var nuspecReader = new NuGet.Packaging.NuspecReader(NuspecInputFilePath);
+                packageId = nuspecReader.GetId();
+                packageVersion = nuspecReader.GetVersion().ToNormalizedString();
+
+                PackArgs packArgs = new PackArgs() { Version = packageVersion };
+                PackTaskLogic.SetPackArgsPropertiesFromNuspecProperties(packArgs, MSBuildStringUtility.TrimAndExcludeNullOrEmpty(NuspecProperties), NuspecInputFilePath);
+                packageVersion = packArgs.Version;
+            }
+
             NuGetVersion version;
-            if (!NuGetVersion.TryParse(PackageVersion, out version))
+            if (!NuGetVersion.TryParse(packageVersion, out version))
             {
                 throw new ArgumentException(string.Format(
                     CultureInfo.CurrentCulture,
                     Strings.InvalidPackageVersion,
-                    PackageVersion));
+                    packageVersion));
             }
 
             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);
+            var nuspecFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: false, symbols: false, symbolPackageFormat: symbolPackageFormat);
 
             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);
+                var nuspecSymbolsFileName = PackCommandRunner.GetOutputFileName(packageId, version, isNupkg: false, symbols: true, symbolPackageFormat: symbolPackageFormat);
 
                 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

@@ -75,14 +75,7 @@ public PackArgs GetPackArgs(IPackTaskRequest<IMSBuildItem> request)
 
             if (!string.IsNullOrEmpty(request.NuspecFile))
             {
-                if (request.NuspecProperties != null && request.NuspecProperties.Any())
-                {
-                    packArgs.Properties.AddRange(ParsePropertiesAsDictionary(request.NuspecProperties));
-                    if (packArgs.Properties.TryGetValue("version", out var version))
-                    {
-                        packArgs.Version = version;
-                    }
-                }
+                SetPackArgsPropertiesFromNuspecProperties(packArgs, request.NuspecProperties, request.NuspecFile);
             }
             else
             {
@@ -1091,6 +1084,28 @@ private static IDictionary<string, string> ParsePropertiesAsDictionary(string[]
             return dictionary;
         }
 
+        internal static void SetPackArgsPropertiesFromNuspecProperties(PackArgs packArgs, string[] nuspecProperties, string nuspecInputFilePath)
+        {
+            if (!string.IsNullOrWhiteSpace(nuspecInputFilePath))
+            {
+                if (nuspecProperties != null && nuspecProperties.Any())
+                {
+                    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();
+                    }
+                }
+            }
+        }
+
         private HashSet<string> InitOutputExtensions(IEnumerable<string> outputExtensions)
         {
             return new HashSet<string>(outputExtensions.Distinct(StringComparer.OrdinalIgnoreCase));

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

@@ -111,6 +111,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <GetPackOutputItemsTask
         PackageOutputPath="$(PackageOutputAbsolutePath)"
         NuspecOutputPath="$(NuspecOutputAbsolutePath)"
+        NuspecInputFilePath="$(NuspecFile)"
+        NuspecProperties="$(NuspecProperties)"        
         PackageId="$(PackageId)"
         PackageVersion="$(PackageVersion)"
         IncludeSymbols="$(IncludeSymbols)"