Merge branch 'master' into test-the-api-package-lookup

NuKeeper.Tests/Engine/CommitReportTests.cs

@@ -119,7 +119,7 @@ public void TwoUpdates_MakeCommitDetails_HasVersionInfo()
             var report = CommitReport.MakeCommitDetails(updates);
 
             Assert.That(report, Does.StartWith("NuKeeper has generated an update of `foo.bar` to `1.2.3`"));
-            Assert.That(report, Does.Contain("2 versions of `foo.bar` were found in use: `1.1.0`,`1.0.0`"));
+            Assert.That(report, Does.Contain("2 versions of `foo.bar` were found in use: `1.1.0`, `1.0.0`"));
         }
 
         [Test]

NuKeeper.Tests/RepositoryInspection/PackagesFileReaderTests.cs

@@ -107,6 +107,17 @@ public void ResultIsReiterable()
             Assert.That(packages.Select(p => p.Path), Is.All.EqualTo(path));
         }
 
+        [Test]
+        public void WhenOnePackageCannotBeRead_TheOthersAreStillRead()
+        {
+            var badVersion = PackagesFileWithTwoPackages.Replace("1.2.3.4", "notaversion");
+            var packages = PackagesFileReader.Read(badVersion, TempPath())
+                .ToList();
+
+            Assert.That(packages.Count, Is.EqualTo(1));
+            PackageAssert.IsPopulated(packages[0]);
+        }
+
         private PackagePath TempPath()
         {
             return new PackagePath("c:\\temp\\somewhere", "src\\packages.config",

NuKeeper.Tests/RepositoryInspection/ProjectFileReaderTests.cs

@@ -174,6 +174,22 @@ public void ResultIsReiterable()
             Assert.That(packages.Select(p=>p.Path), Is.All.EqualTo(path));
         }
 
+        [Test]
+        public void WhenOnePackageCannotBeRead_TheOthersAreStillRead()
+        {
+            const string packagesText =
+                @"<PackageReference Include=""foo"" Version=""notaversion""></PackageReference>
+                  <PackageReference Include=""bar"" Version=""2.3.4""></PackageReference>";
+
+            var projectFile = Vs2017ProjectFileTemplateWithPackages.Replace("{{Packages}}", packagesText);
+
+            var packages = ProjectFileReader.Read(projectFile, TempPath())
+                .ToList();
+
+            Assert.That(packages.Count, Is.EqualTo(1));
+            PackageAssert.IsPopulated(packages[0]);
+        }
+
         private PackagePath TempPath()
         {
             return new PackagePath("c:\\temp\\somewhere", "src\\packages.config",

NuKeeper/Engine/CommitReport.cs

@@ -14,24 +14,24 @@ public static string MakeCommitMessage(PackageUpdateSet updates)
         public static string MakeCommitDetails(PackageUpdateSet updates)
         {
             var oldVersions = updates.CurrentPackages
-                .Select(u => CodeQuote(u.Version.ToString()))
+                .Select(u => u.Version)
                 .Distinct()
+                .Select(v => CodeQuote(v.ToString()))
                 .ToList();
-
-            var oldVersionsString = string.Join(",", oldVersions);
+
             var newVersion = CodeQuote(updates.NewVersion.ToString());
             var packageId = CodeQuote(updates.PackageId);
 
             var builder = new StringBuilder();
 
             if (oldVersions.Count == 1)
             {
-                builder.AppendLine($"NuKeeper has generated an update of {packageId} to {newVersion} from {oldVersionsString}");
+                builder.AppendLine($"NuKeeper has generated an update of {packageId} to {newVersion} from {oldVersions.JoinWithCommas()}");
             }
             else
             {
                 builder.AppendLine($"NuKeeper has generated an update of {packageId} to {newVersion}");
-                builder.AppendLine($"{oldVersions.Count} versions of {packageId} were found in use: {oldVersionsString}");
+                builder.AppendLine($"{oldVersions.Count} versions of {packageId} were found in use: {oldVersions.JoinWithCommas()}");
             }
 
             if (updates.CurrentPackages.Count == 1)

NuKeeper/Engine/EngineReport.cs

@@ -22,8 +22,7 @@ public static void PackagesFound(List<PackageInProject> packages)
 
             Console.WriteLine($"Found {packages.Count} packages in use, {packageIds.Count} distinct, in {projectPathCount} projects.");
 
-            var packageIdsText = string.Join(", ", packageIds);
-            Console.WriteLine(packageIdsText);
+            Console.WriteLine(packageIds.JoinWithCommas());
         }
 
         public static void UpdatesFound(List<PackageUpdateSet> updates)
@@ -45,9 +44,7 @@ public static void OldVersionsToBeUpdated(PackageUpdateSet updateSet)
                 .Select(u => u.Version.ToString())
                 .Distinct();
 
-            var oldVersionsString = string.Join(", ", oldVersions);
-
-            Console.WriteLine($"Updating '{updateSet.PackageId}' from {oldVersionsString} to {updateSet.NewVersion} in {updateSet.CurrentPackages.Count()} projects");
+            Console.WriteLine($"Updating '{updateSet.PackageId}' from {oldVersions.JoinWithCommas()} to {updateSet.NewVersion} in {updateSet.CurrentPackages.Count()} projects");
         }
     }
 }

NuKeeper/RepositoryInspection/PackageUpdateSet.cs

@@ -34,8 +34,7 @@ public PackageUpdateSet(PackageIdentity newPackage, IEnumerable<PackageInProject
                     .Distinct()
                     .Where(id => id != newPackage.Id);
 
-                var errorIdString = string.Join(", ", errorIds);
-                throw new ArgumentException($"Updates must all be for package '{newPackage.Id}', got '{errorIdString}'");
+                throw new ArgumentException($"Updates must all be for package '{newPackage.Id}', got '{errorIds.JoinWithCommas()}'");
             }
 
             NewPackage = newPackage;

NuKeeper/RepositoryInspection/PackagesFileReader.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
@@ -28,15 +29,25 @@ public static IEnumerable<PackageInProject> Read(string fileContents, PackagePat
 
             return packageNodeList
                 .Select(el => XmlToPackage(el, path))
+                .Where(el => el != null)
                 .ToList();
         }
 
         private static PackageInProject XmlToPackage(XElement el, PackagePath path)
         {
-            var id = el.Attribute("id")?.Value;
-            var version = el.Attribute("version")?.Value;
+            try
+            {
+                var id = el.Attribute("id")?.Value;
+                var version = el.Attribute("version")?.Value;
+
+                return new PackageInProject(id, version, path);
 
-            return new PackageInProject(id, version, path);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Could not read package from {el}: {ex.Message}");
+                return null;
+            }
         }
     }
 }

NuKeeper/RepositoryInspection/ProjectFileReader.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
@@ -28,15 +29,24 @@ public static IEnumerable<PackageInProject> Read(string fileContents, PackagePat
 
             return packageRefs
                 .Select(el => XmlToPackage(el, path))
+                .Where(el => el != null)
                 .ToList();
         }
 
         private static PackageInProject XmlToPackage(XElement el, PackagePath path)
         {
-            var id = el.Attribute("Include")?.Value;
-            var version = el.Attribute("Version")?.Value;
+            try
+            {
+                var id = el.Attribute("Include")?.Value;
+                var version = el.Attribute("Version")?.Value;
 
-            return new PackageInProject(id, version, path);
+                return new PackageInProject(id, version, path);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Could not read package from {el}: {ex.Message}");
+                return null;
+            }
         }
     }
 }

NuKeeper/StringExtensions.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace NuKeeper
+{
+    public static class StringExtensions
+    {
+        public static string JoinWithCommas(this IEnumerable<string> values)
+        {
+            if (values == null)
+            {
+                return string.Empty;
+            }
+
+            return string.Join(", ", values);
+        }
+    }
+}