From 5065bf991b76a6484d11d867b53fd2fe3e6a2fad Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 3 Oct 2022 10:06:05 -0700
Subject: Remove dependency on NuGet.Versioning from Core

Now that WixVersion can do comparison logic, we can remove the dependency on
NuGet.Versioning from WixToolset.Core. The NuGet.Versioning assembly gets
included by many build process tools so not being dependent on it in core
WiX scenarios reduces the chances of assembly version collisions.
---
 .../WixToolset.Core/ExtensibilityServices/ExtensionManager.cs | 11 ++++++-----
 src/wix/WixToolset.Core/WixToolset.Core.csproj                |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
index 71334841..6e10744d 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Core.ExtensibilityServices
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
+    using WixToolset.Versioning;
 
     internal class ExtensionManager : IExtensionManager
     {
@@ -169,7 +170,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 extensionVersion = extensionReference.Substring(index + 1);
                 extensionId = extensionReference.Substring(0, index);
 
-                if (!NuGet.Versioning.NuGetVersion.TryParse(extensionVersion, out _))
+                if (!WixVersion.TryParse(extensionVersion, out _))
                 {
                     return false;
                 }
@@ -189,15 +190,15 @@ namespace WixToolset.Core.ExtensibilityServices
 
             try
             {
-                NuGet.Versioning.NuGetVersion version = null;
+                WixVersion highestVersion = null;
                 foreach (var versionPath in Directory.GetDirectories(basePath))
                 {
                     var versionFolder = Path.GetFileName(versionPath);
-                    if (NuGet.Versioning.NuGetVersion.TryParse(versionFolder, out var checkVersion) &&
-                        (version == null || version < checkVersion))
+                    if (WixVersion.TryParse(versionFolder, out var checkVersion) &&
+                        (highestVersion == null || highestVersion < checkVersion))
                     {
                         foundVersionFolder = versionFolder;
-                        version = checkVersion;
+                        highestVersion = checkVersion;
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj
index 42b0c0c7..336cc8e7 100644
--- a/src/wix/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj
@@ -23,6 +23,5 @@
   <ItemGroup>
     <PackageReference Include="System.IO.FileSystem.AccessControl" />
     <PackageReference Include="System.Text.Encoding.CodePages" />
-    <PackageReference Include="NuGet.Versioning" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb