Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards)

src/GprTool/NuGetUtilities.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
 using NuGet.Packaging;
@@ -14,7 +13,6 @@ public class NuGetUtilities
         public static bool ShouldRewriteNupkg(string nupkgPath, string repositoryUrl, NuGetVersion nuGetVersion = null)
         {
             if (nupkgPath == null) throw new ArgumentNullException(nameof(nupkgPath));
-            if (repositoryUrl == null) throw new ArgumentNullException(nameof(repositoryUrl));
 
             using var packageArchiveReader = new PackageArchiveReader(nupkgPath.OpenReadShared(), false);
 
@@ -36,10 +34,8 @@ public static bool ShouldRewriteNupkg(string nupkgPath, string repositoryUrl, Nu
             }
 
             var nuspecRepositoryUrl = repositoryXElement.Attribute("url")?.Value;
-            var nuspecRepositoryType = repositoryXElement.Attribute("type")?.Value;
-
-            return !string.Equals(repositoryUrl, nuspecRepositoryUrl, StringComparison.Ordinal) 
-                   || !string.Equals("git", nuspecRepositoryType, StringComparison.Ordinal);
+
+            return !string.Equals(repositoryUrl, nuspecRepositoryUrl, StringComparison.Ordinal);
         }
 
         public static string RewriteNupkg(string nupkgPath, string repositoryUrl, NuGetVersion nuGetVersion = null)

test/GprTool.Tests/NuGetUtilitiesTests.cs

@@ -138,7 +138,6 @@ public void UpdatePackageSourceCredentials()
             Assert.That(packageSourceCredentialsElements.Count, Is.EqualTo(1));
         }
 
-        [TestCase("1.0.0", "1.0.0", false)]
         [TestCase("1.0.0", "1.0.0", false)]
         [TestCase("1.0.0", "1.0.1", true)]
         public void ShouldRewriteNupkg_Version(string currentVersion, string updatedVersion, bool shouldUpdateVersion)
@@ -193,6 +192,30 @@ public void ShouldRewriteNupkg_RepositoryUrl(string currentRepositoryUrl, string
                     updatedRepositoryUrl), Is.EqualTo(shouldUpdateRepositoryUrl));
         }
 
+        [TestCase(null)]
+        [TestCase("randomvalue")]
+        [TestCase("git")]
+        public void ShouldRewriteNupkg_Ignores_RepositoryType(string repositoryType)
+        {
+            const string currentRepositoryUrl = "https://github.com/jcansdale/gpr";
+
+            using var packageBuilderContext = new PackageBuilderContext(TmpDirectoryPath, new NuspecContext(manifest =>
+            {
+                manifest.Metadata.Repository = new RepositoryMetadata
+                {
+                    Url = currentRepositoryUrl,
+                    Type = repositoryType
+                };
+            }));
+
+            packageBuilderContext.Build();
+
+            Assert.That(
+                NuGetUtilities.ShouldRewriteNupkg(
+                    packageBuilderContext.NupkgFilename,
+                    repositoryType), Is.EqualTo(true));
+        }
+
         [TestCase("https://github.com/owner/repo.git", "https://github.com/owner/repo.git")]
         [TestCase("https://github.com/owner/repo", "https://github.com/owner/repo")]
         public void RewriteNuspec(string repositoryUrl, string expectedRepositoryUrl)