General code refactoring.

Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj

@@ -6,13 +6,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+  </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />

Tests/MQTTnet.AspNetCore.Tests/MqttConnectionContextTest.cs

@@ -15,6 +15,7 @@ using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using System.Net;
+using MQTTnet.AspNetCore.Extensions;
 
 namespace MQTTnet.AspNetCore.Tests
 {

Tests/MQTTnet.AspNetCore.Tests/ReaderExtensionsTest.cs

@@ -1,6 +1,7 @@
-#if NETCOREAPP
+#if NETCOREAPP3_1
 using System.Buffers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using MQTTnet.AspNetCore.Extensions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 
@@ -31,7 +32,6 @@ namespace MQTTnet.AspNetCore.Tests
             result = serializer.TryDecode(reader, part, out packet, out consumed, out observed, out read);
             Assert.IsFalse(result);
 
-
             part = sequence.Slice(sequence.Start, 1); // partial fixed header should fail
             result = serializer.TryDecode(reader, part, out packet, out consumed, out observed, out read);
             Assert.IsFalse(result);

Tests/MQTTnet.Benchmarks/MessageProcessingMqttConnectionContextBenchmark.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Hosting;
 using MQTTnet.Server;
 using MQTTnet.Diagnostics;
 using MQTTnet.AspNetCore.Client;
+using MQTTnet.AspNetCore.Extensions;
 using MQTTnet.Client.Options;
 
 namespace MQTTnet.Benchmarks

Tests/MQTTnet.Core.Tests/Server_Tests.cs

@@ -274,6 +274,78 @@ namespace MQTTnet.Tests
             }
         }
 
+        [TestMethod]
+        public async Task Subscribe_Lots_In_Single_Request()
+        {
+            using (var testEnvironment = new TestEnvironment(TestContext))
+            {
+                var receivedMessagesCount = 0;
+
+                await testEnvironment.StartServerAsync();
+
+                var c1 = await testEnvironment.ConnectClientAsync();
+                c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount));
+
+                var optionsBuilder = new MqttClientSubscribeOptionsBuilder();
+                for (var i = 0; i < 1000; i++)
+                {
+                    optionsBuilder.WithTopicFilter(i.ToString(), MqttQualityOfServiceLevel.AtMostOnce);
+                }
+
+                await c1.SubscribeAsync(optionsBuilder.Build()).ConfigureAwait(false);
+
+                var c2 = await testEnvironment.ConnectClientAsync();
+
+                var messageBuilder = new MqttApplicationMessageBuilder();
+                for (var i = 0; i < 1000; i++)
+                {
+                    messageBuilder.WithTopic(i.ToString());
+
+                    await c2.PublishAsync(messageBuilder.Build()).ConfigureAwait(false);
+                }
+
+                await Task.Delay(500).ConfigureAwait(false);
+
+                Assert.AreEqual(1000, receivedMessagesCount);
+            }
+        }
+
+        [TestMethod]
+        public async Task Subscribe_Lots_In_Multiple_Requests()
+        {
+            using (var testEnvironment = new TestEnvironment(TestContext))
+            {
+                var receivedMessagesCount = 0;
+
+                await testEnvironment.StartServerAsync();
+
+                var c1 = await testEnvironment.ConnectClientAsync();
+                c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount));
+
+                for (var i = 0; i < 1000; i++)
+                {
+                    var so = new MqttClientSubscribeOptionsBuilder()
+                        .WithTopicFilter(i.ToString(), MqttQualityOfServiceLevel.AtMostOnce).Build();
+
+                    await c1.SubscribeAsync(so).ConfigureAwait(false);
+                }
+                
+                var c2 = await testEnvironment.ConnectClientAsync();
+
+                var messageBuilder = new MqttApplicationMessageBuilder();
+                for (var i = 0; i < 1000; i++)
+                {
+                    messageBuilder.WithTopic(i.ToString());
+
+                    await c2.PublishAsync(messageBuilder.Build()).ConfigureAwait(false);
+                }
+
+                await Task.Delay(500).ConfigureAwait(false);
+
+                Assert.AreEqual(1000, receivedMessagesCount);
+            }
+        }
+
         [TestMethod]
         public async Task Subscribe_Multiple_In_Multiple_Request()
         {

Tests/MQTTnet.TestApp.AspNetCore2/Program.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using MQTTnet.AspNetCore;
 using System.Threading.Tasks;
+using MQTTnet.AspNetCore.Extensions;
 
 namespace MQTTnet.TestApp.AspNetCore2
 {

Tests/MQTTnet.TestApp.AspNetCore2/Startup.cs

@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using MQTTnet.AspNetCore;
+using MQTTnet.AspNetCore.Extensions;
 using MQTTnet.Server;
 
 namespace MQTTnet.TestApp.AspNetCore2