Skip to content

Commit ccd1440

Browse files
i4004i4004
committed
Merge branch 'develop'
2 parents 1a093ff + 9c15503 commit ccd1440

File tree

18 files changed

+32
-295
lines changed

18 files changed

+32
-295
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,6 @@ Logs.log
115115
*.sqlite
116116

117117
# Coverage files ignore
118+
118119
*lcov.info
120+
lcov*.info

‎README.md‎

Lines changed: 1 addition & 267 deletions
Large diffs are not rendered by default.

‎src/Simplify.Cryptography.Tests/Simplify.Cryptography.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1414
<PackageReference Include="NUnit" Version="3.12.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
1616
<ProjectReference Include="..\Simplify.Cryptography\Simplify.Cryptography.csproj" />
1717
</ItemGroup>
1818
</Project>

‎src/Simplify.DI.Provider.CastleWindsor.Tests/Simplify.DI.Provider.CastleWindsor.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1414
<PackageReference Include="NUnit" Version="3.12.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
1616
<ProjectReference Include="..\Simplify.DI.Provider.CastleWindsor\Simplify.DI.Provider.CastleWindsor.csproj" />
1717
<ProjectReference Include="..\Simplify.DI.TestsTypes\Simplify.DI.TestsTypes.csproj" />
1818
</ItemGroup>

‎src/Simplify.DI.Provider.Microsoft.Extensions.DependencyInjection.Tests/Simplify.DI.Provider.Microsoft.Extensions.DependencyInjection.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1414
<PackageReference Include="NUnit" Version="3.12.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
1616
<ProjectReference Include="..\Simplify.DI.Provider.Microsoft.Extensions.DependencyInjection\Simplify.DI.Provider.Microsoft.Extensions.DependencyInjection.csproj" />
1717
<ProjectReference Include="..\Simplify.DI.TestsTypes\Simplify.DI.TestsTypes.csproj" />
1818
</ItemGroup>

‎src/Simplify.DI.Provider.SimpleInjector.Tests/Simplify.DI.Provider.SimpleInjector.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1414
<PackageReference Include="NUnit" Version="3.12.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
1616
<ProjectReference Include="..\Simplify.DI.Provider.SimpleInjector\Simplify.DI.Provider.SimpleInjector.csproj" />
1717
<ProjectReference Include="..\Simplify.DI.TestsTypes\Simplify.DI.TestsTypes.csproj" />
1818
</ItemGroup>

‎src/Simplify.DI.Tests/DIContainerProviderTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void Resolve_NotRegistered_ContainerException()
2525

2626
var ex = Assert.Throws<ContainerException>(() => _provider.Resolve<NonDepFoo>());
2727
Assert.That(ex.Message, Does.StartWith("Unable to resolve"));
28-
Assert.That(ex.Message, Does.Contain("NonDepFoo IsResolutionCall"));
28+
Assert.That(ex.Message, Does.Contain("NonDepFoo (IsResolutionCall)"));
2929
}
3030

3131
[Test]
@@ -36,7 +36,7 @@ public void ScopedResolve_NotRegistered_ContainerException()
3636
{
3737
var ex = Assert.Throws<ContainerException>(() => scope.Resolver.Resolve<NonDepFoo>());
3838
Assert.That(ex.Message, Does.StartWith("Unable to resolve"));
39-
Assert.That(ex.Message, Does.Contain("NonDepFoo IsResolutionCall"));
39+
Assert.That(ex.Message, Does.Contain("NonDepFoo (IsResolutionCall)"));
4040
}
4141
}
4242

@@ -565,7 +565,7 @@ public void ScopedResolve_SingletonDependsOnScoped_ContainerException()
565565
// Act && Assert
566566

567567
var ex = Assert.Throws<ContainerException>(() => scope.Resolver.Resolve<IFoo>());
568-
Assert.That(ex.Message, Does.Contain("IBar as parameter \"bar\" IsSingletonOrDependencyOfSingleton reuse Scoped {Lifespan=100} lifespan shorter than its parent's: singleton"));
568+
Assert.That(ex.Message, Does.Contain("IBar as parameter \"bar\" (IsSingletonOrDependencyOfSingleton) reuse Scoped {Lifespan=100} lifespan shorter than its parent's: Resolution root singleton"));
569569
}
570570
}
571571

@@ -850,7 +850,7 @@ public void Verify_SingletonDependsOnScoped_ContainerException()
850850
// Act && Assert
851851

852852
var ex = Assert.Throws<ContainerException>(() => _provider.Verify());
853-
Assert.That(ex.Message, Does.Contain("IBar as parameter \"bar\" IsSingletonOrDependencyOfSingleton reuse Scoped {Lifespan=100} lifespan shorter than its parent's: singleton"));
853+
Assert.That(ex.Message, Does.Contain("IBar as parameter \"bar\" (IsSingletonOrDependencyOfSingleton) reuse Scoped {Lifespan=100} lifespan shorter than its parent's: Resolution root singleton"));
854854
}
855855

856856
// Note: this behavior check is not available

‎src/Simplify.DI.Tests/Simplify.DI.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
44
<Authors>Alexander Krylkov</Authors>
55
<Product>Simplify</Product>
66
<Description>Simplify.DI unit tests</Description>
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
13-
<PackageReference Include="coverlet.msbuild" Version="2.7.0" />
13+
<PackageReference Include="coverlet.msbuild" Version="2.8.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1515
<PackageReference Include="NUnit" Version="3.12.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
16+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
1717
<ProjectReference Include="..\Simplify.DI.TestsTypes\Simplify.DI.TestsTypes.csproj" />
1818
<ProjectReference Include="..\Simplify.DI\Simplify.DI.csproj" />
1919
</ItemGroup>

‎src/Simplify.DI/Simplify.DI.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.0;net452</TargetFrameworks>
3+
<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard1.0;net452</TargetFrameworks>
44
<Authors>Alexander Krylkov</Authors>
55
<Product>Simplify</Product>
66
<Description>Simplify DI common interface for IOC containers</Description>
77
<Copyright>Licensed under LGPL</Copyright>
8-
<Version>4.0</Version>
8+
<Version>4.0.1</Version>
99
<PackageProjectUrl>https://github.com/SimplifyNet/Simplify/wiki/Simplify.DI</PackageProjectUrl>
1010
<PackageIconUrl>https://raw.githubusercontent.com/SimplifyNet/Images/master/Logo.png</PackageIconUrl>
1111
<RepositoryUrl>https://github.com/SimplifyNet/Simplify/tree/master/src/Simplify.DI</RepositoryUrl>
1212
<RepositoryType>GIT</RepositoryType>
1313
<PackageTags>.NET DI IOC-container</PackageTags>
1414
<PackageReleaseNotes>
15-
New Features
16-
* Fluent interfaces for registration methods added
15+
New
16+
* Explicit .NET Standard 2.0 support
17+
* Explicit .NET Core 3.1 support
1718
Updates
18-
* Upgrade to DryIoc 4.0.7
19+
* Upgrade internal DryIoc to v4.1.0
1920
</PackageReleaseNotes>
2021
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
2122
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.DI.xml</DocumentationFile>
2223
</PropertyGroup>
2324
<ItemGroup>
24-
<PackageReference Include="DryIoc" Version="4.0.7" PrivateAssets="All" />
25+
<PackageReference Include="DryIoc" Version="4.1.0" PrivateAssets="All" />
2526
</ItemGroup>
2627
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
2728
<Reference Include="System" />

‎src/Simplify.Extensions.Tests/Simplify.Extensions.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
1414
<PackageReference Include="NUnit" Version="3.12.0" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
1616
<ProjectReference Include="..\Simplify.Extensions\Simplify.Extensions.csproj" />
1717
</ItemGroup>
1818
</Project>

0 commit comments

Comments
 (0)