Bump version to 3.1.6 in project file

Updated the version number from 3.1.5 to 3.1.6 in the AssetRipper.Primitives.csproj file.
Utf8StringJsonConverter
2026-11-13 12:41:27 -10:00 · 2025-02-22 21:43:28 -08:00 · 2025-02-22 21:42:49 -08:00 · 2025-02-13 16:03:05 -08:00 · 2025-02-13 15:57:20 -08:00 · 2025-02-13 15:56:24 -08:00
22 changed files with 314 additions and 230 deletions
@@ -7,55 +7,25 @@ on:
    branches: [ master ]

 jobs:
-  net7:
-
+  build-and-test:
    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dotnet-version: ["9.0", "8.0", "7.0", "6.0"]

    steps:
    - uses: actions/checkout@v4
    - name: Setup .NET
-      uses: actions/setup-dotnet@v4.0.0
+      uses: actions/setup-dotnet@v4.3.0
      with:
-        dotnet-version: 7.0.x
+        dotnet-version:  |
+          6.0.x
+          7.0.x
+          8.0.x
+          9.0.x
    - name: Restore dependencies
      run: dotnet restore
    - name: Build
-      run: dotnet build --framework net7.0 --no-restore
+      run: dotnet build --framework net${{ matrix.dotnet-version }} --no-restore
    - name: Test
-      run: dotnet test --framework net7.0 --no-build --verbosity normal
-
-  net6:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Setup .NET
-      uses: actions/[email protected]
-      with:
-        dotnet-version: 6.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --framework net6.0 --no-restore
-    - name: Test
-      run: dotnet test --framework net6.0 --no-build --verbosity normal
-
-  net5:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Setup .NET
-      uses: actions/[email protected]
-      with:
-        dotnet-version: | 
-            5.0.x
-            6.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --framework net5.0 --no-restore
-    - name: Test
-      run: dotnet test --framework net5.0 --no-build --verbosity normal
+      run: dotnet test --framework net${{ matrix.dotnet-version }} --no-build --verbosity normal
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-		<LangVersion>Latest</LangVersion>
-		<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
-	</ItemGroup>
-
-</Project>
@@ -1,11 +0,0 @@
-using BenchmarkDotNet.Running;
-
-namespace AssetRipper.Primitives.Benckmarks;
-
-internal static class Program
-{
-	static void Main()
-	{
-		BenchmarkRunner.Run(typeof(Program).Assembly);
-	}
-}
@@ -1,46 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using System.Runtime.CompilerServices;
-
-namespace AssetRipper.Primitives.Benckmarks;
-
-[SimpleJob(RuntimeMoniker.Net80)]
-[RPlotExporter]
-public class YearVersionCheck
-{
-	[Params(4, 5, 6, 7, 2016, 2017, 2018, 2022, 2023, 2024)]
-	public ushort Major;
-
-	[Benchmark]
-	public bool Simple() => Major is >= 2017 and <= 2023;
-
-	[Benchmark]
-	public bool BitsWith2016() => BitComparison(Major);
-
-	[Benchmark]
-	public bool BitsWithout2016() => BitComparison(Major) && Major is not 2016;
-
-	[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
-	private static bool BitComparison(uint value)
-	{
-		//This function determines if an unsigned integer
-		//is between 2016 and 2023, inclusive. It does this
-		//by comparing bits of the value with know constants.
-
-		const uint VariableBitMask = 0x7;
-		const uint FixedBitMask = ~VariableBitMask;
-		const uint ExpectedFixedBits = 0x7E0;//2016
-		return (value & FixedBitMask) == ExpectedFixedBits;
-	}
-
-	/* Results:
-	 * Due to the simplicity of the methods being profiled,
-	 * benchmarking was inconclusive. The costs of calling
-	 * these methods are almost neglible.
-	 * 
-	 * Decision:
-	 * For the time being, the library will continue to use
-	 * the simple bounds check. If another option is shown
-	 * to be significantly better, I am open to switching.
-	 */
-}
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

 	<PropertyGroup>
-		<TargetFrameworks>netframework3.5;netframework4.0;netframework4.8;net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net35;net40;net48;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 		<LangVersion>Latest</LangVersion>
 		<Nullable>enable</Nullable>

@@ -9,14 +9,14 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
 		<PackageReference Include="NUnit" Version="3.14.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+		<PackageReference Include="NUnit.Analyzers" Version="4.1.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0" />
+		<PackageReference Include="coverlet.collector" Version="6.0.2" />
 	</ItemGroup>

 	<ItemGroup>
@@ -72,20 +72,4 @@ public class ComparisonTests
 			Assert.That(new UnityVersion(2019, 1, 0, UnityVersionType.Final, 1).LessThanOrEquals(2019, 1, 0));
 		});
 	}
-
-	[TestCase(2017)]
-	[TestCase(2018)]
-	[TestCase(2019)]
-	[TestCase(2020)]
-	[TestCase(2021)]
-	[TestCase(2022)]
-	[TestCase(2023)]
-	public void YearVersioningIsBetweenFiveAndSix(int year)
-	{
-		Assert.Multiple(() =>
-		{
-			Assert.That(new UnityVersion((ushort)year).GreaterThan(5));
-			Assert.That(new UnityVersion((ushort)year).LessThan(6));
-		});
-	}
 }
@@ -9,8 +9,13 @@ public class ParsingTests
 	[TestCase("4.2.2f1\n1", 4, 2, 2, UnityVersionType.Final, 1, "\n1", "Custom Unity 4 Version")]
 	[TestCase("2343.4.5f7", 2343, 4, 5, UnityVersionType.Final, 7, null, "Fictitious Future Version")]
 	[TestCase("2019.2.2f1c2\n2", 2019, 2, 2, UnityVersionType.China, 2, "\n2", "Fake Custom Chinese Version")]
+	[TestCase("2019", 2019, 0, 0, UnityVersionType.Final, 1, null, "Major Only")]
 	[TestCase("2019.4", 2019, 4, 0, UnityVersionType.Final, 1, null, "Major Minor Only")]
 	[TestCase("2019.4.3", 2019, 4, 3, UnityVersionType.Final, 1, null, "Major Minor Build Only")]
+	[TestCase("0", 0, 0, 0, UnityVersionType.Alpha, 0, null, "Zero, Major Only")]
+	[TestCase("0.0", 0, 0, 0, UnityVersionType.Alpha, 0, null, "Zero, Major Minor Only")]
+	[TestCase("0.0.0", 0, 0, 0, UnityVersionType.Alpha, 0, null, "Zero, Major Minor Build Only")]
+	[TestCase("0.0.0b2", 0, 0, 0, UnityVersionType.Beta, 2, null, "Zero, Full")]
 	[TestCase("2019.2.2f1-letters", 2019, 2, 2, UnityVersionType.Final, 1, "-letters", "Issue #40 - Appended Custom Characters")]
 	public void UnityVersionParsesCorrectly(string versionString, int major, int minor, int build, UnityVersionType type, int typeNumber, string? customEngine, string name)
 	{
@@ -20,7 +25,7 @@ public class ParsingTests
 		{
 			Assert.That(parsedCustomEngine, Is.EqualTo(customEngine), $"The custom engine boolean is incorrect for '{name}'");
 			Assert.That(parsedVersion, Is.EqualTo(expected), $"The parsed version is incorrect for '{name}'");
-			if (customEngine is not null || typeNumber is not 1)
+			if (customEngine is not null || typeNumber is not 0 and not 1)
 			{
 				Assert.That(parsedVersion.ToString(UnityVersionFormatFlags.Default, parsedCustomEngine ?? ""), Is.EqualTo(versionString));
 			}
@@ -68,6 +73,22 @@ public class ParsingTests
 		});
 	}

+	[TestCase("g2019")]
+	[TestCase("g2019.4")]
+	[TestCase("g2019.4.3")]
+	[TestCase("g2019.4.3f")]
+	[TestCase("g2019.4.3f1")]
+	[TestCase("g2019.4.3f1c1")]
+	[TestCase("2019g")]
+	[TestCase("2019.4g")]
+	[TestCase("2019.4.3g")]
+	[TestCase("2019.4.3fg")]
+	// "2019.4.3f1g" and "2019.4.3f1c1g" are technically valid because custom engines often append some text to the version string.
+	public void InvalidVersionStringFailsToParse(string versionString)
+	{
+		Assert.That(UnityVersion.TryParse(versionString, out _, out _), Is.False);
+	}
+
 	private static IEnumerable<UnityVersion> GenerateRandomVersions(int count)
 	{
 		Randomizer random = TestContext.CurrentContext.Random;
@@ -1,4 +1,4 @@
-#if NET7_0_OR_GREATER
+#if NET5_0_OR_GREATER
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

@@ -83,7 +83,7 @@ public class UnityGuidTests
 	{
 		Guid originalGuid = Guid.NewGuid();
 		UnityGuid tobyteArrayGuid = new UnityGuid(originalGuid.ToByteArray());
-		UnityGuid memoryMarshallGuid = new UnityGuid(MemoryMarshal.Cast<Guid, byte>(new ReadOnlySpan<Guid>(in originalGuid)));
+		UnityGuid memoryMarshallGuid = Unsafe.As<Guid, UnityGuid>(ref originalGuid);
 		Assert.That(memoryMarshallGuid, Is.EqualTo(tobyteArrayGuid));
 	}
 }
@@ -1,4 +1,4 @@
-#if NET7_0_OR_GREATER
+#if NET5_0_OR_GREATER
 namespace AssetRipper.Primitives.Tests;

 public class Utf8StringTests
@@ -24,8 +24,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.Primitives", "A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.Primitives.Tests", "AssetRipper.Primitives.Tests\AssetRipper.Primitives.Tests.csproj", "{545E670D-141B-4F05-9AFD-2F184A59EADC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetRipper.Primitives.Benckmarks", "AssetRipper.Primitives.Benckmarks\AssetRipper.Primitives.Benckmarks.csproj", "{E3DEB571-4EE4-4C89-9005-DB10D9FB561B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,10 +38,6 @@ Global
 		{545E670D-141B-4F05-9AFD-2F184A59EADC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{545E670D-141B-4F05-9AFD-2F184A59EADC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{545E670D-141B-4F05-9AFD-2F184A59EADC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3DEB571-4EE4-4C89-9005-DB10D9FB561B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3DEB571-4EE4-4C89-9005-DB10D9FB561B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3DEB571-4EE4-4C89-9005-DB10D9FB561B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3DEB571-4EE4-4C89-9005-DB10D9FB561B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

 	<PropertyGroup>
-		<TargetFrameworks>netframework3.5;netframework4.0;netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net35;net40;net461;netstandard2.0;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 		<LangVersion>Latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<Authors>ds5678</Authors>
 		<Company>AssetRipper</Company>
-		<Version>2.1.0</Version>
+		<Version>3.1.6</Version>
 		<AssemblyVersion>$(Version)</AssemblyVersion>
 		<PackageId>AssetRipper.Primitives</PackageId>
 		<PackageTags>C# assetripper unity unity3d</PackageTags>
@@ -14,26 +14,45 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<PackageProjectUrl>https://github.com/AssetRipper/AssetRipper.Primitives</PackageProjectUrl>
-		<Copyright>Copyright (c) 2022-2023 ds5678</Copyright>
+		<Copyright>Copyright (c) 2022-2025 ds5678</Copyright>
 		<Description>Managed library for primitive types used in AssetRipper.</Description>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>1591</NoWarn>
 	</PropertyGroup>
-	
-	<PropertyGroup Condition=" '$(TargetFramework)' != 'netframework3.5' and '$(TargetFramework)' != 'netframework4.0' ">
+
+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
 		<IsTrimmable>true</IsTrimmable>
 	</PropertyGroup>

+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+		<IsAotCompatible>true</IsAotCompatible>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="PolySharp" Version="1.14.0">
+		<PackageReference Include="PolySharp" Version="1.14.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>

+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
+		<PackageReference Include="Microsoft.Bcl.HashCode">
+			<Version>1.1.1</Version>
+		</PackageReference>
+		<PackageReference Include="System.Memory">
+			<Version>4.5.5</Version>
+		</PackageReference>
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+		<PackageReference Include="System.ValueTuple">
+			<Version>4.5.0</Version>
+		</PackageReference>
+	</ItemGroup>
+
 </Project>
@@ -1,21 +1,31 @@
-#if NET7_0_OR_GREATER
+#if NET5_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER || NET461_OR_GREATER
 using System.Buffers.Binary;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.Json.Serialization;

 namespace AssetRipper.Primitives;

-[JsonConverter(typeof(UnityGuidJsonConverter))]
+#if NET5_0_OR_GREATER
+[System.Text.Json.Serialization.JsonConverter(typeof(UnityGuidJsonConverter))]
+#endif
 public readonly record struct UnityGuid
+#if NET7_0_OR_GREATER
+	: System.Numerics.IEqualityOperators<UnityGuid, UnityGuid, bool>
+#endif
 {
 	public UnityGuid(Guid guid)
 	{
+#if NET5_0_OR_GREATER
 		Span<byte> guidData = stackalloc byte[16];
 		bool success = guid.TryWriteBytes(guidData);
 		Debug.Assert(success);
+#else
+		Span<byte> guidData = guid.ToByteArray();
+#endif
 		ConvertSystemOrUnityBytes(guidData, guidData);
 		Data0 = ReadUInt32LittleEndian(guidData, 0);
 		Data1 = ReadUInt32LittleEndian(guidData, 1);
@@ -44,10 +54,24 @@ public readonly record struct UnityGuid
 		//This is not an acceptable way to convert between Unity and System Guids.
 		//We only do it this way to efficiently get 16 random bytes.
 		//We don't care about official Guid validity because Unity does not care either.
-		Guid guid = Guid.NewGuid();
-		ReadOnlySpan<Guid> guidSpan = new ReadOnlySpan<Guid>(in guid);
-		ReadOnlySpan<byte> byteSpan = MemoryMarshal.AsBytes(guidSpan);
-		return new UnityGuid(byteSpan);
+		if (Unsafe.SizeOf<Guid>() == Unsafe.SizeOf<UnityGuid>())
+		{
+			Guid guid = Guid.NewGuid();
+			return Unsafe.As<Guid, UnityGuid>(ref guid);
+		}
+		else
+		{
+			return ThrowOrReturnDefault();
+		}
+
+		static UnityGuid ThrowOrReturnDefault()
+		{
+#if DEBUG
+			throw new InvalidCastException($"{nameof(UnityGuid)} struct size does not match {nameof(Guid)}.");
+#else
+			return default;
+#endif
+		}
 	}

 	public static explicit operator UnityGuid(Guid systemGuid) => new UnityGuid(systemGuid);
@@ -57,7 +81,11 @@ public readonly record struct UnityGuid
 		Span<byte> span = stackalloc byte[16];
 		unityGuid.Write(span);
 		ConvertSystemOrUnityBytes(span, span);
+#if NET5_0_OR_GREATER
 		return new Guid(span);
+#else
+		return new Guid(span.ToArray());
+#endif
 	}

 	private void Write(Span<byte> span)
@@ -79,7 +107,16 @@ public readonly record struct UnityGuid
 	{
 		Span<char> span = stackalloc char[32];
 		ToString(span);
-		return new string(span);
+		return CreateString(span);
+
+		static string CreateString(Span<char> span)
+		{
+#if NET5_0_OR_GREATER
+			return new string(span);
+#else
+			return new string(span.ToArray());
+#endif
+		}
 	}

 	public void ToString(Span<char> buffer)
@@ -193,15 +230,31 @@ public readonly record struct UnityGuid
 	/// <returns>A stable guid corresponding to the <paramref name="input"/>.</returns>
 	public static UnityGuid Md5Hash(scoped ReadOnlySpan<byte> input)
 	{
-		byte[] hashBytes = MD5.HashData(input);
-		ConvertSystemOrUnityBytes(hashBytes, hashBytes);
-		return new UnityGuid(hashBytes);
+		Span<byte> buffer = stackalloc byte[16];
+		HashData(input, buffer);
+		ConvertSystemOrUnityBytes(buffer, buffer);
+		return new UnityGuid(buffer);
+	}
+
+	private static void HashData(ReadOnlySpan<byte> data, Span<byte> buffer)
+	{
+#if NET5_0_OR_GREATER
+		MD5.HashData(data, buffer);
+#else
+		MD5.Create().ComputeHash(data.ToArray()).AsSpan().CopyTo(buffer);
+#endif
 	}

 	public static UnityGuid Md5Hash(scoped ReadOnlySpan<byte> assemblyName, scoped ReadOnlySpan<byte> @namespace, scoped ReadOnlySpan<byte> className)
 	{
 		int length = assemblyName.Length + @namespace.Length + className.Length;
-		Span<byte> input = length < 1024 ? stackalloc byte[length] : GC.AllocateUninitializedArray<byte>(length);
+		Span<byte> input = length < 1024
+			? stackalloc byte[length]
+#if NET5_0_OR_GREATER
+			: GC.AllocateUninitializedArray<byte>(length);
+#else
+			: new byte[length];
+#endif
 		assemblyName.CopyTo(input);
 		@namespace.CopyTo(input.Slice(assemblyName.Length));
 		className.CopyTo(input.Slice(assemblyName.Length + @namespace.Length));
@@ -1,4 +1,4 @@
-#if NET7_0_OR_GREATER
+#if NET5_0_OR_GREATER
 using System.Text.Json;
 using System.Text.Json.Serialization;

@@ -2,10 +2,24 @@
 using System.Numerics;

 namespace AssetRipper.Primitives;
-partial struct UnityVersion : IComparisonOperators<UnityVersion, UnityVersion, bool>, IEqualityOperators<UnityVersion, UnityVersion, bool>, IMinMaxValue<UnityVersion>
+partial struct UnityVersion :
+	IComparisonOperators<UnityVersion, UnityVersion, bool>,
+	IEqualityOperators<UnityVersion, UnityVersion, bool>,
+	IMinMaxValue<UnityVersion>,
+	IParsable<UnityVersion>
 {
 	static UnityVersion IMinMaxValue<UnityVersion>.MaxValue => MaxVersion;

 	static UnityVersion IMinMaxValue<UnityVersion>.MinValue => MinVersion;
+
+	static UnityVersion IParsable<UnityVersion>.Parse(string s, IFormatProvider? provider)
+	{
+		return Parse(s);
+	}
+
+	static bool IParsable<UnityVersion>.TryParse(string? s, IFormatProvider? provider, out UnityVersion result)
+	{
+		return TryParse(s, out result, out _);
+	}
 }
 #endif
@@ -27,47 +27,7 @@ public readonly partial struct UnityVersion : IEquatable<UnityVersion>, ICompara
 	/// </returns>
 	public int CompareTo(UnityVersion other)
 	{
-		//Unity 6 is sequentially equivalent to Unity 2024 because
-		//they switched to back to the old versioning scheme.
-		const ushort FirstNewVersion = 6;
-
-		if (this == other)
-		{
-			return 0;
-		}
-
-		if (UsesYearNumbering(this))
-		{
-			if (UsesYearNumbering(other))
-			{
-				return CompareByData(this, other);
-			}
-			else
-			{
-				return other.Major < FirstNewVersion ? 1 : -1;
-			}
-		}
-		else
-		{
-			if (UsesYearNumbering(other))
-			{
-				return Major < FirstNewVersion ? -1 : 1;
-			}
-			else
-			{
-				return CompareByData(this, other);
-			}
-		}
-
-		static int CompareByData(UnityVersion x, UnityVersion y)
-		{
-			return x.m_data < y.m_data ? -1 : 1;
-		}
-
-		static bool UsesYearNumbering(UnityVersion version)
-		{
-			return version.Major is >= 2017 and <= 2023;
-		}
+		return m_data.CompareTo(other.m_data);
 	}

 	/// <summary>
@@ -90,6 +50,6 @@ public readonly partial struct UnityVersion : IEquatable<UnityVersion>, ICompara
 	/// <inheritdoc/>
 	public override int GetHashCode()
 	{
-		return unchecked(827 + 911 * m_data.GetHashCode());
+		return m_data.GetHashCode();
 	}
 }
@@ -0,0 +1,10 @@
+#if NET5_0_OR_GREATER
+using System.Text.Json.Serialization;
+
+namespace AssetRipper.Primitives;
+
+[JsonConverter(typeof(UnityVersionJsonConverter))]
+partial struct UnityVersion
+{
+}
+#endif
@@ -32,7 +32,7 @@ public readonly partial struct UnityVersion
 	/// <returns></returns>
 	public static bool operator >(UnityVersion left, UnityVersion right)
 	{
-		return left.CompareTo(right) > 0;
+		return left.m_data > right.m_data;
 	}

 	/// <summary>
@@ -43,7 +43,7 @@ public readonly partial struct UnityVersion
 	/// <returns></returns>
 	public static bool operator >=(UnityVersion left, UnityVersion right)
 	{
-		return left.CompareTo(right) >= 0;
+		return left.m_data >= right.m_data;
 	}

 	/// <summary>
@@ -54,7 +54,7 @@ public readonly partial struct UnityVersion
 	/// <returns></returns>
 	public static bool operator <(UnityVersion left, UnityVersion right)
 	{
-		return left.CompareTo(right) < 0;
+		return left.m_data < right.m_data;
 	}

 	/// <summary>
@@ -65,6 +65,6 @@ public readonly partial struct UnityVersion
 	/// <returns></returns>
 	public static bool operator <=(UnityVersion left, UnityVersion right)
 	{
-		return left.CompareTo(right) <= 0;
+		return left.m_data <= right.m_data;
 	}
 }
@@ -2,14 +2,8 @@
 using System.Text.RegularExpressions;

 namespace AssetRipper.Primitives;
-
 public readonly partial struct UnityVersion
 {
-	private static readonly Regex majorMinorRegex = new Regex(@"^([0-9]+)\.([0-9]+)$", RegexOptions.Compiled);
-	private static readonly Regex majorMinorBuildRegex = new Regex(@"^([0-9]+)\.([0-9]+)\.([0-9]+)$", RegexOptions.Compiled);
-	private static readonly Regex normalRegex = new Regex(@"^([0-9]+)\.([0-9]+)\.([0-9]+)\.?([abcfpx])([0-9]+)((?:.|[\r\n])+)?$", RegexOptions.Compiled);
-	private static readonly Regex chinaRegex = new Regex(@"^([0-9]+)\.([0-9]+)\.([0-9]+)\.?f1c([0-9]+)((?:.|[\r\n])+)?$", RegexOptions.Compiled);
-	
 	/// <summary>
 	/// Serialize the version as a string using <see cref="UnityVersionFormatFlags.Default"/>.
 	/// </summary>
@@ -90,15 +84,15 @@ public readonly partial struct UnityVersion
 	/// <param name="version">The parsed Unity version</param>
 	/// <param name="customEngine">Not null if this version was generated by a custom Unity Engine.</param>
 	/// <returns>True if parsing was successful</returns>
-	public static bool TryParse(string s, out UnityVersion version, out string? customEngine)
+	public static bool TryParse(string? s, out UnityVersion version, out string? customEngine)
 	{
-		if (string.IsNullOrEmpty(s))
+		if (s is null || s.Length is 0)
 		{
 			customEngine = null;
 			version = default;
 			return false;
 		}
-		else if (chinaRegex.TryMatch(s, out Match? match))
+		else if (UnityVersionRegexes.GetChinaRegex().TryMatch(s, out Match? match))
 		{
 			int major = int.Parse(match.Groups[1].Value);
 			int minor = int.Parse(match.Groups[2].Value);
@@ -108,7 +102,7 @@ public readonly partial struct UnityVersion
 			version = new UnityVersion((ushort)major, (ushort)minor, (ushort)build, UnityVersionType.China, (byte)typeNumber);
 			return true;
 		}
-		else if(normalRegex.TryMatch(s, out match))
+		else if(UnityVersionRegexes.GetNormalRegex().TryMatch(s, out match))
 		{
 			int major = int.Parse(match.Groups[1].Value);
 			int minor = int.Parse(match.Groups[2].Value);
@@ -119,21 +113,34 @@ public readonly partial struct UnityVersion
 			version = new UnityVersion((ushort)major, (ushort)minor, (ushort)build, type.ToUnityVersionType(), (byte)typeNumber);
 			return true;
 		}
-		else if (majorMinorBuildRegex.TryMatch(s, out match))
+		else if (UnityVersionRegexes.GetMajorMinorBuildRegex().TryMatch(s, out match))
 		{
 			int major = int.Parse(match.Groups[1].Value);
 			int minor = int.Parse(match.Groups[2].Value);
 			int build = int.Parse(match.Groups[3].Value);
 			customEngine = null;
-			version = new UnityVersion((ushort)major, (ushort)minor, (ushort)build, UnityVersionType.Final, 1);
+			version = major is not 0 || minor is not 0 || build is not 0
+				? new UnityVersion((ushort)major, (ushort)minor, (ushort)build, UnityVersionType.Final, 1)
+				: default;
 			return true;
 		}
-		else if (majorMinorRegex.TryMatch(s, out match))
+		else if (UnityVersionRegexes.GetMajorMinorRegex().TryMatch(s, out match))
 		{
 			int major = int.Parse(match.Groups[1].Value);
 			int minor = int.Parse(match.Groups[2].Value);
 			customEngine = null;
-			version = new UnityVersion((ushort)major, (ushort)minor, 0, UnityVersionType.Final, 1);
+			version = major is not 0 || minor is not 0
+				? new UnityVersion((ushort)major, (ushort)minor, 0, UnityVersionType.Final, 1)
+				: default;
+			return true;
+		}
+		else if (UnityVersionRegexes.GetMajorRegex().TryMatch(s, out match))
+		{
+			int major = int.Parse(match.Groups[1].Value);
+			customEngine = null;
+			version = major is not 0
+				? new UnityVersion((ushort)major, 0, 0, UnityVersionType.Final, 1)
+				: default;
 			return true;
 		}
 		else
@@ -0,0 +1,19 @@
+#if NET5_0_OR_GREATER
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace AssetRipper.Primitives;
+
+public sealed class UnityVersionJsonConverter : JsonConverter<UnityVersion>
+{
+	public override UnityVersion Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		return UnityVersion.Parse(reader.GetString() ?? throw new JsonException("String was read as null"));
+	}
+
+	public override void Write(Utf8JsonWriter writer, UnityVersion value, JsonSerializerOptions options)
+	{
+		writer.WriteStringValue(value.ToString());
+	}
+}
+#endif
@@ -0,0 +1,68 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+namespace AssetRipper.Primitives;
+
+internal static partial class UnityVersionRegexes
+{
+#if NET35
+	private const RegexOptions Options = RegexOptions.None;
+#else
+	private const RegexOptions Options = RegexOptions.Compiled;
+#endif
+
+	[StringSyntax("regex")]
+	private const string Major = @"^([0-9]+)$";
+
+	[StringSyntax("regex")]
+	private const string MajorMinor = @"^([0-9]+)\.([0-9]+)$";
+
+	[StringSyntax("regex")]
+	private const string MajorMinorBuild = @"^([0-9]+)\.([0-9]+)\.([0-9]+)$";
+
+	[StringSyntax("regex")]
+	private const string Normal = @"^([0-9]+)\.([0-9]+)\.([0-9]+)\.?([abcfpx])([0-9]+)((?:.|[\r\n])+)?$";
+
+	[StringSyntax("regex")]
+	private const string China = @"^([0-9]+)\.([0-9]+)\.([0-9]+)\.?f1c([0-9]+)((?:.|[\r\n])+)?$";
+
+#if NET7_0_OR_GREATER
+	[GeneratedRegex(Major, Options)]
+	public static partial Regex GetMajorRegex();
+#else
+	private static readonly Regex majorRegex = new Regex(Major, Options);
+	public static Regex GetMajorRegex() => majorRegex;
+#endif
+
+#if NET7_0_OR_GREATER
+	[GeneratedRegex(MajorMinor, Options)]
+	public static partial Regex GetMajorMinorRegex();
+#else
+	private static readonly Regex majorMinorRegex = new Regex(MajorMinor, Options);
+	public static Regex GetMajorMinorRegex() => majorMinorRegex;
+#endif
+
+#if NET7_0_OR_GREATER
+	[GeneratedRegex(MajorMinorBuild, Options)]
+	public static partial Regex GetMajorMinorBuildRegex();
+#else
+	private static readonly Regex majorMinorBuildRegex = new Regex(MajorMinorBuild, Options);
+	public static Regex GetMajorMinorBuildRegex() => majorMinorBuildRegex;
+#endif
+
+#if NET7_0_OR_GREATER
+	[GeneratedRegex(Normal, Options)]
+	public static partial Regex GetNormalRegex();
+#else
+	private static readonly Regex normalRegex = new Regex(Normal, Options);
+	public static Regex GetNormalRegex() => normalRegex;
+#endif
+
+#if NET7_0_OR_GREATER
+	[GeneratedRegex(China, Options)]
+	public static partial Regex GetChinaRegex();
+#else
+	private static readonly Regex chinaRegex = new Regex(China, Options);
+	public static Regex GetChinaRegex() => chinaRegex;
+#endif
+}
@@ -1,4 +1,4 @@
-#if NET7_0_OR_GREATER
+#if NET5_0_OR_GREATER || NETSTANDARD2_0_OR_GREATER || NET461_OR_GREATER
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
@@ -11,7 +11,15 @@ namespace AssetRipper.Primitives;
 /// <remarks>
 /// Conversions to and from <see cref="string"/> are handled by <see cref="Encoding.UTF8"/>.
 /// </remarks>
-public sealed class Utf8String : IEquatable<Utf8String>
+#if NET5_0_OR_GREATER
+[System.Text.Json.Serialization.JsonConverter(typeof(Utf8StringJsonConverter))]
+#endif
+public sealed class Utf8String :
+#if NET7_0_OR_GREATER
+	System.Numerics.IEqualityOperators<Utf8String?, Utf8String?, bool>,
+	System.Numerics.IEqualityOperators<Utf8String?, string?, bool>,
+#endif
+	IEquatable<Utf8String>
 {
 	private readonly byte[] data;
 	private string? cachedString;
@@ -23,7 +31,7 @@ public sealed class Utf8String : IEquatable<Utf8String>
 	/// </summary>
 	public Utf8String()
 	{
-		data = Array.Empty<byte>();
+		data = [];
 		cachedString = "";
 	}

@@ -60,7 +68,14 @@ public sealed class Utf8String : IEquatable<Utf8String>
 	public override int GetHashCode()
 	{
 		HashCode hash = new();
+#if NET6_0_OR_GREATER
 		hash.AddBytes(data);
+#else
+		foreach (byte b in data)
+		{
+			hash.Add(b);
+		}
+#endif
 		return hash.ToHashCode();
 	}

@@ -198,7 +213,10 @@ public sealed class Utf8String : IEquatable<Utf8String>

 	public static Utf8String Concat(params Utf8String?[] values)
 	{
-		ArgumentNullException.ThrowIfNull(values);
+		if (values is null)
+		{
+			throw new ArgumentNullException(nameof(values));
+		}

 		int totalLength = 0;
 		foreach (Utf8String? value in values)
@@ -0,0 +1,19 @@
+#if NET5_0_OR_GREATER
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace AssetRipper.Primitives;
+
+public sealed class Utf8StringJsonConverter : JsonConverter<Utf8String>
+{
+	public override Utf8String Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		return reader.GetString() ?? throw new JsonException("String was read as null");
+	}
+
+	public override void Write(Utf8JsonWriter writer, Utf8String value, JsonSerializerOptions options)
+	{
+		writer.WriteStringValue(value.ToString());
+	}
+}
+#endif
Author	SHA1	Message	Date
ds5678	c3ff29e8d7	Bump version to 3.1.6 in project file Updated the version number from 3.1.5 to 3.1.6 in the AssetRipper.Primitives.csproj file.	2025-02-22 21:43:28 -08:00
ds5678	61f47faf04	Utf8StringJsonConverter	2025-02-22 21:42:49 -08:00
ds5678	57912c52f1	Update version to 3.1.5 and adjust project properties - Bump version number from 3.1.4 to 3.1.5. - Update copyright year to 2025. - Add property group for trimmability with net6.0. - Modify AOT compatibility check for net8.0.	2025-02-13 16:03:05 -08:00
ds5678	5ab5d744d6	UnityVersion : IParsable<UnityVersion>	2025-02-13 15:57:20 -08:00
ds5678	cd7f841845	Json serialization support for UnityVersion	2025-02-13 15:56:24 -08:00
ds5678	9a5f8bb707	.NET 9 support	2025-02-13 15:47:09 -08:00
dependabot[bot]	089c71d944	Bump actions/setup-dotnet from 4.1.0 to 4.3.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.1.0 to 4.3.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.1.0...v4.3.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>	2025-02-13 18:44:41 -05:00
ds5678	919fa0d5ab	Don't bother testing .NET 5	2025-02-13 15:40:27 -08:00
ds5678	df8c5e2879	All frameworks	2025-02-13 15:34:49 -08:00
ds5678	13ece60907	Remove dotnet restore	2025-02-13 15:26:28 -08:00
ds5678	3a46414f08	.net 8 only	2025-02-13 15:24:08 -08:00
ds5678	bc556b7c72	.net 8	2025-02-13 15:23:01 -08:00
ds5678	7147a5d5b1	Strings instead of floats	2025-02-13 15:21:08 -08:00
ds5678	776ab543fa	Use a build matrix	2025-02-13 15:18:48 -08:00
ds5678	ca701a43dc	Bump version	2024-12-19 13:51:34 -08:00
ds5678	f478cd8015	Make regexes more strict	2024-12-19 13:50:51 -08:00
dependabot[bot]	8cd69e8946	Bump actions/setup-dotnet from 4.0.1 to 4.1.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.0.1...v4.1.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>	2024-12-19 13:32:52 -08:00
dependabot[bot]	3cba893ff2	Bump actions/setup-dotnet from 4.0.0 to 4.0.1 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>	2024-08-06 21:29:50 -07:00
ds5678	9c4a7d8127	Bump version	2024-08-06 19:42:08 -07:00
ds5678	fd3590ad52	Tiered Regex compilation	2024-08-06 19:37:36 -07:00
ds5678	3ef5dae9d4	IEqualityOperators	2024-06-09 16:57:21 -07:00
ds5678	78ecfb7de4	Bump version	2024-05-31 07:23:23 -07:00
ds5678	5080b7eb29	Add net461 target	2024-05-31 07:17:06 -07:00
ds5678	2e8940973f	Bump version	2024-05-19 17:40:14 -04:00
ds5678	64f50b46fb	Add .NET 8 to the CI workflow	2024-05-19 17:34:41 -04:00
ds5678	fbdda777ac	Remove package reference to System.Text.Json	2024-05-19 17:32:46 -04:00
ds5678	2de06bfaf4	.NET target	2024-05-19 17:28:57 -04:00
ds5678	c7a8932863	Remove benchmarks	2024-05-19 17:25:33 -04:00
ds5678	4bcc823371	Bump version	2024-04-20 15:55:53 -07:00
ds5678	7630da6da0	Improve parsing of version zero	2024-04-20 15:55:14 -07:00
ds5678	e5802e39ee	Parse with only the major version	2024-04-20 15:44:19 -07:00
ds5678	c663c68124	Bump version	2024-04-15 19:51:42 -07:00
dependabot[bot]	fa2458cfae	Bump Microsoft.NET.Test.Sdk from 17.8.0 to 17.9.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.8.0 to 17.9.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.8.0...v17.9.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>	2024-04-15 08:04:23 -07:00
dependabot[bot]	ee923d8e9b	Bump coverlet.collector from 6.0.0 to 6.0.2 Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.0 to 6.0.2. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.0...v6.0.2) --- updated-dependencies: - dependency-name: coverlet.collector dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>	2024-04-15 08:04:14 -07:00
dependabot[bot]	8b23a0c671	Bump NUnit.Analyzers from 3.10.0 to 4.1.0 Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 3.10.0 to 4.1.0. - [Release notes](https://github.com/nunit/nunit.analyzers/releases) - [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.txt) - [Commits](https://github.com/nunit/nunit.analyzers/compare/3.10.0...4.1.0) --- updated-dependencies: - dependency-name: NUnit.Analyzers dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>	2024-04-15 08:04:04 -07:00
ds5678	f56feaf217	Remove incorrect code for Unity 6	2024-04-14 22:20:30 -07:00
ds5678	bd575f0063	Bump Version * Expand support for UnityGuid and Utf8String to .NET Standard	2024-01-15 00:19:28 -05:00
dependabot[bot]	0a6b003bf2	Bump BenchmarkDotNet from 0.13.11 to 0.13.12 Bumps [BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet) from 0.13.11 to 0.13.12. - [Release notes](https://github.com/dotnet/BenchmarkDotNet/releases) - [Commits](https://github.com/dotnet/BenchmarkDotNet/compare/v0.13.11...v0.13.12) --- updated-dependencies: - dependency-name: BenchmarkDotNet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>	2024-01-09 09:38:48 -05:00
dependabot[bot]	f4026adfd0	Bump PolySharp from 1.14.0 to 1.14.1 Bumps [PolySharp](https://github.com/Sergio0694/PolySharp) from 1.14.0 to 1.14.1. - [Release notes](https://github.com/Sergio0694/PolySharp/releases) - [Commits](https://github.com/Sergio0694/PolySharp/compare/1.14.0...1.14.1) --- updated-dependencies: - dependency-name: PolySharp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>	2023-12-18 15:14:12 -05:00