Set target framework

sanych-sun · Sep 4, 2024 · 37f9e95 · 37f9e95
1 parent 756b3aa
commit 37f9e95
Show file tree

Hide file tree

Showing 23 changed files with 19 additions and 37 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,12 +1,14 @@
 <Project>
   <PropertyGroup>
     <Version>0.4.0</Version>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Authors>Oleksandr Poliakov</Authors>
     <PackageTags>RabbitMQ;Messaging</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <Description>An experimental low-level RabbitMQ client for .Net with number of high-level APIs</Description>
   </PropertyGroup>
 

diff --git a/...Q.Next.Examples.DemoSaslAuthMechanism/RabbitMQ.Next.Examples.DemoSaslAuthMechanism.csproj b/...Q.Next.Examples.DemoSaslAuthMechanism/RabbitMQ.Next.Examples.DemoSaslAuthMechanism.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/.../RabbitMQ.Next.Examples.DynamicSerializer/RabbitMQ.Next.Examples.DynamicSerializer.csproj b/.../RabbitMQ.Next.Examples.DynamicSerializer/RabbitMQ.Next.Examples.DynamicSerializer.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...amples/RabbitMQ.Next.Examples.SimpleConsumer/RabbitMQ.Next.Examples.SimpleConsumer.csproj b/...amples/RabbitMQ.Next.Examples.SimpleConsumer/RabbitMQ.Next.Examples.SimpleConsumer.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...ples/RabbitMQ.Next.Examples.SimplePublisher/RabbitMQ.Next.Examples.SimplePublisher.csproj b/...ples/RabbitMQ.Next.Examples.SimplePublisher/RabbitMQ.Next.Examples.SimplePublisher.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/...ples/RabbitMQ.Next.Examples.TopologyBuilder/RabbitMQ.Next.Examples.TopologyBuilder.csproj b/...ples/RabbitMQ.Next.Examples.TopologyBuilder/RabbitMQ.Next.Examples.TopologyBuilder.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Abstractions/RabbitMQ.Next.Abstractions.csproj b/src/RabbitMQ.Next.Abstractions/RabbitMQ.Next.Abstractions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>RabbitMQ.Next</RootNamespace>
     <PackageId>RabbitMQ.Next.Abstractions</PackageId>
   </PropertyGroup>

diff --git a/src/RabbitMQ.Next.Consumer.Abstractions/RabbitMQ.Next.Consumer.Abstractions.csproj b/src/RabbitMQ.Next.Consumer.Abstractions/RabbitMQ.Next.Consumer.Abstractions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>RabbitMQ.Next.Consumer</RootNamespace>
     <PackageId>RabbitMQ.Next.Consumer.Abstractions</PackageId>
   </PropertyGroup>

diff --git a/src/RabbitMQ.Next.Consumer/RabbitMQ.Next.Consumer.csproj b/src/RabbitMQ.Next.Consumer/RabbitMQ.Next.Consumer.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Consumer</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Publisher.Abstractions/RabbitMQ.Next.Publisher.Abstractions.csproj b/src/RabbitMQ.Next.Publisher.Abstractions/RabbitMQ.Next.Publisher.Abstractions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>RabbitMQ.Next.Publisher</RootNamespace>
     <PackageId>RabbitMQ.Next.Publisher.Abstractions</PackageId>
   </PropertyGroup>

diff --git a/src/RabbitMQ.Next.Publisher.Attributes/RabbitMQ.Next.Publisher.Attributes.csproj b/src/RabbitMQ.Next.Publisher.Attributes/RabbitMQ.Next.Publisher.Attributes.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Publisher.Attributes</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Publisher/RabbitMQ.Next.Publisher.csproj b/src/RabbitMQ.Next.Publisher/RabbitMQ.Next.Publisher.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Publisher</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Serialization.Dynamic/RabbitMQ.Next.Serialization.Dynamic.csproj b/src/RabbitMQ.Next.Serialization.Dynamic/RabbitMQ.Next.Serialization.Dynamic.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Serialization.Dynamic</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Serialization.MessagePack/RabbitMQ.Next.Serialization.MessagePack.csproj b/src/RabbitMQ.Next.Serialization.MessagePack/RabbitMQ.Next.Serialization.MessagePack.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Serialization.MessagePack</PackageId>
   </PropertyGroup>
 

diff --git a/...bitMQ.Next.Serialization.NewtonsoftJson/RabbitMQ.Next.Serialization.NewtonsoftJson.csproj b/...bitMQ.Next.Serialization.NewtonsoftJson/RabbitMQ.Next.Serialization.NewtonsoftJson.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Serialization.NewtonsoftJson</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Serialization.PlainText/RabbitMQ.Next.Serialization.PlainText.csproj b/src/RabbitMQ.Next.Serialization.PlainText/RabbitMQ.Next.Serialization.PlainText.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Serialization.PlainText</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next.Serialization.SystemJson/RabbitMQ.Next.Serialization.SystemJson.csproj b/src/RabbitMQ.Next.Serialization.SystemJson/RabbitMQ.Next.Serialization.SystemJson.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.Serialization.SystemJson</PackageId>
   </PropertyGroup>
 

diff --git a/...bitMQ.Next.TopologyBuilder.Abstractions/RabbitMQ.Next.TopologyBuilder.Abstractions.csproj b/...bitMQ.Next.TopologyBuilder.Abstractions/RabbitMQ.Next.TopologyBuilder.Abstractions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.TopologyBuilder.Abstractions</PackageId>
     <RootNamespace>RabbitMQ.Next.TopologyBuilder</RootNamespace>
   </PropertyGroup>

diff --git a/src/RabbitMQ.Next.TopologyBuilder/RabbitMQ.Next.TopologyBuilder.csproj b/src/RabbitMQ.Next.TopologyBuilder/RabbitMQ.Next.TopologyBuilder.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <PackageId>RabbitMQ.Next.TopologyBuilder</PackageId>
   </PropertyGroup>
 

diff --git a/src/RabbitMQ.Next/Connection.cs b/src/RabbitMQ.Next/Connection.cs
@@ -132,6 +132,7 @@ private void SendLoop()
     {
         var heartbeatMemory = new MemoryAccessor(ProtocolConstants.HeartbeatFrame);
         var socketChannel = this.socketSender.Reader;
+
         do
         {
             while (socketChannel.TryRead(out var memory))
@@ -146,19 +147,19 @@ private void SendLoop()
                 }
             }
 
-            var waitResult = socketChannel.WaitToReadAsync().Wait(this.connectionDetails.HeartbeatInterval);
-            if (waitResult.IsCompleted)
+            if (socketChannel.WaitToReadAsync().Wait(this.connectionDetails.HeartbeatInterval, out var canRead))
             {
-                if (waitResult.Result)
+                if (!canRead)
                 {
-                    continue;
+                    return;
                 }
-
-                break;
+            }
+            else
+            {
+                // wait long enough and nothing was sent, need to send heartbeat frame
+                this.socket.Send(heartbeatMemory);    
             }
 
-            // wait long enough and nothing was sent, need to send heartbeat frame
-            this.socket.Send(heartbeatMemory);
         } while (true);
     }
 

diff --git a/src/RabbitMQ.Next/RabbitMQ.Next.csproj b/src/RabbitMQ.Next/RabbitMQ.Next.csproj
@@ -1,18 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageId>RabbitMQ.Next</PackageId>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
+  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.*" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.*" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\RabbitMQ.Next.Abstractions\RabbitMQ.Next.Abstractions.csproj" />
   </ItemGroup>

diff --git a/src/RabbitMQ.Next/Tasks/TaskExtensions.cs b/src/RabbitMQ.Next/Tasks/TaskExtensions.cs
@@ -5,11 +5,12 @@ namespace RabbitMQ.Next.Tasks;
 
 public static class TaskExtensions
 {
-    public static (bool IsCompleted, T Result) Wait<T>(this ValueTask<T> valueTask, TimeSpan? timeout)
+    public static bool Wait<T>(this ValueTask<T> valueTask, TimeSpan? timeout, out T result)
     {
         if (valueTask.IsCompleted)
         {
-            return (true, valueTask.Result);
+            result = valueTask.Result;
+            return true;
         }
 
         var task = valueTask.AsTask();
@@ -21,9 +22,11 @@ public static (bool IsCompleted, T Result) Wait<T>(this ValueTask<T> valueTask,
 
         if (task.Wait(timeoutMs))
         {
-            return (true, task.Result);
+            result = task.Result;
+            return true;
         }
 
-        return (false, default);
+        result = default;
+        return false;
     }
 }
diff --git a/tests/RabbitMQ.Next.Tests/RabbitMQ.Next.Tests.csproj b/tests/RabbitMQ.Next.Tests/RabbitMQ.Next.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>