Skip to content

Commit 9591996

Browse files
PlinerPliner
authored
Upgrade to RabbitMQ.Client version 6.* (#1019)
* Upgrade to RabbitMQ.Client 6.0 1. Drop net451 support 2. Drop EasyNetQ.Trace and EasyNetQ.LogReader 3. Copy&Paste BasicProperties for tests 4. Convert ReadOnlyMemory<byte> to byte[] 5. Drop task hacks, because it was only for net451 * Replace byte[] to ReadOnlyMemory<byte>
1 parent 52b652d commit 9591996

File tree

50 files changed

+482
-846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+482
-846
lines changed

‎Source/EasyNetQ.DI.Autofac/EasyNetQ.DI.Autofac.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>An adaptor to allow EasyNetQ to use Autofac as its internal IoC container</Description>
55
<PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
6-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
77
<PackageTags>Autofac;RabbitMQ;Messaging;AMQP;C#</PackageTags>
88
</PropertyGroup>
99
<ItemGroup>
@@ -15,14 +15,14 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
1717
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
1919
<Reference Include="System" />
2020
<Reference Include="Microsoft.CSharp" />
2121
</ItemGroup>
2222
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2323
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
2424
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.DI.LightInject/EasyNetQ.DI.LightInject.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>An adaptor to allow EasyNetQ to use LightInject as its internal IoC container</Description>
55
<PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
66
<PackageTags>LightInject;RabbitMQ;Messaging;AMQP;C#</PackageTags>
7-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
88
</PropertyGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
@@ -15,14 +15,14 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
1717
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
1919
<Reference Include="System" />
2020
<Reference Include="Microsoft.CSharp" />
2121
</ItemGroup>
2222
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2323
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
2424
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.DI.Ninject/EasyNetQ.DI.Ninject.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>An adaptor to allow EasyNetQ to use Ninject as its internal IoC container</Description>
55
<PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
66
<PackageTags>Ninject;RabbitMQ;Messaging;AMQP;C#</PackageTags>
7-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
88
</PropertyGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
@@ -15,14 +15,14 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
1717
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
1919
<Reference Include="System" />
2020
<Reference Include="Microsoft.CSharp" />
2121
</ItemGroup>
2222
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2323
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
2424
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.DI.SimpleInjector/EasyNetQ.DI.SimpleInjector.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>An adaptor to allow EasyNetQ to use SimpleInjector as its internal IoC container</Description>
55
<PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
66
<PackageTags>SimpleInjector;RabbitMQ;Messaging;AMQP;C#</PackageTags>
7-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
88
</PropertyGroup>
99
<ItemGroup>
1010
</ItemGroup>
@@ -17,14 +17,14 @@
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
1919
</ItemGroup>
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
20+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2121
<Reference Include="System" />
2222
<Reference Include="Microsoft.CSharp" />
2323
</ItemGroup>
2424
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2525
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
2626
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
27+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2828
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2929
</PropertyGroup>
3030
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.DI.StructureMap/EasyNetQ.DI.StructureMap.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>An adaptor to allow EasyNetQ to use StructureMap as its internal IoC container</Description>
55
<PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
66
<PackageTags>StructureMap;RabbitMQ;Messaging;AMQP;C#</PackageTags>
7-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
88
</PropertyGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
@@ -15,14 +15,14 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
1717
</ItemGroup>
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
1919
<Reference Include="System" />
2020
<Reference Include="Microsoft.CSharp" />
2121
</ItemGroup>
2222
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2323
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
2424
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.DI.Tests/EasyNetQ.DI.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
55
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
66
</PropertyGroup>
77
<ItemGroup>
@@ -17,7 +17,7 @@
1717
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
1818
<ProjectReference Include="..\EasyNetQ.DI.Microsoft\EasyNetQ.DI.Microsoft.csproj" />
1919
</ItemGroup>
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
20+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2121
<Reference Include="System" />
2222
<Reference Include="Microsoft.CSharp" />
2323
</ItemGroup>
@@ -27,7 +27,7 @@
2727
<PackageReference Include="LightInject" Version="5.5.0" />
2828
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
2929
<PackageReference Include="NSubstitute" Version="4.2.1" />
30-
<PackageReference Include="RabbitMQ.Client" Version="[5.2.0,6.0.0)" />
30+
<PackageReference Include="RabbitMQ.Client" Version="[6.0.0,7.0.0)" />
3131
<PackageReference Include="SimpleInjector" Version="4.6.2" />
3232
<PackageReference Include="Autofac" Version="4.9.3" />
3333
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
@@ -40,7 +40,7 @@
4040
<ItemGroup>
4141
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
4242
</ItemGroup>
43-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
43+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
4444
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
4545
</PropertyGroup>
4646
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.DI.Windsor/EasyNetQ.DI.Windsor.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>An adaptor to allow EasyNetQ to use Castle.Windsor as its internal IoC container</Description>
55
<PackageIconUrl>https://raw.githubusercontent.com/EasyNetQ/EasyNetQ/gh-pages/design/logo_design.png</PackageIconUrl>
66
<PackageTags>Windsor;RabbitMQ;Messaging;AMQP;C#</PackageTags>
7-
<TargetFrameworks>netstandard2.0;net451</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
88
</PropertyGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
@@ -16,14 +16,14 @@
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
1818
</ItemGroup>
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
19+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2020
<Reference Include="System" />
2121
<Reference Include="Microsoft.CSharp" />
2222
</ItemGroup>
2323
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2424
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
2525
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
26+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2727
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2828
</PropertyGroup>
2929
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

‎Source/EasyNetQ.Hosepipe.SetupActions/EasyNetQ.Hosepipe.SetupActions.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
33
<PropertyGroup>
44
<Description>EasyNetQ.Hosepipe.SetupActions</Description>
5-
<TargetFramework>net451</TargetFramework>
5+
<TargetFramework>net461</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
88
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
@@ -12,13 +12,13 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
</PackageReference>
1414
</ItemGroup>
15-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
15+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
1616
<Reference Include="System.Configuration.Install" />
1717
<Reference Include="System" />
1818
<Reference Include="Microsoft.CSharp" />
1919
</ItemGroup>
20-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
20+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
2121
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2222
</PropertyGroup>
2323
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
24-
</Project>
24+
</Project>

‎Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1818
<PackageReference Include="xunit" Version="2.4.1" />
1919
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
20-
<PackageReference Include="RabbitMQ.Client" Version="[5.2.0,6.0.0)" />
20+
<PackageReference Include="RabbitMQ.Client" Version="[6.0.0,7.0.0)" />
2121
<PackageReference Include="GitVersionTask" Version="5.0.1">
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

‎Source/EasyNetQ.Hosepipe/EasyNetQ.Hosepipe.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
33
<PropertyGroup>
44
<Description>EasyNetQ.Hosepipe</Description>
5-
<TargetFrameworks>netcoreapp2.0;net451</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626
<ItemGroup>
2727
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
28-
<PackageReference Include="RabbitMQ.Client" Version="[5.2.0,6.0.0)" />
28+
<PackageReference Include="RabbitMQ.Client" Version="[6.0.0,7.0.0)" />
2929
<Reference Include="System" />
3030
<Reference Include="System.Core" />
3131
</ItemGroup>
@@ -37,14 +37,14 @@
3737
<PrivateAssets>all</PrivateAssets>
3838
</PackageReference>
3939
</ItemGroup>
40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
40+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
4141
<Reference Include="System" />
4242
<Reference Include="Microsoft.CSharp" />
4343
</ItemGroup>
4444
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
4545
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
4646
</PropertyGroup>
47-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
47+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
4848
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
4949
</PropertyGroup>
5050
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />

0 commit comments

Comments
 (0)