Merge pull request #1189 from rabbitmq/rabbitmq-dotnet-client-1172

lukebakken · web-flow · commit b6884c598c1a · 2022-04-08T13:32:08.000-07:00
Ensure target frameworks make sense for 7.0
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -22,7 +22,7 @@ jobs:
         with:
           submodules: true
       - name: Cache installers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # Note: the cache path is relative to the workspace directory
           # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#using-the-cache-action
@@ -66,11 +66,11 @@ jobs:
         with:
           submodules: true
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.x
       - name: Cache NuGet packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.nuget/packages
@@ -83,6 +83,6 @@ jobs:
       - 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/projects/Benchmarks/Benchmarks.csproj b/projects/Benchmarks/Benchmarks.csproj
@@ -1,21 +1,20 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <TargetFrameworks>netcoreapp3.1;net48</TargetFrameworks>
-    <ReleaseVersion>8.0</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="Ductus.FluentDocker" Version="2.10.45" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\RabbitMQ.Client\RabbitMQ.Client.csproj" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/projects/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -1,7 +1,7 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
@@ -36,11 +36,6 @@
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 
-  <!-- disable nullable warnings for .NET Standard 2.0 -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <NoWarn>$(NoWarn);nullable</NoWarn>
-  </PropertyGroup>
-
   <Target Name="SetVersionFromConcourseData" AfterTargets="MinVer" Condition="'$(CONCOURSE_PULL_REQUEST_NUMBER)' != ''">
     <PropertyGroup>
       <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-$(MinVerPreRelease)-pr.$(CONCOURSE_PULL_REQUEST_NUMBER)</PackageVersion>
@@ -62,15 +57,12 @@
   </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="MinVer" Version="2.4.0" PrivateAssets="All" />
-    <PackageReference Include="System.Threading.Channels" Version="5.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="3.1.0" PrivateAssets="All" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.Commands.cs b/projects/RabbitMQ.Client/client/impl/Connection.Commands.cs
@@ -170,7 +170,7 @@ private IAuthMechanismFactory GetAuthMechanismFactory(string supportedMechanismN
             // Our list is in order of preference, the server one is not.
             foreach (var factory in _config.AuthMechanisms)
             {
-                if (supportedMechanismNames.Contains(factory.Name, StringComparison.OrdinalIgnoreCase))
+                if (supportedMechanismNames.IndexOf(factory.Name, StringComparison.OrdinalIgnoreCase) >= 0)
                 {
                     return factory;
                 }
diff --git a/projects/TestApplications/CreateChannel/CreateChannel.csproj b/projects/TestApplications/CreateChannel/CreateChannel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/projects/TestApplications/MassPublish/MassPublish.csproj b/projects/TestApplications/MassPublish/MassPublish.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/projects/Unit/Fixtures.cs b/projects/Unit/Fixtures.cs
@@ -423,6 +423,7 @@ public class TimingFixture
     {
         public static readonly TimeSpan TimingInterval = TimeSpan.FromMilliseconds(300);
         public static readonly TimeSpan TimingInterval_2X = TimeSpan.FromMilliseconds(600);
+        public static readonly TimeSpan TimingInterval_4X = TimeSpan.FromMilliseconds(1200);
         public static readonly TimeSpan SafetyMargin = TimeSpan.FromMilliseconds(150);
         public static readonly TimeSpan TestTimeout = TimeSpan.FromSeconds(5);
     }
diff --git a/projects/Unit/RabbitMQCtl.cs b/projects/Unit/RabbitMQCtl.cs
@@ -43,6 +43,7 @@ namespace RabbitMQ.Client.Unit
     #nullable enable
     public static class RabbitMQCtl
     {
+        private static readonly char[] newLine = new char[] { '\n' };
         private static readonly Func<string, Process> s_invokeRabbitMqCtl = GetRabbitMqCtlInvokeAction();
 
         private static Func<string, Process> GetRabbitMqCtlInvokeAction()
@@ -209,7 +210,8 @@ public static void CloseAllConnections()
 
         private static string[] EnumerateConnectionsPid()
         {
-            return ExecRabbitMQCtl("list_connections --silent pid").Split('\n', StringSplitOptions.RemoveEmptyEntries);
+            string rabbitmqCtlResult = ExecRabbitMQCtl("list_connections --silent pid");
+            return rabbitmqCtlResult.Split(newLine, StringSplitOptions.RemoveEmptyEntries);
         }
 
         public static void RestartRabbitMQ()
diff --git a/projects/Unit/TestBlockingCell.cs b/projects/Unit/TestBlockingCell.cs
@@ -164,7 +164,7 @@ public void TestBackgroundUpdateSucceedsWithInfiniteTimeoutTimeSpan()
         public void TestBackgroundUpdateFails()
         {
             var k = new BlockingCell<int>();
-            SetAfter(TimingInterval_2X, k, 123);
+            SetAfter(TimingInterval_4X, k, 123);
 
             ResetTimer();
             Assert.Throws<TimeoutException>(() => k.WaitForValue(TimingInterval));
diff --git a/projects/Unit/TestChannelAllocation.cs b/projects/Unit/TestChannelAllocation.cs
@@ -38,8 +38,6 @@
 
 namespace RabbitMQ.Client.Unit
 {
-
-
     public class TestIModelAllocation : IDisposable
     {
         public const int CHANNEL_COUNT = 100;
diff --git a/projects/Unit/TestPublisherConfirms.cs b/projects/Unit/TestPublisherConfirms.cs
@@ -45,9 +45,14 @@ namespace RabbitMQ.Client.Unit
     public class TestPublisherConfirms : IntegrationFixture
     {
         private const string QueueName = "RabbitMQ.Client.Unit.TestPublisherConfirms";
+        private readonly byte[] _body;
 
         public TestPublisherConfirms(ITestOutputHelper output) : base(output)
         {
+            var rnd = new Random();
+            _body  = new byte[4096];
+            rnd.NextBytes(_body);
+
         }
 
         [Fact]
@@ -64,18 +69,22 @@ public void TestWaitForConfirmsWithTimeout()
         {
             TestWaitForConfirms(200, (ch) =>
             {
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(4));
-                Assert.True(ch.WaitForConfirmsAsync(cts.Token).GetAwaiter().GetResult());
+                using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(4)))
+                {
+                    Assert.True(ch.WaitForConfirmsAsync(cts.Token).GetAwaiter().GetResult());
+                }
             });
         }
 
         [Fact]
         public void TestWaitForConfirmsWithTimeout_AllMessagesAcked_WaitingHasTimedout_ReturnTrue()
         {
-            TestWaitForConfirms(2000, (ch) =>
+            TestWaitForConfirms(10000, (ch) =>
             {
-                using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1));
-                Assert.Throws<TaskCanceledException>(() => ch.WaitForConfirmsAsync(cts.Token).GetAwaiter().GetResult());
+                using (var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(1)))
+                {
+                    Assert.Throws<TaskCanceledException>(() => ch.WaitForConfirmsAsync(cts.Token).GetAwaiter().GetResult());
+                }
             });
         }
 
@@ -90,67 +99,70 @@ public void TestWaitForConfirmsWithTimeout_MessageNacked_WaitingHasTimedout_Retu
                     .GetMethod("HandleAckNack", BindingFlags.Instance | BindingFlags.NonPublic)
                     .Invoke(actualModel, new object[] { 10UL, false, true });
 
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(4));
-                Assert.False(ch.WaitForConfirmsAsync(cts.Token).GetAwaiter().GetResult());
+                using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(4)))
+                {
+                    Assert.False(ch.WaitForConfirmsAsync(cts.Token).GetAwaiter().GetResult());
+                }
             });
         }
 
         [Fact]
         public async Task TestWaitForConfirmsWithEvents()
         {
-            IModel ch = _conn.CreateModel();
-            ch.ConfirmSelect();
+            using (IModel ch = _conn.CreateModel())
+            {
+                ch.ConfirmSelect();
 
-            ch.QueueDeclare(QueueName);
-            int n = 200;
-            // number of event handler invocations
-            int c = 0;
+                ch.QueueDeclare(QueueName);
+                int n = 200;
+                // number of event handler invocations
+                int c = 0;
 
-            ch.BasicAcks += (_, args) =>
-            {
-                Interlocked.Increment(ref c);
-            };
-            try
-            {
-                for (int i = 0; i < n; i++)
+                ch.BasicAcks += (_, args) =>
+                {
+                    Interlocked.Increment(ref c);
+                };
+                try
                 {
-                    ch.BasicPublish("", QueueName, _encoding.GetBytes("msg"));
+                    for (int i = 0; i < n; i++)
+                    {
+                        ch.BasicPublish("", QueueName, _encoding.GetBytes("msg"));
+                    }
+                    await ch.WaitForConfirmsAsync().ConfigureAwait(false);
+
+                    // Note: number of event invocations is not guaranteed
+                    // to be equal to N because acks can be batched,
+                    // so we primarily care about event handlers being invoked
+                    // in this test
+                    Assert.True(c > 5);
+                }
+                finally
+                {
+                    ch.QueueDelete(QueueName);
                 }
-                await ch.WaitForConfirmsAsync().ConfigureAwait(false);
-
-                // Note: number of event invocations is not guaranteed
-                // to be equal to N because acks can be batched,
-                // so we primarily care about event handlers being invoked
-                // in this test
-                Assert.True(c > 5);
-            }
-            finally
-            {
-                ch.QueueDelete(QueueName);
-                ch.Close();
             }
         }
 
         protected void TestWaitForConfirms(int numberOfMessagesToPublish, Action<IModel> fn)
         {
-            IModel ch = _conn.CreateModel();
-            ch.ConfirmSelect();
-            ch.QueueDeclare(QueueName);
-
-            ReadOnlyMemory<byte> body = _encoding.GetBytes("msg");
-            for (int i = 0; i < numberOfMessagesToPublish; i++)
+            using (IModel ch = _conn.CreateModel())
             {
-                ch.BasicPublish("", QueueName, body);
-            }
+                ch.ConfirmSelect();
+                ch.QueueDeclare(QueueName);
 
-            try
-            {
-                fn(ch);
-            }
-            finally
-            {
-                ch.QueueDelete(QueueName);
-                ch.Close();
+                for (int i = 0; i < numberOfMessagesToPublish; i++)
+                {
+                    ch.BasicPublish("", QueueName, _body);
+                }
+
+                try
+                {
+                    fn(ch);
+                }
+                finally
+                {
+                    ch.QueueDelete(QueueName);
+                }
             }
         }
     }
diff --git a/projects/Unit/Unit.csproj b/projects/Unit/Unit.csproj
@@ -1,7 +1,7 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <LangVersion>latest</LangVersion>
@@ -13,15 +13,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
-    <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+    <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Verify.Xunit" Version="11.18.2" />
+    <PackageReference Include="Verify.Xunit" Version="16.5.4" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 
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
`@@ -170,7 +170,7 @@ private IAuthMechanismFactory GetAuthMechanismFactory(string supportedMechanismN`
`170`	`170`	`// Our list is in order of preference, the server one is not.`
`171`	`171`	`foreach (var factory in _config.AuthMechanisms)`
`172`	`172`	`{`
`173`		`- if (supportedMechanismNames.Contains(factory.Name, StringComparison.OrdinalIgnoreCase))`
	`173`	`+ if (supportedMechanismNames.IndexOf(factory.Name, StringComparison.OrdinalIgnoreCase) >= 0)`
`174`	`174`	`{`
`175`	`175`	`return factory;`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,7 @@ public class TimingFixture`
`423`	`423`	`{`
`424`	`424`	`public static readonly TimeSpan TimingInterval = TimeSpan.FromMilliseconds(300);`
`425`	`425`	`public static readonly TimeSpan TimingInterval_2X = TimeSpan.FromMilliseconds(600);`
	`426`	`+ public static readonly TimeSpan TimingInterval_4X = TimeSpan.FromMilliseconds(1200);`
`426`	`427`	`public static readonly TimeSpan SafetyMargin = TimeSpan.FromMilliseconds(150);`
`427`	`428`	`public static readonly TimeSpan TestTimeout = TimeSpan.FromSeconds(5);`
`428`	`429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ namespace RabbitMQ.Client.Unit`
`43`	`43`	`#nullable enable`
`44`	`44`	`public static class RabbitMQCtl`
`45`	`45`	`{`
	`46`	`+ private static readonly char[] newLine = new char[] { '\n' };`
`46`	`47`	`private static readonly Func<string, Process> s_invokeRabbitMqCtl = GetRabbitMqCtlInvokeAction();`
`47`	`48`
`48`	`49`	`private static Func<string, Process> GetRabbitMqCtlInvokeAction()`
`@@ -209,7 +210,8 @@ public static void CloseAllConnections()`
`209`	`210`
`210`	`211`	`private static string[] EnumerateConnectionsPid()`
`211`	`212`	`{`
`212`		`- return ExecRabbitMQCtl("list_connections --silent pid").Split('\n', StringSplitOptions.RemoveEmptyEntries);`
	`213`	`+ string rabbitmqCtlResult = ExecRabbitMQCtl("list_connections --silent pid");`
	`214`	`+ return rabbitmqCtlResult.Split(newLine, StringSplitOptions.RemoveEmptyEntries);`
`213`	`215`	`}`
`214`	`216`
`215`	`217`	`public static void RestartRabbitMQ()`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public void TestBackgroundUpdateSucceedsWithInfiniteTimeoutTimeSpan()`
`164`	`164`	`public void TestBackgroundUpdateFails()`
`165`	`165`	`{`
`166`	`166`	`var k = new BlockingCell<int>();`
`167`		`- SetAfter(TimingInterval_2X, k, 123);`
	`167`	`+ SetAfter(TimingInterval_4X, k, 123);`
`168`	`168`
`169`	`169`	`ResetTimer();`
`170`	`170`	`Assert.Throws<TimeoutException>(() => k.WaitForValue(TimingInterval));`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@`
`38`	`38`
`39`	`39`	`namespace RabbitMQ.Client.Unit`
`40`	`40`	`{`
`41`		`-`
`42`		`-`
`43`	`41`	`public class TestIModelAllocation : IDisposable`
`44`	`42`	`{`
`45`	`43`	`public const int CHANNEL_COUNT = 100;`