Merge pull request #796 from rabbitmq/package-updates

Package updates

Author: lukebakken

projects/RabbitMQ.Client/RabbitMQ.Client.csproj

@@ -28,7 +28,7 @@
     <PackageOutputPath>..\..\packages</PackageOutputPath>
   </PropertyGroup>
 
-  <Target Name="SetVersionFromConcourseData" AfterTargets="MinVer" Condition="'$(CONCOURSE_PULL_REQUEST_NUMBER)' != ''" >
+  <Target Name="SetVersionFromConcourseData" AfterTargets="MinVer" Condition="'$(CONCOURSE_PULL_REQUEST_NUMBER)' != ''">
     <PropertyGroup>
       <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-$(MinVerPreRelease)-pr.$(CONCOURSE_PULL_REQUEST_NUMBER)</PackageVersion>
       <PackageVersion Condition="'$(MinVerBuildMetadata)' != ''">$(PackageVersion)+$(MinVerBuildMetadata)</PackageVersion>
@@ -51,7 +51,7 @@
     <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.2.0" PrivateAssets="All" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
 
 </Project>

projects/RabbitMQ.Client/client/impl/TcpClientAdapter.cs

@@ -27,7 +27,11 @@ public virtual async Task ConnectAsync(string host, int port)
                 throw new ArgumentException("No ip address could be resolved for " + host);
             }
 
+#if NET461
+            await Task.Run(() => _sock.Connect(ep, port)).ConfigureAwait(false);
+#else
             await _sock.ConnectAsync(ep, port).ConfigureAwait(false);
+#endif
         }
 
         public virtual void Close()

projects/Unit/Unit.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApprovalTests" Version="4.5.1" />
+    <PackageReference Include="ApprovalTests" Version="4.5.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />