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

Commit d9818c0

Browse files
osoykanosoykan
authored
Merge pull request #16 from osoykan/dev
dev to master
2 parents e2a01cc + a875e8a commit d9818c0

40 files changed

+850
-284
lines changed

‎Autofac.Extras.IocManager.sln‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{22C28F63-ABA1-4AC8-A3F8-BE2513E7F11D}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CCAEDF67-43F5-4C1A-98F0-5760AC67040E}"
99
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
10+
.gitattributes = .gitattributes
11+
.gitignore = .gitignore
12+
appveyor.yml = appveyor.yml
13+
LICENSE = LICENSE
1114
EndProjectSection
1215
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Extras.IocManager", "src\Autofac.Extras.IocManager\Autofac.Extras.IocManager.xproj", "{8FE26180-DDCB-4D85-A6E6-E6CB815E4B6B}"
14-
EndProject
1516
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C763B71A-6296-412A-8063-385C8DEF0FE3}"
1617
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Extras.IocManager.Tests", "test\Autofac.Extras.IocManager.Tests\Autofac.Extras.IocManager.Tests.xproj", "{55E22544-92E4-4FEA-A333-6E00A575B828}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Extras.IocManager", "src\Autofac.Extras.IocManager\Autofac.Extras.IocManager.csproj", "{8FE26180-DDCB-4D85-A6E6-E6CB815E4B6B}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Extras.IocManager.Tests", "test\Autofac.Extras.IocManager.Tests\Autofac.Extras.IocManager.Tests.csproj", "{55E22544-92E4-4FEA-A333-6E00A575B828}"
1821
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Extras.IocManager.DynamicProxy", "src\Autofac.Extras.IocManager.DynamicProxy\Autofac.Extras.IocManager.DynamicProxy.xproj", "{9B2B300B-5A03-4F76-8C8E-4A174B47F7AA}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Extras.IocManager.DynamicProxy", "src\Autofac.Extras.IocManager.DynamicProxy\Autofac.Extras.IocManager.DynamicProxy.csproj", "{9B2B300B-5A03-4F76-8C8E-4A174B47F7AA}"
2023
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Extras.IocManager.DynamicProxy.Tests", "test\Autofac.Extras.IocManager.DynamicProxy.Tests\Autofac.Extras.IocManager.DynamicProxy.Tests.xproj", "{8FCAF277-E8E0-4ECE-B6D3-7135713C4CB8}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Extras.IocManager.DynamicProxy.Tests", "test\Autofac.Extras.IocManager.DynamicProxy.Tests\Autofac.Extras.IocManager.DynamicProxy.Tests.csproj", "{8FCAF277-E8E0-4ECE-B6D3-7135713C4CB8}"
2225
EndProject
23-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Extras.IocManager.TestBase", "test\Autofac.Extras.IocManager.TestBase\Autofac.Extras.IocManager.TestBase.xproj", "{00AD6263-BE77-4E7A-AA86-5F07182AE153}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Extras.IocManager.TestBase", "test\Autofac.Extras.IocManager.TestBase\Autofac.Extras.IocManager.TestBase.csproj", "{00AD6263-BE77-4E7A-AA86-5F07182AE153}"
2427
EndProject
2528
Global
2629
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Autofac.Extras.IocManager.v3.ncrunchsolution‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<SolutionConfiguration>
22
<Settings>
33
<AllowParallelTestExecution>False</AllowParallelTestExecution>
4+
<MetricsExclusionList>
5+
<Value>test\Autofac.Extras.IocManager.DynamicProxy.Tests\Autofac.Extras.IocManager.DynamicProxy.Tests.csproj</Value>
6+
<Value>test\Autofac.Extras.IocManager.TestBase\Autofac.Extras.IocManager.TestBase.csproj</Value>
7+
<Value>test\Autofac.Extras.IocManager.Tests\Autofac.Extras.IocManager.Tests.csproj</Value>
8+
</MetricsExclusionList>
49
<SolutionConfigured>True</SolutionConfigured>
510
</Settings>
611
</SolutionConfiguration>

‎appveyor.yml‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,49 @@
1+
configuration: Release
12
version: 1.0.{build}
2-
before_build:
3-
- cmd: dotnet.exe restore
3+
image: Visual Studio 2017 RC
4+
5+
before_build:
6+
- cmd: set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin;%PATH%
7+
- cmd: nuget install nuget.commandline -source https://dotnet.myget.org/F/nuget-build -prerelease -excludeversion
8+
- cmd: set PATH=%appveyor_build_folder%\NuGet.CommandLine\tools;%PATH%
9+
- cmd: nuget restore Autofac.Extras.IocManager.sln
10+
11+
build:
12+
project: Autofac.Extras.IocManager.sln
13+
publish_nuget: true
14+
publish_nuget_symbols: true
15+
include_nuget_references: true
16+
verbosity: minimal
17+
418
assembly_info:
519
patch: true
620
file: '**\AssemblyInfo.*'
721
assembly_version: '{version}'
822
assembly_file_version: '{version}'
923
assembly_informational_version: '{version}'
24+
1025
environment:
1126
nuget_user: [email protected]
1227
nuget_password:
1328
secure: w73Xs1Is7iK/DtAOf0XTHg==
1429
COVERALLS_REPO_TOKEN:
1530
secure: BolGC6FG7Pv51emvIKeU8n5Fx4jUEFyX9
16-
build:
17-
publish_nuget: true
18-
publish_nuget_symbols: true
19-
include_nuget_references: true
20-
verbosity: minimal
21-
after_build:
22-
- cmd: dotnet pack "src\Autofac.Extras.IocManager" -c "Release" -o "nupkg/"
23-
- cmd: dotnet pack "src\Autofac.Extras.IocManager.DynamicProxy" -c "Release" -o "nupkg/"
31+
2432
test:
2533
assemblies:
26-
- test\Autofac.Extras.IocManager.Tests\bin\Debug\net452\win7-x64\Autofac.Extras.IocManager.Tests.dll
27-
- test\Autofac.Extras.IocManager.Tests\bin\Debug\net452\win7-x64\Autofac.Extras.IocManager.DynamicProxy.Tests.dll
34+
- 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
36+
2837
after_test:
29-
- tools\coverage\opencover\OpenCover.Console.exe -register:user -target:"tools\xunitrunner\xunit.console.x86.exe" -targetargs:"test\Autofac.Extras.IocManager.Tests\bin\Debug\net452\win7-x64\Autofac.Extras.IocManager.Tests.dll test\Autofac.Extras.IocManager.DynamicProxy.Tests\bin\Debug\net452\win7-x64\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.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
3039
- tools\coverage\coveralls.net\csmacnz.Coveralls.exe --opencover -i xunit_opencovertests.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%
40+
3141
deploy:
3242
- provider: NuGet
3343
on:
3444
branch: master
3545
api_key:
3646
secure: liSTqN52OJQy9fZJk6gubSgYBAy4EXcEPCDSCLJ/3T9cZufzpTwvBlGPLX+iP2n9
47+
3748
artifacts:
3849
- path: '**\.nupkg/'

‎global.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>2.2.0</VersionPrefix>
5+
<TargetFramework>net452</TargetFramework>
6+
<AssemblyName>Autofac.Extras.IocManager.DynamicProxy</AssemblyName>
7+
<PackageId>Autofac.Extras.IocManager.DynamicProxy</PackageId>
8+
<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>
19+
<Description>DynamicProxy integration for Autofac.Extras.IocManager</Description>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<None Update="bin\Release\net452\Autofac.Extras.IocManager.DynamicProxy.pdb">
24+
<PackagePath>lib/net452/</PackagePath>
25+
<Pack>true</Pack>
26+
</None>
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<ProjectReference Include="..\Autofac.Extras.IocManager\Autofac.Extras.IocManager.csproj" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<PackageReference Include="Autofac" Version="4.4.0" />
35+
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.2.1" />
36+
<PackageReference Include="Castle.Core" Version="4.0.0" />
37+
</ItemGroup>
38+
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
40+
<Reference Include="System" />
41+
<Reference Include="Microsoft.CSharp" />
42+
</ItemGroup>
43+
44+
</Project>

‎src/Autofac.Extras.IocManager.DynamicProxy/Autofac.Extras.IocManager.DynamicProxy.v3.ncrunchproject‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
4+
</Settings>
5+
</ProjectConfiguration>

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/Autofac.Extras.IocManager.DynamicProxy/project.json‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>2.2.0</VersionPrefix>
5+
<TargetFramework>net452</TargetFramework>
6+
<AssemblyName>Autofac.Extras.IocManager</AssemblyName>
7+
<PackageId>Autofac.Extras.IocManager</PackageId>
8+
<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>
19+
</PropertyGroup>
20+
21+
<ItemGroup>
22+
<None Update="bin\Release\net452\Autofac.Extras.IocManager.pdb">
23+
<PackagePath>lib/net452/</PackagePath>
24+
<Pack>true</Pack>
25+
</None>
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<PackageReference Include="Autofac" Version="4.4.0" />
30+
<PackageReference Include="FluentAssemblyScanner" Version="1.0.7" />
31+
</ItemGroup>
32+
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
34+
<Reference Include="System" />
35+
<Reference Include="Microsoft.CSharp" />
36+
</ItemGroup>
37+
38+
</Project>

‎src/Autofac.Extras.IocManager/Autofac.Extras.IocManager.v3.ncrunchproject‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
4+
</Settings>
5+
</ProjectConfiguration>

0 commit comments

Comments
 (0)