Address PR #2019 review feedback on V3 packageContent URL selection

Co-authored-by: et1975 <623703+et1975@users.noreply.github.com>

Author: Copilot

src/code/PSResourceInfo.cs

@@ -2030,7 +2030,7 @@ public static string SelectV3PackageContentUrl(
         {
             if (!NuGetVersion.TryParse(version, out NuGetVersion requiredVersion))
             {
-                throw new PSArgumentException($"Version {version} is not a valid NuGet version.");
+                throw new PSArgumentException($"Version '{version}' is not a valid NuGet version.");
             }
 
             return Cmdlets.V3ServerAPICalls.GetPackageContentUrlForVersion(versionedResponses, requiredVersion);

src/code/V3ServerAPICalls.cs

@@ -1092,6 +1092,12 @@ private static bool PackageContentUrlMatchesVersion(string packageContentUrl, Nu
                     continue;
                 }
 
+                string queryKey = UnescapeUrlPart(queryParameter.Substring(0, separatorIndex)).Trim();
+                if (!queryKey.EndsWith("version", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
                 string queryValue = UnescapeUrlPart(queryParameter.Substring(separatorIndex + 1));
                 if (NuGetVersion.TryParse(queryValue, out NuGetVersion queryVersion) && queryVersion == requiredVersion)
                 {
@@ -1112,6 +1118,10 @@ private static string UnescapeUrlPart(string urlPart)
             {
                 return urlPart;
             }
+            catch (ArgumentException)
+            {
+                return urlPart;
+            }
         }
 
         /// <summary>

test/InstallPSResourceTests/InstallPSResourceV3ServerVersionSelection.Tests.ps1

@@ -19,7 +19,7 @@ Describe 'Test V3 packageContent url selection for a required version' -tags 'CI
         $url | Should -BeExactly "$packageBaseAddress/1.2.3/test_module.1.2.3.nupkg"
     }
 
-    It 'Should not select the url of a version which the requested version is a prefix of' {
+    It 'Should select the url for a version which another version is a prefix of' {
         $url = [Microsoft.PowerShell.PSResourceGet.UtilClasses.TestHooks]::SelectV3PackageContentUrl($versionedResponses, '1.2.30')
         $url | Should -BeExactly "$packageBaseAddress/1.2.30/test_module.1.2.30.nupkg"
     }
@@ -51,6 +51,15 @@ Describe 'Test V3 packageContent url selection for a required version' -tags 'CI
         $url | Should -BeExactly "https://www.myget.org/api/download?packageId=test_module&packageVersion=1.2.3"
     }
 
+    It 'Should not select a url where a non-version query parameter matches the version' {
+        $responses = @(
+            "https://www.myget.org/api/download?packageId=1.2.3&packageVersion=1.2.30",
+            "https://www.myget.org/api/download?packageId=test_module&packageVersion=1.2.3"
+        )
+        $url = [Microsoft.PowerShell.PSResourceGet.UtilClasses.TestHooks]::SelectV3PackageContentUrl($responses, '1.2.3')
+        $url | Should -BeExactly "https://www.myget.org/api/download?packageId=test_module&packageVersion=1.2.3"
+    }
+
     It 'Should not select any url when the requested version is not present' {
         $url = [Microsoft.PowerShell.PSResourceGet.UtilClasses.TestHooks]::SelectV3PackageContentUrl($versionedResponses, '1.2.4')
         $url | Should -BeNullOrEmpty