Merge pull request #6 from Cysharp/feature/UpdateTargetFrameworks

Update TargetFrameworks (net6.0;net8.0 -> net8.0;net9.0)
Cysharp · Dec 27, 2024 · d8ae8ba · d8ae8ba
2 parents c8c590d + 0741da5
commit d8ae8ba
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 28 deletions.
diff --git a/src/Multicaster.Distributed.Nats/KeyArrayFormatter.cs b/src/Multicaster.Distributed.Nats/KeyArrayFormatter.cs
@@ -9,12 +9,6 @@ internal static class KeyArrayFormatter<TKey>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void Serialize(ref MessagePackWriter writer, ReadOnlySpan<TKey> values)
     {
-        if (values == null)
-        {
-            writer.WriteNil();
-            return;
-        }
-
         writer.WriteArrayHeader(values.Length);
         foreach (var value in values)
         {

diff --git a/src/Multicaster.Distributed.Nats/Multicaster.Distributed.Nats.csproj b/src/Multicaster.Distributed.Nats/Multicaster.Distributed.Nats.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

diff --git a/src/Multicaster.Distributed.Redis/KeyArrayFormatter.cs b/src/Multicaster.Distributed.Redis/KeyArrayFormatter.cs
@@ -9,12 +9,6 @@ internal static class KeyArrayFormatter<TKey>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void Serialize(ref MessagePackWriter writer, ReadOnlySpan<TKey> values)
     {
-        if (values == null)
-        {
-            writer.WriteNil();
-            return;
-        }
-
         writer.WriteArrayHeader(values.Length);
         foreach (var value in values)
         {

diff --git a/src/Multicaster.Distributed.Redis/Multicaster.Distributed.Redis.csproj b/src/Multicaster.Distributed.Redis/Multicaster.Distributed.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

diff --git a/src/Multicaster/Internal/FNV1A32.cs b/src/Multicaster/Internal/FNV1A32.cs
@@ -14,14 +14,10 @@ public static int GetHashCode(string str)
 
     public static int GetHashCode(ReadOnlySpan<byte> obj)
     {
-        uint hash = 0;
-        if (obj != null)
+        uint hash = 2166136261;
+        for (int i = 0; i < obj.Length; i++)
         {
-            hash = 2166136261;
-            for (int i = 0; i < obj.Length; i++)
-            {
-                hash = unchecked((obj[i] ^ hash) * 16777619);
-            }
+            hash = unchecked((obj[i] ^ hash) * 16777619);
         }
 
         return unchecked((int)hash);

diff --git a/src/Multicaster/Multicaster.csproj b/src/Multicaster/Multicaster.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,11 +10,6 @@
     <RootNamespace>Cysharp.Runtime.Multicast</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="Remoting\RemoteProxyBase.Invoke.tt">
       <Generator>TextTemplatingFileGenerator</Generator>

diff --git a/test/Multicaster.Tests/RemoteClientResultPendingTaskRegistryTest.cs b/test/Multicaster.Tests/RemoteClientResultPendingTaskRegistryTest.cs
@@ -49,7 +49,7 @@ public void CancelImmediately_On_Register_When_Disposed()
     }
 
     [Fact]
-    public async Task Timeout()
+    public void Timeout()
     {
         // Arrange
         var timeProvider = new FakeTimeProvider();