From a2e51e2356c56cd77869cb85a1042caee9347c76 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Wed, 21 Aug 2024 16:14:53 +0200
Subject: [PATCH 1/3] nuget bumps

---
 MavenNet.Tests/MavenNet.Tests.csproj | 8 ++++----
 MavenNet/MavenNet.csproj             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MavenNet.Tests/MavenNet.Tests.csproj b/MavenNet.Tests/MavenNet.Tests.csproj
index bac2148..1747cb9 100644
--- a/MavenNet.Tests/MavenNet.Tests.csproj
+++ b/MavenNet.Tests/MavenNet.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/MavenNet/MavenNet.csproj b/MavenNet/MavenNet.csproj
index 3f6760f..6d30ebf 100644
--- a/MavenNet/MavenNet.csproj
+++ b/MavenNet/MavenNet.csproj
@@ -30,7 +30,7 @@
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NuGet.Versioning" Version="5.9.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NuGet.Versioning" Version="6.10.1" />
   </ItemGroup>
 </Project>

From d5e8c1a6a7d00833f253b660a03f06808ced9f84 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Wed, 21 Aug 2024 16:15:27 +0200
Subject: [PATCH 2/3] fix

---
 MavenNet/MavenVersionRange.cs | 36 ++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/MavenNet/MavenVersionRange.cs b/MavenNet/MavenVersionRange.cs
index b441c5a..d73d0cd 100644
--- a/MavenNet/MavenVersionRange.cs
+++ b/MavenNet/MavenVersionRange.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 
@@ -16,7 +17,40 @@ public MavenVersionRange(string value)
 
 		public bool Satisfies(string version)
 		{
-			var nugetVersion = NuGet.Versioning.NuGetVersion.Parse(version);
+			var nugetVersion = default(NuGet.Versioning.NuGetVersion);
+			
+			try
+			{
+				nugetVersion = NuGet.Versioning.NuGetVersion.Parse(version);
+			}
+			catch (Exception e)
+			{
+				if (e is System.ArgumentException && e.Message.Contains(" is not a valid version string."))
+				{
+					try
+					{
+						int idx = version.LastIndexOf('.');
+						// creating valid SemVer from invalid Maven
+						string semver = version.Substring(0, idx);
+						nugetVersion = NuGet.Versioning.NuGetVersion.Parse(semver);
+						string release_textual = version.Substring(idx + 1, version.Length - idx - 1);
+						try
+						{
+							int release_numeric = int.Parse(release_textual, NumberStyles.HexNumber);
+							nugetVersion = NuGet.Versioning.NuGetVersion.Parse($"{semver}.{release_numeric}");
+						}
+						catch (Exception exception)
+						{
+							nugetVersion = NuGet.Versioning.NuGetVersion.Parse($"{semver}+{release_textual}");
+						}
+					}
+					catch (Exception ei)
+					{
+						Console.WriteLine(ei);
+						throw;
+					}
+				}
+			}
 
 			var v = Regex.Replace(Value, "\\s", "");
 

From 295aae1014b9446bfeb5df5c03959e382333a0c8 Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Wed, 21 Aug 2024 16:15:36 +0200
Subject: [PATCH 3/3] unit tests

---
 MavenNet.Tests/MavenVersioningTests.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/MavenNet.Tests/MavenVersioningTests.cs b/MavenNet.Tests/MavenVersioningTests.cs
index 62e43f9..64407f3 100644
--- a/MavenNet.Tests/MavenVersioningTests.cs
+++ b/MavenNet.Tests/MavenVersioningTests.cs
@@ -18,6 +18,14 @@ public class MavenVersioningTests
 		[InlineData("(,1.0],[1.2,)", "1.2", true)]
 		[InlineData("(,1.0],[1.2,)", "1.3", true)]
 		[InlineData("(,1.0],[1.2,)", "1.1", false)]
+		[InlineData("(,1.0],[2.2,)", "1.0.1.262e11d", false)]
+		[InlineData("(,0.8],[2.2,)", "0.11.1.647c3c2", false)]
+		[InlineData("(,0.8],[2.2,)", "0.11.1.3c786d2", false)]
+		[InlineData("(,0.8],[2.2,)", "0.10.1.2e8fe11", false)]
+		[InlineData("(,0.8],[2.2,)", "0.10.1.e92f734", false)]
+		[InlineData("(,0.8],[2.2,)", "0.10.1.d22d4de", false)]
+		[InlineData("(,0.8],[2.2,)", "0.9.3.545a756", false)]
+		[InlineData("(,0.8],[2.2,)", "0.9.3.a319893", false)]
 		public void Satisfy_Versions(string range, string version, bool satisfies)
 		{
 			var mvr = new MavenVersionRange(range);