From aab98a103b6e5e6fb689dfe42aad223e43cd5525 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 22 Aug 2024 09:01:28 +0200
Subject: [PATCH] Don't take package metadata into account when computing nupkg
 filename.

nupkg filenames don't contain the metadata from the package version, so compute filenames without the metadata.

This naming behavior can be tested like this:

```shell
$ mkdir nupkgtest && cd nupkgtest
$ dotnet new classlib
[...]

$ dotnet pack -p:PackageVersion=3.14
[...]
$ ls **/*.nupkg
bin/Release/nupkgtest.3.14.0.nupkg

$ rm -rf bin obj
$ dotnet pack -p:PackageVersion=2.718+metadata
[...]
$ ls **/*.nupkg
bin/Release/nupkgtest.2.718.0.nupkg
```

This hopefully fixes a problem where arcade fails to find packages:
https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=10082514&view=logs&j=ba23343f-f710-5af9-782d-5bd26b102304&t=74531eb2-9b39-5603-839e-94e3ba212b65
---
 .../src/PublishArtifactsInManifestBase.cs           |  4 ++--
 .../src/PublishSignedAssets.cs                      |  3 ++-
 .../BuildManifest/Model/PackageArtifactModel.cs     | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
index 37dbf769789..366c4cc6e8b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifestBase.cs
@@ -1167,7 +1167,7 @@ await PushNugetPackagesAsync(packagesToPublish, feedConfig, maxClients: MaxClien
                 async (feed, httpClient, package, feedAccount, feedVisibility, feedName) =>
                 {
                     string localPackagePath =
-                        Path.Combine(PackageAssetsBasePath, $"{package.Id}.{package.Version}.nupkg");
+                        Path.Combine(PackageAssetsBasePath, package.NuPkgFilename);
                     if (!File.Exists(localPackagePath))
                     {
                         Log.LogError($"Could not locate '{package.Id}.{package.Version}' at '{localPackagePath}'");
@@ -1210,7 +1210,7 @@ await Task.WhenAll(packagesToPublish.Select(async package =>
                 try
                 {
                     await clientThrottle.WaitAsync();
-                    var packageFilename = $"{package.Id}.{package.Version}.nupkg";
+                    var packageFilename = package.NuPkgFilename;
                     string temporaryPackageDirectory =
                         Path.GetFullPath(Path.Combine(ArtifactsBasePath, Guid.NewGuid().ToString()));
                     EnsureTemporaryDirectoryExists(temporaryPackageDirectory);
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs
index 8a15166f393..631a60cd24b 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishSignedAssets.cs
@@ -5,6 +5,7 @@
 using Azure.Identity;
 using Microsoft.Build.Framework;
 using Microsoft.DotNet.Build.Tasks.Feed.Model;
+using Microsoft.DotNet.VersionTools.BuildManifest.Model;
 using NuGet.Packaging;
 using NuGet.Packaging.Core;
 using System;
@@ -94,7 +95,7 @@ private async Task PushPackagesToFeed(string assetsFolder, string feedUrl)
             await PushNugetPackagesAsync<PackageIdentity>(packagesToPublish, targetFeedConfig, 5,
                 async (feed, httpClient, package, feedAccount, feedVisibility, feedName) =>
                 {
-                    string localPackagePath = Path.Combine(packagesFolder, $"{package.Id}.{package.Version}.nupkg");
+                    string localPackagePath = Path.Combine(packagesFolder, PackageArtifactModel.GetNuPkgFileName(package.Id, package.Version.ToString ()));
 
                     if (!File.Exists(localPackagePath))
                     {
diff --git a/src/VersionTools/Microsoft.DotNet.VersionTools/BuildManifest/Model/PackageArtifactModel.cs b/src/VersionTools/Microsoft.DotNet.VersionTools/BuildManifest/Model/PackageArtifactModel.cs
index d135f054f26..88125c726d1 100644
--- a/src/VersionTools/Microsoft.DotNet.VersionTools/BuildManifest/Model/PackageArtifactModel.cs
+++ b/src/VersionTools/Microsoft.DotNet.VersionTools/BuildManifest/Model/PackageArtifactModel.cs
@@ -42,6 +42,19 @@ public string OriginBuildName
             set { Attributes[nameof(OriginBuildName)] = value; }
         }
 
+        public string NuPkgFilename
+        {
+            get => GetNuPkgFileName(Id, Version);
+        }
+
+        public static string GetNuPkgFileName (string id, string version)
+        {
+            var metadataStart = version.IndexOf('+');
+            if (metadataStart >= 0)
+                version = version.Substring(0, metadataStart);
+            return $"{id}.{version}.nupkg";
+        }
+
         public bool NonShipping
         {
             get