Skip to content

Commit 4a26b33

Browse files
zidadPliner
authored andcommitted
Bump dependencies (#973)
* Updated: - GitVersionTask 5.0.1 - Autofac 4.6.1 - LightInject 5.5.0 - Ninject 3.3.4 - SimpleInjector 3.2.7 Breaking: Minimal .NET version is now 4.5.2 for mongodb libraries * Update rabbitmq.client
1 parent 35d5928 commit 4a26b33

File tree

23 files changed

+106
-95
lines changed

23 files changed

+106
-95
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Autofac" Version="4.6.1" />
13+
<PackageReference Include="Autofac" Version="4.9.3" />
1414
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
@@ -26,4 +26,4 @@
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
29-
</Project>
29+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="LightInject" Version="4.0.11" />
13+
<PackageReference Include="LightInject" Version="5.5.0" />
1414
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
@@ -26,4 +26,4 @@
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
29-
</Project>
29+
</Project>

Source/EasyNetQ.DI.Microsoft/EasyNetQ.DI.Microsoft.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageTags>DependencyInjection;RabbitMQ;Messaging;AMQP;C#</PackageTags>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
1010
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1111
<PrivateAssets>all</PrivateAssets>
1212
</PackageReference>
@@ -15,4 +15,4 @@
1515
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1616
</ItemGroup>
1717
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
18-
</Project>
18+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Ninject" Version="3.3.2" />
13+
<PackageReference Include="Ninject" Version="3.3.4" />
1414
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
@@ -26,4 +26,4 @@
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
29-
</Project>
29+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="SimpleInjector" Version="3.2.7" />
15+
<PackageReference Include="SimpleInjector" Version="4.6.2" />
1616
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
@@ -28,4 +28,4 @@
2828
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2929
</PropertyGroup>
3030
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
31-
</Project>
31+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="structuremap" Version="4.4.0" />
13+
<PackageReference Include="structuremap" Version="4.7.1" />
1414
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
@@ -26,4 +26,4 @@
2626
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2727
</PropertyGroup>
2828
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
29-
</Project>
29+
</Project>

Source/EasyNetQ.DI.Tests/ContainerAdapterTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ namespace EasyNetQ.DI.Tests
2525
public class ContainerAdapterTests
2626
{
2727
public delegate IServiceResolver ResolverFactory(Action<IServiceRegister> configure);
28-
28+
2929
[Theory]
3030
[MemberData(nameof(GetContainerAdapters))]
3131
public void Should_last_registration_win(ResolverFactory resolverFactory)
3232
{
3333
var first = new Service();
3434
var last = new Service();
35-
35+
3636
var resolver = resolverFactory(c =>
3737
{
3838
c.Register<IService>(first);
3939
c.Register<IService>(last);
4040
});
41-
41+
4242
Assert.Equal(last, resolver.Resolve<IService>());
4343
}
44-
44+
4545
[Theory]
4646
[MemberData(nameof(GetContainerAdapters))]
4747
public void Should_singleton_created_once(ResolverFactory resolverFactory)
@@ -50,7 +50,7 @@ public void Should_singleton_created_once(ResolverFactory resolverFactory)
5050

5151
var first = resolver.Resolve<IService>();
5252
var second = resolver.Resolve<IService>();
53-
53+
5454
Assert.Same(first, second);
5555
}
5656

@@ -112,7 +112,7 @@ public static IEnumerable<object[]> GetContainerAdapters()
112112
{
113113
var container = new LightInjectContainer();
114114
c(new LightInjectAdapter(container));
115-
return container.GetInstance<IServiceResolver>();
115+
return (IServiceResolver) container.GetInstance(typeof(IServiceResolver));
116116
})};
117117

118118
yield return new object[] {(ResolverFactory) (c =>
@@ -135,14 +135,14 @@ public static IEnumerable<object[]> GetContainerAdapters()
135135
var container = containerBuilder.Build();
136136
return container.Resolve<IServiceResolver>();
137137
})};
138-
138+
139139
yield return new object[] {(ResolverFactory) (c =>
140140
{
141141
var container = new WindsorContainer();
142142
c(new WindsorAdapter(container));
143143
return container.Resolve<IServiceResolver>();
144144
})};
145-
145+
146146
yield return new object[] {(ResolverFactory) (c =>
147147
{
148148
var container = new NinjectContainer();
@@ -170,7 +170,7 @@ public class Service : IService
170170
private static volatile int sequenceNumber = 0;
171171

172172
private readonly int number;
173-
173+
174174
public Service()
175175
{
176176
number = Interlocked.Increment(ref sequenceNumber);
@@ -182,4 +182,4 @@ public override string ToString()
182182
}
183183
}
184184
}
185-
}
185+
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
<Reference Include="Microsoft.CSharp" />
2323
</ItemGroup>
2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
26-
<PackageReference Include="xunit" Version="2.3.1" />
27-
<PackageReference Include="LightInject" Version="4.0.11" />
28-
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
29-
<PackageReference Include="NSubstitute" Version="2.0.3" />
30-
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
31-
<PackageReference Include="SimpleInjector" Version="3.2.7" />
32-
<PackageReference Include="Autofac" Version="4.6.1" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
26+
<PackageReference Include="xunit" Version="2.4.1" />
27+
<PackageReference Include="LightInject" Version="5.5.0" />
28+
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
29+
<PackageReference Include="NSubstitute" Version="4.2.1" />
30+
<PackageReference Include="RabbitMQ.Client" Version="5.1.1" />
31+
<PackageReference Include="SimpleInjector" Version="4.6.2" />
32+
<PackageReference Include="Autofac" Version="4.9.3" />
3333
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
34-
<PackageReference Include="Castle.Core" Version="4.2.0" />
35-
<PackageReference Include="Castle.Windsor" Version="4.1.0" />
36-
<PackageReference Include="Ninject" Version="3.3.2" />
34+
<PackageReference Include="Castle.Core" Version="4.4.0" />
35+
<PackageReference Include="Castle.Windsor" Version="5.0.0" />
36+
<PackageReference Include="Ninject" Version="3.3.4" />
3737
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
3838
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
3939
</ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<ProjectReference Include="..\EasyNetQ\EasyNetQ.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Castle.Core" Version="4.2.0" />
14-
<PackageReference Include="Castle.Windsor" Version="4.1.0" />
13+
<PackageReference Include="Castle.Core" Version="4.4.0" />
14+
<PackageReference Include="Castle.Windsor" Version="5.0.0" />
1515
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
@@ -27,4 +27,4 @@
2727
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
2828
</PropertyGroup>
2929
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
30-
</Project>
30+
</Project>

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
9-
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
108
<Reference Include="System" />
119
<Reference Include="System.Core" />
1210
</ItemGroup>
@@ -16,9 +14,10 @@
1614
<ProjectReference Include="..\EasyNetQ.Tests.Common\EasyNetQ.Tests.Common.csproj" />
1715
</ItemGroup>
1816
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
20-
<PackageReference Include="xunit" Version="2.3.1" />
21-
<PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
18+
<PackageReference Include="xunit" Version="2.4.1" />
19+
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
20+
<PackageReference Include="RabbitMQ.Client" Version="5.1.1" />
2221
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012">
2322
<PrivateAssets>all</PrivateAssets>
2423
</PackageReference>
@@ -41,4 +40,4 @@
4140
<DefineConstants>$(DefineConstants);NETFX</DefineConstants>
4241
</PropertyGroup>
4342
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.targets))\build.targets" />
44-
</Project>
43+
</Project>

0 commit comments

Comments
 (0)