Merge pull request #1322 from rabbitmq/lukebakken/bump-deps

lukebakken · web-flow · commit 7b8368b338d1 · 2023-03-22T08:09:46.000-07:00
Misc updates
diff --git a/.ci/versions.json b/.ci/versions.json
@@ -1,4 +1,4 @@
 {
   "erlang": "25.3",
-  "rabbitmq": "3.11.10"
+  "rabbitmq": "3.11.11"
 }
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -44,7 +44,7 @@ jobs:
       - name: Restore
         run: dotnet restore --verbosity=normal
       - name: ApiGen
-        run: dotnet run --framework "netcoreapp3.1" --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
+        run: dotnet run --framework net6.0 --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
       - name: Build
         run: dotnet build --no-restore --verbosity=normal
       - name: Test
@@ -85,10 +85,10 @@ jobs:
       - name: Restore
         run: dotnet restore --verbosity=normal
       - name: ApiGen
-        run: dotnet run --framework "netcoreapp3.1" --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
+        run: dotnet run --framework net6.0 --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
       - name: Build
         run: dotnet build --no-restore --verbosity=normal
       - name: Test
-        run: dotnet test --no-restore --no-build --logger "console;verbosity=detailed" --framework "netcoreapp3.1"
+        run: dotnet test --no-restore --no-build --logger "console;verbosity=detailed" --framework net6.0
         env:
           RABBITMQ_RABBITMQCTL_PATH: DOCKER:${{job.services.rabbitmq.id}}
diff --git a/RUNNING_TESTS.md b/RUNNING_TESTS.md
@@ -104,15 +104,15 @@ Running individual tests and fixtures on Windows is trivial using the Visual Stu
 To run a specific tests fixture on MacOS or Linux, use the NUnit filter expressions to select the tests to be run:
 
 ``` shell
-dotnet test projects/Unit -f netcoreapp3.1 --filter "Name~TestAmqpUriParseFail"
+dotnet test projects/Unit -f net6.0 --filter "Name~TestAmqpUriParseFail"
 
-dotnet test projects/Unit -f netcoreapp3.1 --filter "FullyQualifiedName~RabbitMQ.Client.Unit.TestHeartbeats"
+dotnet test projects/Unit -f net6.0 --filter "FullyQualifiedName~RabbitMQ.Client.Unit.TestHeartbeats"
 ```
 
 ## Running Tests for a Specific .NET Target
 
 To only run tests on .NET Core:
 
 ``` shell
-dotnet test -f netcoreapp3.1 projects/Unit
+dotnet test -f net6.0 projects/Unit
 ```
diff --git a/projects/Apigen/Apigen.csproj b/projects/Apigen/Apigen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/projects/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
@@ -53,15 +54,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
-    <PackageReference Include="MinVer" Version="2.4.0" PrivateAssets="All" />
-    <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
+    <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
+    <PackageReference Include="System.Threading.Channels" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
 </Project>
diff --git a/projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs b/projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs
@@ -27,7 +27,7 @@ public virtual async Task ConnectAsync(string host, int port)
                 throw new ArgumentException($"No ip address could be resolved for {host}");
             }
 
-#if NET461
+#if NET461 || NET462
             await Task.Run(() => _sock.Connect(ep, port)).ConfigureAwait(false);
 #else
             await _sock.ConnectAsync(ep, port).ConfigureAwait(false);
@@ -78,7 +78,7 @@ public virtual bool Connected
         {
             get
             {
-                if(_sock == null) return false;
+                if (_sock == null) return false;
                 return _sock.Connected;
             }
         }
@@ -99,7 +99,7 @@ public virtual TimeSpan ReceiveTimeout
 
         private void AssertSocket()
         {
-            if(_sock == null)
+            if (_sock == null)
             {
                 throw new InvalidOperationException("Cannot perform operation as socket is null");
             }
diff --git a/projects/Unit/TestConnectionRecovery.cs b/projects/Unit/TestConnectionRecovery.cs
@@ -31,7 +31,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading;
 
@@ -827,7 +826,7 @@ public void TestUnbindQueueAfterRecoveryConnection()
             Assert.IsTrue(nameBefore.StartsWith("amq."));
             Assert.IsTrue(nameAfter.StartsWith("amq."));
             Assert.AreNotEqual(nameBefore, nameAfter);
-            Model.QueueUnbind(nameAfter,x,"");
+            Model.QueueUnbind(nameAfter, x, "");
             Model.QueueDeleteNoWait(nameAfter);
             latch.Reset();
             CloseAndWaitForRecovery();
diff --git a/projects/Unit/Unit.csproj b/projects/Unit/Unit.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
@@ -11,12 +11,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
-    <PackageReference Include="Verify.NUnit" Version="12.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
+    <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
+    <PackageReference Include="Verify.NUnit" Version="19.11.2" />
   </ItemGroup>
 
 </Project>
diff --git a/run-test.sh b/run-test.sh
@@ -13,4 +13,4 @@ fi
 
 cd "$script_dir"
 
-dotnet test --no-build --logger 'console;verbosity=detailed' --framework 'netcoreapp3.1' ./RabbitMQDotNetClient.sln < /dev/null
+dotnet test --no-build --logger 'console;verbosity=detailed' --framework 'net6.0' ./RabbitMQDotNetClient.sln < /dev/null

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"erlang": "25.3",`
`3`		`- "rabbitmq": "3.11.10"`
	`3`	`+ "rabbitmq": "3.11.11"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public virtual async Task ConnectAsync(string host, int port)`
`27`	`27`	`throw new ArgumentException($"No ip address could be resolved for {host}");`
`28`	`28`	`}`
`29`	`29`
`30`		`-#if NET461`
	`30`	`+#if NET461 \|\| NET462`
`31`	`31`	`await Task.Run(() => _sock.Connect(ep, port)).ConfigureAwait(false);`
`32`	`32`	`#else`
`33`	`33`	`await _sock.ConnectAsync(ep, port).ConfigureAwait(false);`
`@@ -78,7 +78,7 @@ public virtual bool Connected`
`78`	`78`	`{`
`79`	`79`	`get`
`80`	`80`	`{`
`81`		`- if(_sock == null) return false;`
	`81`	`+ if (_sock == null) return false;`
`82`	`82`	`return _sock.Connected;`
`83`	`83`	`}`
`84`	`84`	`}`
`@@ -99,7 +99,7 @@ public virtual TimeSpan ReceiveTimeout`
`99`	`99`
`100`	`100`	`private void AssertSocket()`
`101`	`101`	`{`
`102`		`- if(_sock == null)`
	`102`	`+ if (_sock == null)`
`103`	`103`	`{`
`104`	`104`	`throw new InvalidOperationException("Cannot perform operation as socket is null");`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@ fi`
`13`	`13`
`14`	`14`	`cd "$script_dir"`
`15`	`15`
`16`		`-dotnet test --no-build --logger 'console;verbosity=detailed' --framework 'netcoreapp3.1' ./RabbitMQDotNetClient.sln < /dev/null`
	`16`	`+dotnet test --no-build --logger 'console;verbosity=detailed' --framework 'net6.0' ./RabbitMQDotNetClient.sln < /dev/null`