aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs11
-rw-r--r--src/wix/WixToolset.Core/WixToolset.Core.csproj1
2 files changed, 6 insertions, 6 deletions
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
11 using WixToolset.Extensibility; 11 using WixToolset.Extensibility;
12 using WixToolset.Extensibility.Data; 12 using WixToolset.Extensibility.Data;
13 using WixToolset.Extensibility.Services; 13 using WixToolset.Extensibility.Services;
14 using WixToolset.Versioning;
14 15
15 internal class ExtensionManager : IExtensionManager 16 internal class ExtensionManager : IExtensionManager
16 { 17 {
@@ -169,7 +170,7 @@ namespace WixToolset.Core.ExtensibilityServices
169 extensionVersion = extensionReference.Substring(index + 1); 170 extensionVersion = extensionReference.Substring(index + 1);
170 extensionId = extensionReference.Substring(0, index); 171 extensionId = extensionReference.Substring(0, index);
171 172
172 if (!NuGet.Versioning.NuGetVersion.TryParse(extensionVersion, out _)) 173 if (!WixVersion.TryParse(extensionVersion, out _))
173 { 174 {
174 return false; 175 return false;
175 } 176 }
@@ -189,15 +190,15 @@ namespace WixToolset.Core.ExtensibilityServices
189 190
190 try 191 try
191 { 192 {
192 NuGet.Versioning.NuGetVersion version = null; 193 WixVersion highestVersion = null;
193 foreach (var versionPath in Directory.GetDirectories(basePath)) 194 foreach (var versionPath in Directory.GetDirectories(basePath))
194 { 195 {
195 var versionFolder = Path.GetFileName(versionPath); 196 var versionFolder = Path.GetFileName(versionPath);
196 if (NuGet.Versioning.NuGetVersion.TryParse(versionFolder, out var checkVersion) && 197 if (WixVersion.TryParse(versionFolder, out var checkVersion) &&
197 (version == null || version < checkVersion)) 198 (highestVersion == null || highestVersion < checkVersion))
198 { 199 {
199 foundVersionFolder = versionFolder; 200 foundVersionFolder = versionFolder;
200 version = checkVersion; 201 highestVersion = checkVersion;
201 } 202 }
202 } 203 }
203 } 204 }
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 @@
23 <ItemGroup> 23 <ItemGroup>
24 <PackageReference Include="System.IO.FileSystem.AccessControl" /> 24 <PackageReference Include="System.IO.FileSystem.AccessControl" />
25 <PackageReference Include="System.Text.Encoding.CodePages" /> 25 <PackageReference Include="System.Text.Encoding.CodePages" />
26 <PackageReference Include="NuGet.Versioning" />
27 </ItemGroup> 26 </ItemGroup>
28</Project> 27</Project>