Refactor version comparison logic into VersionUtils utility class

Co-authored-by: matt-goldman <[email protected]>

Author: Copilot

src/Blake.BuildTools/Utils/PluginLoader.cs

@@ -169,46 +169,9 @@ private static bool IsNuGetPluginValid(NuGetPluginInfo plugin, ILogger? logger)
             }
 
             // For NuGet packages, the file version should match the package version
-            // Compare versions component-wise for leniency, but avoid false positives
-            if (Version.TryParse(plugin.Version, out var expectedVersion) && Version.TryParse(fileVersion, out var actualVersion))
+            if (VersionUtils.AreVersionsCompatible(plugin.Version, fileVersion))
             {
-                // Compare only as many components as are present in plugin.Version
-                bool matches = true;
-                if (expectedVersion.Major != actualVersion.Major) matches = false;
-                if (expectedVersion.Minor != -1 && expectedVersion.Minor != actualVersion.Minor) matches = false;
-                
-                // Handle Build component: if expected doesn't specify Build (=-1), actual should be 0 or -1
-                if (expectedVersion.Build == -1)
-                {
-                    if (actualVersion.Build != 0 && actualVersion.Build != -1) matches = false;
-                }
-                else
-                {
-                    if (expectedVersion.Build != actualVersion.Build) matches = false;
-                }
-                
-                // Handle Revision component: if expected doesn't specify Revision (=-1), actual should be 0 or -1
-                if (expectedVersion.Revision == -1)
-                {
-                    if (actualVersion.Revision != 0 && actualVersion.Revision != -1) matches = false;
-                }
-                else
-                {
-                    if (expectedVersion.Revision != actualVersion.Revision) matches = false;
-                }
-                
-                if (matches)
-                {
-                    return true;
-                }
-            }
-            else
-            {
-                // Fallback: exact string match
-                if (fileVersion == plugin.Version)
-                {
-                    return true;
-                }
+                return true;
             }
 
             logger?.LogDebug("Version mismatch for NuGet plugin {packageName}: expected {expectedVersion}, found {actualVersion}", 

src/Blake.BuildTools/Utils/VersionUtils.cs

@@ -0,0 +1,51 @@
+namespace Blake.BuildTools.Utils;
+
+/// <summary>
+/// Utility methods for version comparison and validation.
+/// </summary>
+public static class VersionUtils
+{
+    /// <summary>
+    /// Compares two version strings with component-wise comparison to prevent false positives.
+    /// This method provides leniency for legitimate version matches while being strict about preventing false positives.
+    /// </summary>
+    /// <param name="expectedVersion">The expected version (e.g., from package metadata)</param>
+    /// <param name="actualVersion">The actual version (e.g., from file version info)</param>
+    /// <returns>True if the versions match according to semantic versioning rules</returns>
+    public static bool AreVersionsCompatible(string expectedVersion, string actualVersion)
+    {
+        // Compare versions component-wise for leniency, but avoid false positives
+        if (Version.TryParse(expectedVersion, out var expected) && Version.TryParse(actualVersion, out var actual))
+        {
+            // Compare only as many components as are present in expectedVersion
+            bool matches = true;
+            if (expected.Major != actual.Major) matches = false;
+            if (expected.Minor != -1 && expected.Minor != actual.Minor) matches = false;
+            
+            // Handle Build component: if expected doesn't specify Build (=-1), actual should be 0 or -1
+            if (expected.Build == -1)
+            {
+                if (actual.Build != 0 && actual.Build != -1) matches = false;
+            }
+            else
+            {
+                if (expected.Build != actual.Build) matches = false;
+            }
+            
+            // Handle Revision component: if expected doesn't specify Revision (=-1), actual should be 0 or -1
+            if (expected.Revision == -1)
+            {
+                if (actual.Revision != 0 && actual.Revision != -1) matches = false;
+            }
+            else
+            {
+                if (expected.Revision != actual.Revision) matches = false;
+            }
+            
+            return matches;
+        }
+        
+        // Fallback: exact string match for non-parseable versions
+        return expectedVersion == actualVersion;
+    }
+}

tests/Blake.BuildTools.Tests/Utils/PluginLoaderTests.cs

@@ -256,47 +256,8 @@ public void IsNuGetPluginValid_WithVersionMismatch_ReturnsFalse()
     [InlineData("different", "other", false)] // String fallback should fail for different strings
     public void IsNuGetPluginValid_VersionComparison_WorksCorrectly(string pluginVersion, string fileVersion, bool expectedResult)
     {
-        // This test verifies the version comparison logic directly
-        // Since we can't easily control FileVersionInfo.GetVersionInfo in unit tests,
-        // we'll test the version comparison logic by calling a helper method
-        
-        // For now, let's test the Version parsing logic separately
-        bool result;
-        if (Version.TryParse(pluginVersion, out var expectedVersion) && Version.TryParse(fileVersion, out var actualVersion))
-        {
-            // Compare only as many components as are present in pluginVersion
-            bool matches = true;
-            if (expectedVersion.Major != actualVersion.Major) matches = false;
-            if (expectedVersion.Minor != -1 && expectedVersion.Minor != actualVersion.Minor) matches = false;
-            
-            // Handle Build component: if expected doesn't specify Build (=-1), actual should be 0 or -1
-            if (expectedVersion.Build == -1)
-            {
-                if (actualVersion.Build != 0 && actualVersion.Build != -1) matches = false;
-            }
-            else
-            {
-                if (expectedVersion.Build != actualVersion.Build) matches = false;
-            }
-            
-            // Handle Revision component: if expected doesn't specify Revision (=-1), actual should be 0 or -1
-            if (expectedVersion.Revision == -1)
-            {
-                if (actualVersion.Revision != 0 && actualVersion.Revision != -1) matches = false;
-            }
-            else
-            {
-                if (expectedVersion.Revision != actualVersion.Revision) matches = false;
-            }
-            
-            result = matches;
-        }
-        else
-        {
-            // Fallback: exact string match
-            result = fileVersion == pluginVersion;
-        }
-
+        // This test verifies the version comparison logic directly using the VersionUtils utility
+        var result = VersionUtils.AreVersionsCompatible(pluginVersion, fileVersion);
         Assert.Equal(expectedResult, result);
     }