Merge pull request #5 from crookseta/dev

Fixed major bug and updated dependencies.

Author: crookseta

.gitignore

@@ -399,3 +399,4 @@ FodyWeavers.xsd
 /src/MissingValues/MathQ.MathFunctions.cs
 /src/MissingValues/Properties/MissingValues.AssemblyInfo.cs
 /src/MissingValues/Properties/AssemblyInfo.cs
+/src/MissingValues.Benchmarks/MissingValues.Benchmarks.csproj

src/MissingValues.Benchmarks/MissingValues.Benchmarks.csproj

@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
   </ItemGroup>
 
   <ItemGroup>

src/MissingValues.Benchmarks/Program.cs

@@ -10,20 +10,25 @@
 using System.Runtime.Intrinsics;
 using System.Windows.Markup;
 
-BenchmarkRunner.Run(
-	new Type[]
-	{
-		typeof(UInt256Benchmarks.MathOperators),
-		typeof(UInt256Benchmarks.Formatting),
-		typeof(UInt256Benchmarks.Parsing),
-		typeof(UInt256Benchmarks.Operations),
-		typeof(UInt512Benchmarks.MathOperators),
-		typeof(UInt512Benchmarks.Formatting),
-		typeof(UInt512Benchmarks.Parsing),
-		typeof(UInt512Benchmarks.Operations),
-		typeof(QuadBenchmarks.MathOperators),
-		typeof(QuadBenchmarks.Parser),
-	}
-);
+//BenchmarkRunner.Run(
+//	new Type[]
+//	{
+//		typeof(UInt256Benchmarks.MathOperators),
+//		typeof(UInt256Benchmarks.Formatting),
+//		typeof(UInt256Benchmarks.Parsing),
+//		typeof(UInt256Benchmarks.Operations),
+//		typeof(UInt512Benchmarks.MathOperators),
+//		typeof(UInt512Benchmarks.Formatting),
+//		typeof(UInt512Benchmarks.Parsing),
+//		typeof(UInt512Benchmarks.Operations),
+//		typeof(QuadBenchmarks.MathOperators),
+//		typeof(QuadBenchmarks.Parser),
+//	}
+//);
 
+//BenchmarkRunner.Run<QuadBenchmarks.MathOperators>();
+
+UInt128 uInt = new UInt128(0xFFFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFFF);
+
+Console.WriteLine(uInt.GetUpperBits());
 Console.ReadLine();

src/MissingValues.Benchmarks/QuadBenchmarks.cs

@@ -1,4 +1,5 @@
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

src/MissingValues.Tests/MissingValues.Tests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,14 +10,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.4" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/MissingValues/Internals/BitHelper.cs

@@ -25,37 +25,7 @@ public static void GetUpperAndLowerBits(Int128 value, out ulong upper, out ulong
 			upper = value.GetUpperBits();
 		}
 
-#if NET8_0_OR_GREATER
-		[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_upper")]
-		private static extern ref ulong GetUpperBitsInternal(UInt128 uInt128);
-		[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_lower")]
-		private static extern ref ulong GetLowerBitsInternal(UInt128 uInt128);
-		[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_upper")]
-		private static extern ref ulong GetUpperBitsInternal(Int128 int128);
-		[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_lower")]
-		private static extern ref ulong GetLowerBitsInternal(Int128 int128);
 
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public static ulong GetUpperBits(this in UInt128 value)
-		{
-			return GetUpperBitsInternal(value);
-		}
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public static ulong GetUpperBits(this in Int128 value)
-		{
-			return GetUpperBitsInternal(value);
-		}
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public static ulong GetLowerBits(this in UInt128 value)
-		{
-			return GetLowerBitsInternal(value);
-		}
-		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public static ulong GetLowerBits(this in Int128 value)
-		{
-			return GetLowerBitsInternal(value);
-		}
-#else
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static ulong GetUpperBits(this in UInt128 value)
 		{
@@ -76,7 +46,6 @@ public static ulong GetLowerBits(this in Int128 value)
 		{
 			return unchecked((ulong)(value));
 		}
-#endif
 
 		public static void GetDoubleParts(double dbl, out int sign, out int exp, out ulong man, out bool fFinite)
 		{

src/MissingValues/MissingValues.csproj

@@ -27,7 +27,7 @@
 
     <DefineConstants Condition="'$(IsBigEndian)' == 'true'">$(DefineConstants);BIGENDIAN</DefineConstants>
 
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>