Skip to content

Commit e620c37

Browse files
committed
Update System.Memory to 4.5.4
1 parent 0a28b89 commit e620c37

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

projects/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PackageOutputPath>..\..\packages</PackageOutputPath>
2929
</PropertyGroup>
3030

31-
<Target Name="SetVersionFromConcourseData" AfterTargets="MinVer" Condition="'$(CONCOURSE_PULL_REQUEST_NUMBER)' != ''" >
31+
<Target Name="SetVersionFromConcourseData" AfterTargets="MinVer" Condition="'$(CONCOURSE_PULL_REQUEST_NUMBER)' != ''">
3232
<PropertyGroup>
3333
<PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-$(MinVerPreRelease)-pr.$(CONCOURSE_PULL_REQUEST_NUMBER)</PackageVersion>
3434
<PackageVersion Condition="'$(MinVerBuildMetadata)' != ''">$(PackageVersion)+$(MinVerBuildMetadata)</PackageVersion>
@@ -51,7 +51,7 @@
5151
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
5252
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5353
<PackageReference Include="MinVer" Version="2.2.0" PrivateAssets="All" />
54-
<PackageReference Include="System.Memory" Version="4.5.3" />
54+
<PackageReference Include="System.Memory" Version="4.5.4" />
5555
</ItemGroup>
5656

5757
</Project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ public virtual async Task ConnectAsync(string host, int port)
2727
throw new ArgumentException("No ip address could be resolved for " + host);
2828
}
2929

30+
#if NET461
31+
await Task.Run(() => _sock.Connect(ep, port)).ConfigureAwait(false);
32+
#else
3033
await _sock.ConnectAsync(ep, port).ConfigureAwait(false);
34+
#endif
3135
}
3236

3337
public virtual void Close()

0 commit comments

Comments
 (0)