fix: applying bunch of fixes

Author: DaanV2

.github/workflows/publish.yml

@@ -68,7 +68,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            7.0.x
             8.0.x
             9.0.x
 

Benchmark/Benchmark.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPublishable>False</IsPublishable>

Benchmark/Dictionary/Class.cs

@@ -1,7 +1,10 @@
 namespace Benchmark.Dictionary;
 
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
 public class DictonaryTestClass {
     public String Data1 { get; set; }
     public String Data2 { get; set; }
     public String Data3 { get; set; }
 }
+
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.

Library/Classes/UUIDJsonConverter/UUIDJsonConverter.cs

@@ -12,12 +12,12 @@ public partial class UUIDJsonConverter : JsonConverter<UUID> {
     public override UUID Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
         ReadOnlySpan<Byte> data = reader.ValueSpan;
 
-        if (data != null && data.Length == Format.UUID_STRING_LENGTH) {
-            Vector128<Byte> d = Format.Parse(data);
-            return new UUID(d);
+        if (data == Span<Byte>.Empty || data.Length != Format.UUID_STRING_LENGTH) {
+            throw new JsonException("Unknown UUID format");
         }
 
-        throw new JsonException("Unknown UUID format");
+        Vector128<Byte> d = Format.Parse(data);
+        return new UUID(d);
     }
 
     /// <inheritdoc/>

Library/DaanV2.UUID.Net.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>DaanV2.UUID.Net</AssemblyName>
@@ -23,9 +23,8 @@ Complies with the RFC 4122 / RFC 9562 standard. And has version 1-8 UUIDs implem
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/DaanV2/DaanV2.UUID.Net</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <PackageTags>UUID;RFC-4122;V1;V3;V4;V5;V6;V7;V8</PackageTags>
-  <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-  <PackageLicenseFile>LICENSE.rfc9562.txt</PackageLicenseFile>
+    <PackageTags>UUID;RFC-4122;RFC-9562;V1;V2;V3;V4;V5;V6;V7;V8</PackageTags>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
@@ -59,13 +58,13 @@ Complies with the RFC 4122 / RFC 9562 standard. And has version 1-8 UUIDs implem
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\README.md">
     <None Include="..\LICENSE.rfc9562.txt">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
+        <Pack>True</Pack>
+        <PackagePath>\</PackagePath>
     </None>
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
+    <None Include="..\README.md">
+        <Pack>True</Pack>
+        <PackagePath>\</PackagePath>
     </None>
     <None Include="..\Resources\icon.png">
       <Pack>True</Pack>

Library/Static Classes/Format/Format - Extract.cs

@@ -19,7 +19,7 @@ public static (UInt64 bits48, UInt16 bits12, UInt64 bits62) Extract(UUID uuid) {
 
         // Remove top 2 bits, so we have 62 bits of data
         const UInt64 mask = 0xC000000000000000u;
-        dataC = (dataC & ~mask);
+        dataC &= ~mask;
 
         return (dataA, dataB, dataC);
     }

Library/Static Classes/V1/V1 - Generate.cs

@@ -75,16 +75,16 @@ internal static UUID Generate(UInt64 timestamp, UInt16 nanoSeconds, ReadOnlySpan
         UInt32 timeLow = (UInt32)(timestamp & 0xFFFFFFFF);
         UInt16 timeMid = (UInt16)((timestamp >> 32) & 0xFFFF);
         UInt16 timeHi = (UInt16)((timestamp >> 48) & 0x0FFF); // 12 bits for time_hi
-        UInt16 timeHiAndVersion = (UInt16)(timeHi | ((byte)V1.Version << 12)); // Set version 1 using constant
+        UInt16 timeHiAndVersion = (UInt16)(timeHi | ((UInt16)V1.Version << 12)); // Set version 1 using constant
 
         BinaryPrimitives.WriteUInt32BigEndian(data, timeLow);
         BinaryPrimitives.WriteUInt16BigEndian(data[4..], timeMid);
         BinaryPrimitives.WriteUInt16BigEndian(data[6..], timeHiAndVersion);
 
         // Split nanoSeconds (clock sequence) into 14 bits
         UInt16 clockSeq = (UInt16)(nanoSeconds & 0x3FFF);
-        data[8] = (byte)(((clockSeq >> 8) & 0x3F) | (byte)V1.Variant); // Set variant using constant
-        data[9] = (byte)(clockSeq & 0xFF);
+        data[8] = (Byte)(((clockSeq >> 8) & 0x3F) | (Byte)V1.Variant); // Set variant using constant
+        data[9] = (Byte)(clockSeq & 0xFF);
 
         var uuid = Vector128.Create<Byte>(data);
         return new UUID(uuid);

Library/Static Classes/V2/V2 - Batch.cs

@@ -3,24 +3,24 @@
 namespace DaanV2.UUID;
 
 public static partial class V2 {
-    /// <inheritdoc cref="Batch(Int32, DateTime, ReadOnlySpan{Byte})"/>
+    /// <inheritdoc cref="Batch(Int32, DateTime, ReadOnlySpan{Byte}, Byte)"/>
 
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static UUID[] Batch(Int32 amount, byte domain = 0) {
+    public static UUID[] Batch(Int32 amount, Byte domain = 0) {
         return Batch(amount, DateTime.UtcNow, V1.GetMacAddressBytes(), domain);
     }
 
-    /// <inheritdoc cref="Batch(Int32, DateTime, ReadOnlySpan{Byte})"/>
+    /// <inheritdoc cref="Batch(Int32, DateTime, ReadOnlySpan{Byte}, Byte)"/>
 
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static UUID[] Batch(Int32 amount, DateTime startTimestamp, byte domain = 0) {
+    public static UUID[] Batch(Int32 amount, DateTime startTimestamp, Byte domain = 0) {
         return Batch(amount, startTimestamp, V1.GetMacAddressBytes(), domain);
     }
 
-    /// <inheritdoc cref="Batch(Int32, DateTime, ReadOnlySpan{Byte})"/>
+    /// <inheritdoc cref="Batch(Int32, DateTime, ReadOnlySpan{Byte}, Byte)"/>
 
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static UUID[] Batch(Int32 amount, ReadOnlySpan<Byte> macAddress, byte domain = 0) {
+    public static UUID[] Batch(Int32 amount, ReadOnlySpan<Byte> macAddress, Byte domain = 0) {
         return Batch(amount, DateTime.UtcNow, macAddress, domain);
     }
 
@@ -29,14 +29,15 @@ public static UUID[] Batch(Int32 amount, ReadOnlySpan<Byte> macAddress, byte dom
     /// <param name="amount">The amount of <see cref="UUID"/> to create</param>
     /// <param name="startTimestamp">The time to start at, will increment for each following <see cref="UUID"/></param>
     /// <param name="macAddress">The macAddress to use, excepts to be 6 bytes</param>
+    /// <param name="domain">An byte to indicate the domain</param>
     /// <returns>A collection of <see cref="UUID"/></returns>
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static UUID[] Batch(Int32 amount, DateTime startTimestamp, ReadOnlySpan<Byte> macAddress, byte domain = 0) {
+    public static UUID[] Batch(Int32 amount, DateTime startTimestamp, ReadOnlySpan<Byte> macAddress, Byte domain = 0) {
         var uuids = new UUID[amount];
         DateTime timestamp = startTimestamp;
         for (Int32 i = 0; i < amount; i++) {
             // Use i as the local identifier (UID/GID) for demonstration; domain is passed in
-            uuids[i] = Generate(timestamp, (uint)i, macAddress, domain);
+            uuids[i] = Generate(timestamp, (UInt32)i, macAddress, domain);
             // Optionally increment timestamp if you want unique timestamps per UUID
             if (i % UInt16.MaxValue == 0) {
                 timestamp = timestamp.AddTicks(1);

Library/Static Classes/V2/V2 - Generate.cs

@@ -1,8 +1,6 @@
 using System.Buffers.Binary;
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
-using System.Runtime.InteropServices;
-using System;
 
 namespace DaanV2.UUID;
 
@@ -20,19 +18,19 @@ public static UUID Generate() {
     /// Generates a Version 2 UUID with custom timestamp, UID, and MAC address.
     /// </summary>
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static UUID Generate(DateTime timestamp, uint localIdentifier, ReadOnlySpan<byte> macAddress, byte domain = 0) {
-        ulong uuidTimestamp = V1.TimeStamp(timestamp);
+    public static UUID Generate(DateTime timestamp, UInt32 localIdentifier, ReadOnlySpan<Byte> macAddress, Byte domain = 0) {
+        UInt64 uuidTimestamp = V1.TimeStamp(timestamp);
 
-        Span<byte> data = stackalloc byte[16];
+        Span<Byte> data = stackalloc Byte[16];
 
         // Write node (MAC address)
         macAddress.CopyTo(data[10..]);
 
         // Split timestamp
-        uint timeLow = (uint)(uuidTimestamp & 0xFFFFFFFF);
-        ushort timeMid = (ushort)((uuidTimestamp >> 32) & 0xFFFF);
-        ushort timeHi = (ushort)((uuidTimestamp >> 48) & 0x0FFF); // 12 bits for time_hi
-        ushort timeHiAndVersion = (ushort)(timeHi | ((ushort)Version.V2)); // Set version 2
+        UInt32 timeLow = (UInt32)(uuidTimestamp & 0xFFFFFFFF);
+        UInt16 timeMid = (UInt16)((uuidTimestamp >> 32) & 0xFFFF);
+        UInt16 timeHi = (UInt16)((uuidTimestamp >> 48) & 0x0FFF); // 12 bits for time_hi
+        UInt16 timeHiAndVersion = (UInt16)(timeHi | ((UInt16)Version.V2)); // Set version 2
 
         BinaryPrimitives.WriteUInt32BigEndian(data, timeLow);
         BinaryPrimitives.WriteUInt16BigEndian(data[4..], timeMid);
@@ -41,7 +39,7 @@ public static UUID Generate(DateTime timestamp, uint localIdentifier, ReadOnlySp
         // Per RFC 4122 DCE Security UUID:
         // data[8]: high 2 bits = variant, low 6 bits = high 6 bits of local identifier
         // data[9]: domain (per spec), or low 8 bits of local identifier if domain not used
-        data[8] = (byte)(((localIdentifier >> 8) & 0x3F) | (byte)Variant.V1);
+        data[8] = (Byte)(((localIdentifier >> 8) & 0x3F) | (Byte)Variant.V1);
         data[9] = domain; // Store domain in data[9]
 
         var uuid = Vector128.Create<Byte>(data);
@@ -51,10 +49,11 @@ public static UUID Generate(DateTime timestamp, uint localIdentifier, ReadOnlySp
     /// <summary>
     /// Gets the current user's UID (Linux only). Returns 0 if not available.
     /// </summary>
-    private static uint GetCurrentUid() {
+    private static UInt32 GetCurrentUid() {
         try {
-            return (uint)System.Convert.ToInt32(Environment.GetEnvironmentVariable("UID") ?? "0");
-        } catch {
+            return (UInt32)System.Convert.ToInt32(Environment.GetEnvironmentVariable("UID") ?? "0");
+        }
+        catch {
             return 0;
         }
     }
@@ -65,11 +64,11 @@ private static uint GetCurrentUid() {
     [MethodImpl(MethodImplOptions.AggressiveOptimization | MethodImplOptions.AggressiveInlining)]
     public static UUID Generate(ReadOnlySpan<Byte> source) {
         // Not standard for V2, but for API compatibility: hash and overlay version/variant
-        Span<byte> data = stackalloc byte[16];
+        Span<Byte> data = stackalloc Byte[16];
         System.Security.Cryptography.MD5.HashData(source, data);
         // Set version and variant using V2.Version and V2.Variant constants
-        data[6] = (byte)((data[6] & 0x0F) | (byte)Version.V2);
-        data[8] = (byte)((data[8] & 0x3F) | (byte)Variant.V1);
+        data[6] = (Byte)((data[6] & 0x0F) | (Byte)Version.V2);
+        data[8] = (Byte)((data[8] & 0x3F) | (Byte)Variant.V1);
 
         var uuid = Vector128.Create<Byte>(data);
         return new UUID(uuid);

Library/Static Classes/V2/V2 - Utillity.cs

@@ -0,0 +1,16 @@
+using System.Net.NetworkInformation;
+
+namespace DaanV2.UUID;
+
+public static partial class V2 {
+
+    /// <inheritdoc cref="V1.GetMacAddress"/>
+    public static PhysicalAddress? GetMacAddress() {
+        return V1.GetMacAddress();
+    }
+
+    /// <inheritdoc cref="V1.GetMacAddressBytes"/>
+    public static Byte[] GetMacAddressBytes() {
+        return V1.GetMacAddressBytes();
+    }
+}