mirror of
https://github.com/AssetRipper/AssetRipper.Primitives.git
synced 2026-11-13 04:26:30 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c663c68124 | ||
|
|
fa2458cfae | ||
|
|
ee923d8e9b | ||
|
|
8b23a0c671 | ||
|
|
f56feaf217 |
No files matched your search
@@ -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));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<Authors>ds5678</Authors>
|
||||
<Company>AssetRipper</Company>
|
||||
<Version>2.1.1</Version>
|
||||
<Version>3.0.0</Version>
|
||||
<AssemblyVersion>$(Version)</AssemblyVersion>
|
||||
<PackageId>AssetRipper.Primitives</PackageId>
|
||||
<PackageTags>C# assetripper unity unity3d</PackageTags>
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user