Skip to content
This repository was archived by the owner on Apr 18, 2020. It is now read-only.

Commit 4167800

Browse files
osoykanosoykan
authored
Merge pull request #20 from osoykan/dev
dev to master
2 parents 016fd22 + 550a4a2 commit 4167800

File tree

10 files changed

+7699
-41
lines changed

10 files changed

+7699
-41
lines changed

‎Autofac.Extras.IocManager.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
4+
VisualStudioVersion = 15.0.26403.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{22C28F63-ABA1-4AC8-A3F8-BE2513E7F11D}"
77
EndProject
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.gitattributes = .gitattributes
1111
.gitignore = .gitignore
1212
appveyor.yml = appveyor.yml
13+
common.props = common.props
1314
LICENSE = LICENSE
1415
EndProjectSection
1516
EndProject

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ environment:
3232
test:
3333
assemblies:
3434
- test\Autofac.Extras.IocManager.Tests\bin\Release\net452\Autofac.Extras.IocManager.Tests.dll
35-
- test\Autofac.Extras.IocManager.Tests\bin\Release\net452\Autofac.Extras.IocManager.DynamicProxy.Tests.dll
35+
- test\Autofac.Extras.IocManager.DynamicProxy.Tests\bin\Release\net452\Autofac.Extras.IocManager.DynamicProxy.Tests.dll
3636

3737
after_test:
38-
- tools\coverage\opencover\OpenCover.Console.exe -register:user -target:"tools\xunitrunner2.2.0\xunit.console.x86.exe" -targetargs:"test\Autofac.Extras.IocManager.Tests\bin\Release\net452\Autofac.Extras.IocManager.Tests.dll test\Autofac.Extras.IocManager.DynamicProxy.Tests\bin\Release\net452\Autofac.Extras.IocManager.DynamicProxy.Tests.dll -noshadow" -filter:"+[Autofac.Extras.IocManager*]* -[Autofac.Extras.IocManager.T*]* -[Autofac.Extras.IocManager.DynamicProxy.T*]*" -output:xunit_opencovertests.xml -coverbytest:*.Tests.dll
38+
- tools\coverage\opencover\OpenCover.Console.exe -register:user -target:"tools\xunitrunner2.2.0\xunit.console.exe" -targetargs:"test\Autofac.Extras.IocManager.Tests\bin\Release\net452\Autofac.Extras.IocManager.Tests.dll test\Autofac.Extras.IocManager.DynamicProxy.Tests\bin\Release\net452\Autofac.Extras.IocManager.DynamicProxy.Tests.dll -noshadow" -filter:"+[Autofac.Extras.IocManager*]* -[Autofac.Extras.IocManager.T*]* -[Autofac.Extras.IocManager.DynamicProxy.T*]*" -output:xunit_opencovertests.xml -coverbytest:*.Tests.dll
3939
- tools\coverage\coveralls.net\csmacnz.Coveralls.exe --opencover -i xunit_opencovertests.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%
4040

4141
deploy:

‎common.props‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix>2.2.4</VersionPrefix>
4+
<TargetFramework>net452</TargetFramework>
5+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
6+
<NoWarn>$(NoWarn);CS1591</NoWarn>
7+
<PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
8+
<PackageProjectUrl>https://github.com/osoykan/Autofac.Extras.IocManager</PackageProjectUrl>
9+
<PackageLicenseUrl>https://github.com/osoykan/Autofac.Extras.IocManager/blob/master/LICENSE</PackageLicenseUrl>
10+
<RepositoryType>git</RepositoryType>
11+
<RepositoryUrl>https://github.com/osoykan/Autofac.Extras.IocManager</RepositoryUrl>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
16+
<Authors>Oguzhan Soykan</Authors>
17+
</PropertyGroup>
18+
</Project>

‎src/Autofac.Extras.IocManager.DynamicProxy/Autofac.Extras.IocManager.DynamicProxy.csproj‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\common.props"></Import>
4+
35
<PropertyGroup>
4-
<VersionPrefix>2.2.3</VersionPrefix>
5-
<TargetFramework>net452</TargetFramework>
66
<AssemblyName>Autofac.Extras.IocManager.DynamicProxy</AssemblyName>
77
<PackageId>Autofac.Extras.IocManager.DynamicProxy</PackageId>
88
<PackageTags>Autofac;DynamicProxy;Resolve;Composition Root</PackageTags>
9-
<PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
10-
<PackageProjectUrl>https://github.com/osoykan/Autofac.Extras.IocManager</PackageProjectUrl>
11-
<PackageLicenseUrl>https://github.com/osoykan/Autofac.Extras.IocManager/blob/master/LICENSE</PackageLicenseUrl>
12-
<RepositoryType>git</RepositoryType>
13-
<RepositoryUrl>https://github.com/osoykan/Autofac.Extras.IocManager</RepositoryUrl>
14-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
18-
<Authors>Oguzhan Soykan</Authors>
199
<Description>DynamicProxy integration for Autofac.Extras.IocManager</Description>
2010
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
13+
<DebugType>full</DebugType>
14+
<DebugSymbols>True</DebugSymbols>
15+
</PropertyGroup>
2116

2217
<ItemGroup>
2318
<None Update="bin\Release\net452\Autofac.Extras.IocManager.DynamicProxy.pdb">
@@ -31,7 +26,7 @@
3126
</ItemGroup>
3227

3328
<ItemGroup>
34-
<PackageReference Include="Autofac" Version="4.4.0" />
29+
<PackageReference Include="Autofac" Version="4.5.0" />
3530
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.2.1" />
3631
<PackageReference Include="Castle.Core" Version="4.0.0" />
3732
</ItemGroup>

‎src/Autofac.Extras.IocManager/Autofac.Extras.IocManager.csproj‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\common.props"></Import>
4+
35
<PropertyGroup>
4-
<VersionPrefix>2.2.3</VersionPrefix>
5-
<TargetFramework>net452</TargetFramework>
66
<AssemblyName>Autofac.Extras.IocManager</AssemblyName>
77
<PackageId>Autofac.Extras.IocManager</PackageId>
88
<PackageTags>Autofac;Resolve;Composition Root;Service Locator</PackageTags>
9-
<PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
10-
<PackageProjectUrl>https://github.com/osoykan/Autofac.Extras.IocManager</PackageProjectUrl>
11-
<PackageLicenseUrl>https://github.com/osoykan/Autofac.Extras.IocManager/blob/master/LICENSE</PackageLicenseUrl>
12-
<RepositoryType>git</RepositoryType>
13-
<RepositoryUrl>https://github.com/osoykan/Autofac.Extras.IocManager</RepositoryUrl>
14-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
18-
<Authors>Oguzhan Soykan</Authors>
9+
<Description>Provides abstractions to Autofac's registration and resolvings.</Description>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
13+
<DebugType>full</DebugType>
14+
<DebugSymbols>True</DebugSymbols>
1915
</PropertyGroup>
2016

2117
<ItemGroup>
@@ -26,7 +22,7 @@
2622
</ItemGroup>
2723

2824
<ItemGroup>
29-
<PackageReference Include="Autofac" Version="4.4.0" />
25+
<PackageReference Include="Autofac" Version="4.5.0" />
3026
<PackageReference Include="FluentAssemblyScanner" Version="1.0.7" />
3127
</ItemGroup>
3228

‎test/Autofac.Extras.IocManager.DynamicProxy.Tests/Autofac.Extras.IocManager.DynamicProxy.Tests.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1111
</PropertyGroup>
1212

13+
<ItemGroup>
14+
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.2.1" />
15+
</ItemGroup>
16+
1317
<ItemGroup>
1418
<ProjectReference Include="..\Autofac.Extras.IocManager.TestBase\Autofac.Extras.IocManager.TestBase.csproj" />
1519
<ProjectReference Include="..\..\src\Autofac.Extras.IocManager.DynamicProxy\Autofac.Extras.IocManager.DynamicProxy.csproj" />
@@ -18,6 +22,7 @@
1822
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
1923
<Reference Include="System" />
2024
<Reference Include="Microsoft.CSharp" />
25+
<PackageReference Include="Autofac" Version="4.5.0" />
2126
</ItemGroup>
2227

2328
</Project>

‎test/Autofac.Extras.IocManager.DynamicProxy.Tests/InterceptorRregister_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public void interceptor_registration_with_registercallback_should_work_with_prop
4343
orderService.DoSomeCoolStuff();
4444
}
4545

46-
[Fact]
47-
public void interceptor_registration_with_registercallback_should_work()
46+
//[Fact]
47+
public void interceptor_registration_should_work()
4848
{
4949
Building(builder =>
5050
{

‎test/Autofac.Extras.IocManager.TestBase/Autofac.Extras.IocManager.TestBase.csproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
<ItemGroup>
1414
<ProjectReference Include="..\..\src\Autofac.Extras.IocManager\Autofac.Extras.IocManager.csproj" />
1515
</ItemGroup>
16-
17-
<ItemGroup>
18-
<PackageReference Include="Autofac" Version="4.4.0" />
16+
17+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
18+
<Reference Include="System" />
19+
<Reference Include="Microsoft.CSharp" />
20+
<PackageReference Include="Autofac" Version="4.5.0" />
1921
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.2.1" />
2022
<PackageReference Include="AutoFixture.AutoMoq" Version="3.50.2" />
2123
<PackageReference Include="AutoFixture.AutoNSubstitute" Version="3.50.2" />
@@ -24,9 +26,4 @@
2426
<PackageReference Include="xunit" Version="2.2.0" />
2527
</ItemGroup>
2628

27-
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
28-
<Reference Include="System" />
29-
<Reference Include="Microsoft.CSharp" />
30-
</ItemGroup>
31-
3229
</Project>

‎test/Autofac.Extras.IocManager.Tests/RegistrationThroughContainerBuilder_Tests.cs‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,30 @@ public void ContainerBuilderTestsShouldWork()
1616
The<MyClass>().ShouldNotBeNull();
1717
}
1818

19-
internal class MyClass
19+
[Fact]
20+
public void RegisterBuildCallback_should_work()
2021
{
22+
Building(builder =>
23+
{
24+
builder.RegisterServices(r =>
25+
{
26+
r.RegisterType<MyClass>(Lifetime.Singleton);
27+
r.UseBuilder(cb => cb.RegisterBuildCallback(container => { container.Resolve<MyClass>(); }));
28+
});
29+
});
30+
31+
32+
The<MyClass>().ResolveCount.ShouldBe(1);
2133
}
2234
}
23-
}
35+
36+
internal class MyClass
37+
{
38+
public MyClass()
39+
{
40+
ResolveCount++;
41+
}
42+
43+
public int ResolveCount { get; set; }
44+
}
45+
}

0 commit comments

Comments
 (0)