Implement dual targetting (#565)

akkadotnet · Jan 23, 2025 · 1832d3b · 1832d3b
1 parent 4187906
commit 1832d3b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,6 +20,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <LibraryFramework>netstandard2.0</LibraryFramework>
+    <NetLibraryFramework>net6.0</NetLibraryFramework>
     <TestsNetCoreFramework>net8.0</TestsNetCoreFramework>
     <XunitVersion>2.8.1</XunitVersion>
     <TestSdkVersion>17.11.1</TestSdkVersion>

diff --git a/src/Akka.Cluster.Hosting/Akka.Cluster.Hosting.csproj b/src/Akka.Cluster.Hosting/Akka.Cluster.Hosting.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(LibraryFramework)</TargetFramework>
+    <TargetFrameworks>$(LibraryFramework);$(NetLibraryFramework)</TargetFrameworks>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <Description>Akka.Cluster and Akka.Cluster.Sharding Microsoft.Extensions.Hosting support.</Description>
   </PropertyGroup>

diff --git a/src/Akka.Cluster.Hosting/AkkaClusterHostingExtensions.cs b/src/Akka.Cluster.Hosting/AkkaClusterHostingExtensions.cs
@@ -365,7 +365,7 @@ public override string ToString()
                 sb.AppendLine($"remember-entities = {RememberEntities.ToHocon()}");
 
             if(RememberEntitiesStore is not null)
-                sb.AppendLine($"remember-entities-store = {RememberEntitiesStore.ToString().ToLowerInvariant().ToHocon()}");
+                sb.AppendLine($"remember-entities-store = {RememberEntitiesStore.Value.ToString().ToLowerInvariant().ToHocon()}");
 
             var journalId = JournalOptions?.PluginId ?? JournalPluginId ?? null;
             if (journalId is not null)
@@ -376,7 +376,7 @@ public override string ToString()
                 sb.AppendLine($"snapshot-plugin-id = {snapshotId.ToHocon()}");
 
             if (StateStoreMode is not null)
-                sb.AppendLine($"state-store-mode = {StateStoreMode.ToString().ToLowerInvariant().ToHocon()}");
+                sb.AppendLine($"state-store-mode = {StateStoreMode.Value.ToString().ToLowerInvariant().ToHocon()}");
 
             if (LeaseImplementation is not null)
                 sb.AppendLine($"use-lease = {LeaseImplementation.ConfigPath}");

diff --git a/src/Akka.Hosting.TestKit/Akka.Hosting.TestKit.csproj b/src/Akka.Hosting.TestKit/Akka.Hosting.TestKit.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>TestKit for writing tests for Akka.NET using Akka.Hosting and xUnit.</Description>
-        <TargetFramework>$(LibraryFramework)</TargetFramework>
+        <TargetFrameworks>$(LibraryFramework);$(NetLibraryFramework)</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <IsPackable>true</IsPackable>
         <IsTestProject>false</IsTestProject>

diff --git a/src/Akka.Hosting/ActorRegistry.cs b/src/Akka.Hosting/ActorRegistry.cs
@@ -163,14 +163,14 @@ public WaitForActorRegistration(Type key, TaskCompletionSource<IActorRef> waiter
 
         public CancellationTokenRegistration CancellationRegistration { get; set; }
 
-        public bool Equals(WaitForActorRegistration other)
+        public bool Equals(WaitForActorRegistration? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
             return Key == other.Key;
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return ReferenceEquals(this, obj) || obj is WaitForActorRegistration other && Equals(other);
         }
@@ -336,11 +336,14 @@ private void NotifyWaiters(Type key, IActorRef value)
             }
         }
 
-        private static Action<object> CancelWaiter(Type key, CancellationToken ct,
+        private static Action<object?> CancelWaiter(Type key, CancellationToken ct,
             WaitForActorRegistration waitingRegistration)
         {
             return dict =>
             {
+                if (dict is null)
+                    return;
+
                 // first step during timeout is to remove our registration
                 var d = (ConcurrentDictionary<Type, ImmutableHashSet<WaitForActorRegistration>>)dict;
                 d.AddOrUpdate(key, type => ImmutableHashSet<WaitForActorRegistration>.Empty,

diff --git a/src/Akka.Hosting/Akka.Hosting.csproj b/src/Akka.Hosting/Akka.Hosting.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(LibraryFramework)</TargetFramework>
+    <TargetFrameworks>$(LibraryFramework);$(NetLibraryFramework)</TargetFrameworks>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <Description>Akka.NET Microsoft.Extensions.Hosting support.</Description>
   </PropertyGroup>

diff --git a/src/Akka.Hosting/Util.cs b/src/Akka.Hosting/Util.cs
@@ -21,7 +21,7 @@ internal static bool IsRunningInMaui
         {
             get
             {
-                _runningInMaui ??= AppDomain.CurrentDomain.GetAssemblies().Any(asm => asm.GetName().Name.StartsWith("Microsoft.Maui"));
+                _runningInMaui ??= AppDomain.CurrentDomain.GetAssemblies().Any(asm => asm?.GetName()?.Name?.StartsWith("Microsoft.Maui") ?? false);
                 return _runningInMaui.Value;
             }
         }

diff --git a/src/Akka.Persistence.Hosting/Akka.Persistence.Hosting.csproj b/src/Akka.Persistence.Hosting/Akka.Persistence.Hosting.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>$(LibraryFramework)</TargetFramework>
+        <TargetFrameworks>$(LibraryFramework);$(NetLibraryFramework)</TargetFrameworks>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>Akka.Persistence Microsoft.Extensions.Hosting support.</Description>
     </PropertyGroup>

diff --git a/src/Akka.Remote.Hosting/Akka.Remote.Hosting.csproj b/src/Akka.Remote.Hosting/Akka.Remote.Hosting.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(LibraryFramework)</TargetFramework>
+    <TargetFrameworks>$(LibraryFramework);$(NetLibraryFramework)</TargetFrameworks>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <Description>Akka.Remote Microsoft.Extensions.Hosting support.</Description>
     <LangVersion>Latest</LangVersion>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ internal static bool IsRunningInMaui @@
             {
                 get
                 {
-                    _runningInMaui ??= AppDomain.CurrentDomain.GetAssemblies().Any(asm => asm.GetName().Name.StartsWith("Microsoft.Maui"));
+                    _runningInMaui ??= AppDomain.CurrentDomain.GetAssemblies().Any(asm => asm?.GetName()?.Name?.StartsWith("Microsoft.Maui") ?? false);
                     return _runningInMaui.Value;
                 }
             }
@@ Expand Down @@