asynkron · rogeralsing · Apr 28, 2023 · Apr 16, 2023 · Apr 16, 2023 · Apr 16, 2023
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -28,7 +28,6 @@ jobs:
         dotnet:
           - net7.0
           - net6.0
-          - netcoreapp3.1
         test:
           - "tests/Proto.Cluster.Tests/*.csproj"
           - "tests/Proto.Cluster.PartitionIdentity.Tests/*.csproj"

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -53,7 +53,6 @@ jobs:
         dotnet:
           - net7.0
           - net6.0
-          - netcoreapp3.1
         test:
           - "tests/Proto.Cluster.Tests/*.csproj"
           - "tests/Proto.Cluster.PartitionIdentity.Tests/*.csproj"

diff --git a/benchmarks/RemoteBenchmark/Node2/Program.cs b/benchmarks/RemoteBenchmark/Node2/Program.cs
@@ -57,10 +57,6 @@ private static async Task Main()
             )
         );
 
-#if NETCOREAPP3_1
-            AppContext.SetSwitch("System.Net.Http.SocketsHttpHandler.Http2UnencryptedSupport", true);
-#endif
-
 
         Console.WriteLine("Enter Advertised Host (Default = 127.0.0.1)");
         var advertisedHost = Console.ReadLine().Trim();

diff --git a/src/Proto.Actor/Future/SharedFuture.cs b/src/Proto.Actor/Future/SharedFuture.cs
@@ -104,7 +104,15 @@ public void Dispose()
         Interlocked.Increment(ref _createdRequests);
         _onStarted?.Invoke();
 
-        return new SharedFutureHandle(this, pid, requestSlot.CompletionSource!);
+        var cs = requestSlot.CompletionSource!;
+
+        // //TODO: can this happen?
+        // if (cs.Task.IsCanceled)
+        // {
+        //     throw new Exception("SharedFuture bug, Task is canceled");
+        // }
+
+        return new SharedFutureHandle(this, pid, cs);
     }
 
     protected internal override void SendUserMessage(PID pid, object message)

diff --git a/src/Proto.Actor/Mailbox/Mailbox.cs b/src/Proto.Actor/Mailbox/Mailbox.cs
@@ -46,10 +46,8 @@ public static IMailbox Create(params IMailboxStatistics[] stats) =>
         new DefaultMailbox(new LockingUnboundedMailboxQueue(4), new UnboundedMailboxQueue(), stats);
 }
 
-public sealed class DefaultMailbox : IMailbox
-#if NET5_0_OR_GREATER
-    , IThreadPoolWorkItem
-#endif
+public sealed class DefaultMailbox : IMailbox, IThreadPoolWorkItem
+
 {
     private readonly IMailboxStatistics[] _stats;
     private readonly IMailboxQueue _systemMessages;
@@ -307,29 +305,17 @@ private void Schedule()
         {
             if (_dispatcher == Dispatchers.DefaultDispatcher)
             {
-#if NET5_0_OR_GREATER
                 ThreadPool.UnsafeQueueUserWorkItem(this, false);
-#else
-                ThreadPool.UnsafeQueueUserWorkItem(RunWrapper, this);
-#endif
             }
             else
             {
                 _dispatcher.Schedule(() => RunAsync(this));
             }
         }
     }
-
-#if NET5_0_OR_GREATER
+
     public void Execute() => _ = RunAsync(this);
-#else
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static void RunWrapper(object state)
-    {
-        var y = (DefaultMailbox)state;
-        RunAsync(y);
-    }
-#endif
+
 }
 
 /// <summary>

diff --git a/src/Proto.Actor/PID.cs b/src/Proto.Actor/PID.cs
@@ -33,7 +33,15 @@ internal PID(string address, string id, Process process) : this(address, id)
 
     internal Process? CurrentRef { get; private set; }
 
-    public string ToDiagnosticString() => $"{Address}/{Id}";
+    public string ToDiagnosticString()
+    {
+        if (RequestId > 0)
+        {
+            return $"{Address}/{Id}:{RequestId}";
+        }
+
+        return $"{Address}/{Id}";
+    }
 
     /// <summary>
     ///     Creates a new PID instance from address and identifier.

diff --git a/src/Proto.Actor/Proto.Actor.csproj b/src/Proto.Actor/Proto.Actor.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj b/src/Proto.Cluster.AmazonECS/Proto.Cluster.AmazonECS.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj b/src/Proto.Cluster.AzureContainerApps/Proto.Cluster.AzureContainerApps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Azure.ResourceManager.AppContainers" Version="1.0.1"/>

diff --git a/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj b/src/Proto.Cluster.Consul/Proto.Cluster.Consul.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Consul" Version="1.6.10.7" />

diff --git a/src/Proto.Cluster.Identity.MongoDb/Proto.Cluster.Identity.MongoDb.csproj b/src/Proto.Cluster.Identity.MongoDb/Proto.Cluster.Identity.MongoDb.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

diff --git a/src/Proto.Cluster.Identity.Redis/Proto.Cluster.Identity.Redis.csproj b/src/Proto.Cluster.Identity.Redis/Proto.Cluster.Identity.Redis.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj b/src/Proto.Cluster.Kubernetes/Proto.Cluster.Kubernetes.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj b/src/Proto.Cluster.TestProvider/Proto.Cluster.TestProvider.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <RootNamespace>Proto.Cluster.Consul</RootNamespace>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />

diff --git a/src/Proto.Cluster/DefaultClusterContext.cs b/src/Proto.Cluster/DefaultClusterContext.cs
@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -24,9 +23,6 @@ public class DefaultClusterContext : IClusterContext
 
     private readonly PidCache _pidCache;
     private readonly ShouldThrottle _requestLogThrottle;
-#if !NET6_0_OR_GREATER
-    private readonly TaskClock _clock;
-#endif
     private readonly ActorSystem _system;
     private static readonly ILogger Logger = Log.CreateLogger<DefaultClusterContext>();
     private readonly int _requestTimeoutSeconds;
@@ -47,12 +43,6 @@ public DefaultClusterContext(Cluster cluster)
 
         _requestTimeoutSeconds = (int)config.ActorRequestTimeout.TotalSeconds;
         _legacyTimeouts = config.LegacyRequestTimeoutBehavior;
-#if !NET6_0_OR_GREATER
-        var updateInterval =
- TimeSpan.FromMilliseconds(Math.Min(config.ActorRequestTimeout.TotalMilliseconds / 2, 1000));
-        _clock = new TaskClock(config.ActorRequestTimeout, updateInterval, cluster.System.Shutdown);
-        _clock.Start();
-#endif
     }
 
     public async Task<T?> RequestAsync<T>(ClusterIdentity clusterIdentity, object message, ISenderContext context,
@@ -115,12 +105,8 @@ public DefaultClusterContext(Cluster cluster)
                 {
                     context.Request(pid, message, future.Pid);
                     var task = future.Task;
-
-#if NET6_0_OR_GREATER
+
                     await task.WaitAsync(CancellationTokens.FromSeconds(_requestTimeoutSeconds)).ConfigureAwait(false);
-#else
-                    await Task.WhenAny(task, _clock.CurrentBucket).ConfigureAwait(false);
-#endif
 
                     if (task.IsCompleted)
                     {
@@ -335,49 +321,6 @@ private async ValueTask RemoveFromSource(ClusterIdentity clusterIdentity, PidSou
         }
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static (ResponseStatus Ok, T?) ToResult<T>(PidSource source, ISenderContext context, object result)
-    {
-        var message = MessageEnvelope.UnwrapMessage(result);
-
-        if (message is DeadLetterResponse)
-        {
-            if (!context.System.Shutdown.IsCancellationRequested && Logger.IsEnabled(LogLevel.Debug))
-            {
-                Logger.LogDebug("TryRequestAsync failed, dead PID from {Source}", source);
-            }
-
-            return (ResponseStatus.DeadLetter, default);
-        }
-
-        if (message == null)
-        {
-            return (ResponseStatus.Ok, default);
-        }
-
-        if (message is T t)
-        {
-            return (ResponseStatus.Ok, t);
-        }
-
-        if (typeof(T) == typeof(MessageEnvelope))
-        {
-            return (ResponseStatus.Ok, (T)(object)MessageEnvelope.Wrap(result));
-        }
-
-        Logger.LogError("Unexpected message. Was type {Type} but expected {ExpectedType}", message.GetType(),
-            typeof(T));
-
-        return (ResponseStatus.InvalidResponse, default);
-    }
-
-    private enum ResponseStatus
-    {
-        Ok,
-        InvalidResponse,
-        DeadLetter
-    }
-
     private enum PidSource
     {
         Cache,

diff --git a/src/Proto.Cluster/Proto.Cluster.csproj b/src/Proto.Cluster/Proto.Cluster.csproj
@@ -4,7 +4,7 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Grpc.Tools" Version="2.51.0" PrivateAssets="All" />

diff --git a/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj b/src/Proto.OpenTelemetry/Proto.OpenTelemetry.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
     </PropertyGroup>

diff --git a/src/Proto.Persistence.Couchbase/Proto.Persistence.Couchbase.csproj b/src/Proto.Persistence.Couchbase/Proto.Persistence.Couchbase.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CouchbaseNetClient" Version="2.7.22" />

diff --git a/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj b/src/Proto.Persistence.DynamoDB/Proto.Persistence.DynamoDB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.101.8" />

diff --git a/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj b/src/Proto.Persistence.Marten/Proto.Persistence.Marten.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Marten" Version="4.3.1" />

diff --git a/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj b/src/Proto.Persistence.MongoDB/Proto.Persistence.MongoDB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="MongoDB.Driver" Version="2.19.0" />

diff --git a/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj b/src/Proto.Persistence.RavenDB/Proto.Persistence.RavenDB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="RavenDB.Client" Version="5.3.100" />

diff --git a/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj b/src/Proto.Persistence.SqlServer/Proto.Persistence.SqlServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />

diff --git a/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj b/src/Proto.Persistence.Sqlite/Proto.Persistence.Sqlite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.12" />

diff --git a/src/Proto.Persistence/Proto.Persistence.csproj b/src/Proto.Persistence/Proto.Persistence.csproj
@@ -3,7 +3,7 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
     </ItemGroup>

diff --git a/src/Proto.Remote/Proto.Remote.csproj b/src/Proto.Remote/Proto.Remote.csproj
@@ -4,7 +4,7 @@
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>
-        <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Proto.TestKit/Proto.TestKit.csproj b/src/Proto.TestKit/Proto.TestKit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <Nullable>enable</Nullable>
         <LangVersion>10</LangVersion>

diff --git a/tests/Proto.Actor.Tests/Diagnostics/DiagnosticsTests.cs b/tests/Proto.Actor.Tests/Diagnostics/DiagnosticsTests.cs
@@ -23,8 +23,7 @@ public class DiagnosticsTests
     [Fact]
     public async Task CanListPidsInProcessRegistry()
     {
-        var system = new ActorSystem();
-        await using var _ = system;
+        await using var system = new ActorSystem();
         var context = system.Root;
 
         var props = Props.FromProducer(() => new MyDiagnosticsActor());
@@ -41,8 +40,7 @@ public async Task CanListPidsInProcessRegistry()
     [Fact]
     public async Task CanGetDiagnosticsStringFromActorDiagnostics()
     {
-        var system = new ActorSystem();
-        await using var _ = system;
+        await using var system = new ActorSystem();
         var context = system.Root;
 
         var props = Props.FromProducer(() => new MyDiagnosticsActor());