Handle verbose Version in Directory.Build.props (#972)

* Handle verbose Version in Directory.Build.props resolves #896 * Update verbose Version in Directory.Build.props resolves #896
NuKeeperDotNet · May 15, 2020 · 1595056 · 1595056
1 parent c12624e
commit 1595056
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/NuKeeper.Inspection.Tests/RepositoryInspection/DirectoryBuildTargetsReaderTests.cs b/NuKeeper.Inspection.Tests/RepositoryInspection/DirectoryBuildTargetsReaderTests.cs
@@ -54,6 +54,19 @@ public void SinglePackageShouldBePopulated()
             PackageAssert.IsPopulated(package);
         }
 
+        [Test]
+        public void SinglePackageFromVerboseFormatShouldBePopulated()
+        {
+            const string verboseFormatVersion =
+                @"<Project><ItemGroup><PackageReference Include=""foo""><PrivateAssets>all</PrivateAssets><Version>1.2.3.4</Version></PackageReference></ItemGroup></Project>";
+
+            var reader = MakeReader();
+            var packages = reader.Read(StreamFromString(verboseFormatVersion), TempPath());
+
+            var package = packages.FirstOrDefault();
+            PackageAssert.IsPopulated(package);
+        }
+
         [Test]
         public void SinglePackageShouldBeCorrect()
         {

diff --git a/NuKeeper.Inspection/RepositoryInspection/DirectoryBuildTargetsReader.cs b/NuKeeper.Inspection/RepositoryInspection/DirectoryBuildTargetsReader.cs
@@ -66,7 +66,7 @@ private PackageInProject XmlToPackage(XElement el, PackagePath path)
             {
                 id = el.Attribute("Update")?.Value;
             }
-            var version = el.Attribute("Version")?.Value;
+            var version = el.Attribute("Version")?.Value ?? el.Element("Version")?.Value;
 
             return _packageInProjectReader.Read(id, version, path, null);
         }

diff --git a/NuKeeper.Integration.Tests/NuGet/Process/UpdateDirectoryBuildTargetsCommandTests.cs b/NuKeeper.Integration.Tests/NuGet/Process/UpdateDirectoryBuildTargetsCommandTests.cs
@@ -31,6 +31,14 @@ public async Task ShouldUpdateValidFileWithIncludeAttribute()
             await ExecuteValidUpdateTest(_testFileWithInclude, "<PackageReference Include=\"foo\" Version=\"{packageVersion}\" />");
         }
 
+        [Test]
+        public async Task ShouldUpdateValidFileWithIncludeAndVerboseVersion()
+        {
+            await ExecuteValidUpdateTest(
+                @"<Project><ItemGroup><PackageReference Include=""foo""><Version>{packageVersion}</Version></PackageReference></ItemGroup></Project>",
+                @"<Version>{packageVersion}</Version>");
+        }
+
         private async Task ExecuteValidUpdateTest(string testProjectContents, string expectedPackageString, [CallerMemberName] string memberName = "")
         {
             const string oldPackageVersion = "5.2.31";

diff --git a/NuKeeper.Update/Process/UpdateDirectoryBuildTargetsCommand.cs b/NuKeeper.Update/Process/UpdateDirectoryBuildTargetsCommand.cs
@@ -55,7 +55,15 @@ private void UpdateFile(Stream fileContents, NuGetVersion newVersion,
             {
                 _logger.Detailed(
                     $"Updating directory-level dependencies: {currentPackage.Id} in path {currentPackage.Path.FullName}");
-                dependencyToUpdate.Attribute("Version").Value = newVersion.ToString();
+                var attribute = dependencyToUpdate.Attribute("Version");
+                if (attribute != null)
+                {
+                    attribute.Value = newVersion.ToString();
+                }
+                else
+                {
+                    dependencyToUpdate.Element("Version").Value = newVersion.ToString();
+                }
             }
 
             xml.Save(fileContents);

diff --git a/NuKeeper/Program.cs b/NuKeeper/Program.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 
 [assembly: InternalsVisibleTo("NuKeeper.Tests")]
 
@@ -22,7 +23,7 @@ namespace NuKeeper
     [Subcommand(typeof(GlobalCommand))]
     public class Program
     {
-        public static int Main(string[] args)
+        public static async Task<int> Main(string[] args)
         {
             var container = ContainerRegistration.Init();
 
@@ -31,7 +32,7 @@ public static int Main(string[] args)
 
             try
             {
-                return app.Execute(args);
+                return await app.ExecuteAsync(args);
             }
             catch (CommandParsingException cpe)
             {