v2.5 work: .NET 6.0: add build defaulting to the thread pool

.github/workflows/CI.yml

@@ -16,14 +16,13 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v1
-    - name: Setup .NET Core 3.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: Setup .NET 5.x
+    - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: | 
+          3.1.x
+          5.0.x
+          6.0.x
     - name: .NET Build
       run: dotnet build Build.csproj -c Release /p:CI=true
     - name: Start Redis Services (docker-compose)
@@ -50,11 +49,10 @@ jobs:
     - name: Setup .NET Core 3.x
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
-    - name: Setup .NET 5.x
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
+        dotnet-version: | 
+          3.1.x
+          5.0.x
+          6.0.x
     - name: .NET Build
       run: dotnet build Build.csproj -c Release /p:CI=true
     - name: Start Redis Services (v3.0.503)

appveyor.yml

@@ -6,7 +6,9 @@ init:
 
 install:
 - cmd: >-
-    choco install dotnet-sdk --version 5.0.100
+    choco install dotnet-sdk --version 5.0.404
+
+    choco install dotnet-sdk --version 6.0.101
 
     cd tests\RedisConfigs\3.0.503
 

src/StackExchange.Redis/CommandTrace.cs

@@ -50,7 +50,7 @@ public string GetHelpUrl()
 
             const string BaseUrl = "https://redis.io/commands/";
 
-            string encoded0 = Uri.EscapeUriString(((string)Arguments[0]).ToLowerInvariant());
+            string encoded0 = Uri.EscapeDataString(((string)Arguments[0]).ToLowerInvariant());
 
             if (Arguments.Length > 1)
             {
@@ -62,7 +62,7 @@ public string GetHelpUrl()
                     case "config":
                     case "debug":
                     case "pubsub":
-                        string encoded1 = Uri.EscapeUriString(((string)Arguments[1]).ToLowerInvariant());
+                        string encoded1 = Uri.EscapeDataString(((string)Arguments[1]).ToLowerInvariant());
                         return BaseUrl + encoded0 + "-" + encoded1;
                 }
             }

src/StackExchange.Redis/ConnectionMultiplexer.ReaderWriter.cs

@@ -1,18 +1,36 @@
-namespace StackExchange.Redis
+using System;
+
+namespace StackExchange.Redis
 {
     public partial class ConnectionMultiplexer
     {
         internal SocketManager SocketManager { get; private set; }
 
         partial void OnCreateReaderWriter(ConfigurationOptions configuration)
         {
-            SocketManager = configuration.SocketManager ?? SocketManager.Shared;
+            SocketManager = configuration.SocketManager ?? GetDefaultSocketManager();
         }
 
         partial void OnCloseReaderWriter()
         {
             SocketManager = null;
         }
         partial void OnWriterCreated();
+
+        /// <summary>
+        /// .NET 6.0+ has changes to sync-over-async stalls in the .NET primary thread pool
+        /// If we're in that environment, by default remove the overhead of our own threadpool
+        /// This will eliminate some context-switching overhead and better-size threads on both large
+        /// and small environments, from 16 core machines to single core VMs where the default 10 threads
+        /// isn't an ideal situation.
+        /// </summary>
+        internal static SocketManager GetDefaultSocketManager()
+        {
+#if NET6_0_OR_GREATER
+            return SocketManager.ThreadPool;
+#else
+            return SocketManager.Shared;
+#endif
+        }
     }
 }

src/StackExchange.Redis/StackExchange.Redis.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- extend the default lib targets for the main lib; mostly because of "vectors" -->
-    <TargetFrameworks>net461;netstandard2.0;net472;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;net472;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <Description>High performance Redis client, incorporating both synchronous and asynchronous usage.</Description>
     <AssemblyName>StackExchange.Redis</AssemblyName>
     <AssemblyTitle>StackExchange.Redis</AssemblyTitle>

tests/StackExchange.Redis.Tests/Config.cs

@@ -457,7 +457,7 @@ public void DefaultThreadPoolManagerIsDetected()
                 EndPoints = { { IPAddress.Loopback, 6379 } },
             };
             using var muxer = ConnectionMultiplexer.Connect(config);
-            Assert.Same(SocketManager.Shared.Scheduler, muxer.SocketManager.Scheduler);
+            Assert.Same(ConnectionMultiplexer.GetDefaultSocketManager().Scheduler, muxer.SocketManager.Scheduler);
         }
 
         [Theory]

tests/StackExchange.Redis.Tests/Migrate.cs

@@ -10,7 +10,7 @@ public class Migrate : TestBase
     {
         public Migrate(ITestOutputHelper output) : base (output) { }
 
-        [Fact]
+        [FactLongRunning]
         public async Task Basic()
         {
             var fromConfig = new ConfigurationOptions { EndPoints = { { TestConfig.Current.SecureServer, TestConfig.Current.SecurePort } }, Password = TestConfig.Current.SecurePassword, AllowAdmin = true };

tests/StackExchange.Redis.Tests/PubSub.cs

@@ -643,7 +643,7 @@ public async Task Issue38()
             }
         }
 
-        internal static Task AllowReasonableTimeToPublishAndProcess() => Task.Delay(100);
+        internal static Task AllowReasonableTimeToPublishAndProcess() => Task.Delay(500);
 
         [Fact]
         public async Task TestPartialSubscriberGetMessage()

tests/StackExchange.Redis.Tests/StackExchange.Redis.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
     <AssemblyName>StackExchange.Redis.Tests</AssemblyName>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <SignAssembly>true</SignAssembly>

tests/StackExchange.Redis.Tests/TestBase.cs

@@ -361,14 +361,7 @@ public static ConnectionMultiplexer CreateDefault(
         }
 
         public static string Me([CallerFilePath] string filePath = null, [CallerMemberName] string caller = null) =>
-#if NET472
-            "net472-"
-#elif NETCOREAPP3_1
-            "netcoreapp3.1-"
-#else
-            "unknown-"
-#endif
-         + Path.GetFileNameWithoutExtension(filePath) + "-" + caller;
+            Environment.Version.ToString() + Path.GetFileNameWithoutExtension(filePath) + "-" + caller;
 
         protected static TimeSpan RunConcurrent(Action work, int threads, int timeout = 10000, [CallerMemberName] string caller = null)
         {
@@ -417,7 +410,9 @@ void callback()
                 for (int i = 0; i < threads; i++)
                 {
                     var thd = threadArr[i];
+#if !NET6_0_OR_GREATER
                     if (thd.IsAlive) thd.Abort();
+#endif
                 }
                 throw new TimeoutException();
             }

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.2",
+  "version": "2.5-prerelease",
   "versionHeightOffset": -1,
   "assemblyVersion": "2.0",
   "publicReleaseRefSpec": [