Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 42dfd07

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/0.3.0' into production
2 parents 915722b + d72fb8c commit 42dfd07

98 files changed

Lines changed: 4147 additions & 375 deletions

File tree

Some content is hidden

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

‎.appveyor.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
before_build:
33
- cmd: >-
44
nuget restore CSF.MicroDi.sln
5+
6+
nuget install NUnit.ConsoleRunner -Version 3.6.1 -OutputDirectory testrunner
7+
8+
nuget install NUnit.Extension.NUnitV2Driver -Version 3.6.0 -OutputDirectory testrunner
59
610
build:
711
verbosity: minimal
812
test_script:
9-
- cmd: nunit3-console CSF.MicroDi.Tests\\bin\\Debug\\CSF.MicroDi.Tests.dll CSF.MicroDi.BoDiCompatibility.Tests\\bin\\Debug\\CSF.MicroDi.BoDiCompatibility.Tests.dll CSF.MicroDi.BoDiCompatibility.IntegrationTests\\bin\\Debug\\BoDi.Tests.dll --result=myresults.xml;format=AppVeyor
13+
- cmd: testrunner\\NUnit.ConsoleRunner.3.6.1\\tools\\nunit3-console.exe CSF.MicroDi.Tests\\bin\\Debug\\CSF.MicroDi.Tests.dll CSF.MicroDi.BoDiCompatibility.Tests\\bin\\Debug\\CSF.MicroDi.BoDiCompatibility.Tests.dll CSF.MicroDi.BoDiCompatibility.IntegrationTests\\bin\\Debug\\BoDi.Tests.dll --result=myresults.xml

‎.travis.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ language: csharp
22
solution: CSF.MicroDi.sln
33

44
install:
5-
- nuget restore CSF.MicroDi.sln
6-
- nuget install NUnit.ConsoleRunner -Version 3.6.1 -OutputDirectory testrunner
7-
- nuget install NUnit.Extension.NUnitV2Driver -Version 3.6.0 -OutputDirectory testrunner
8-
- cp testrunner/NUnit.Extension.NUnitV2Driver.3.6.0/tools/* testrunner/NUnit.ConsoleRunner.3.6.1/tools/
5+
- tools/install.sh
96

107
script:
118
- msbuild /p:Configuration=Debug CSF.MicroDi.sln
12-
- mono "./testrunner/NUnit.ConsoleRunner.3.6.1/tools/nunit3-console.exe" CSF.MicroDi.Tests/bin/Debug/CSF.MicroDi.Tests.dll CSF.MicroDi.BoDiCompatibility.Tests/bin/Debug/CSF.MicroDi.BoDiCompatibility.Tests.dll CSF.MicroDi.BoDiCompatibility.IntegrationTests/bin/Debug/BoDi.Tests.dll
9+
- tools/run-tests.sh

‎CSF.MicroDi.BoDiCompatibility.IntegrationTests/CSF.MicroDi.BoDiCompatibility.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>BoDi.Tests</RootNamespace>
99
<AssemblyName>BoDi.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.2.0</ReleaseVersion>
11+
<ReleaseVersion>0.3.0</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎CSF.MicroDi.BoDiCompatibility.IntegrationTests/ContainerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void ShouldListRegistrationsInToString()
4444

4545
// when
4646
var result = container.ToString();
47-
Console.WriteLine(result);
47+
// Console.WriteLine(result);
4848

4949
// then
5050
result.ShouldContain("BoDi.IObjectContainer -> <self>");

‎CSF.MicroDi.BoDiCompatibility.IntegrationTests/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
3737
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
3838

39-
[assembly: AssemblyVersion("0.2.0.1")]
39+
[assembly: AssemblyVersion("0.3.0.1")]
4040

4141
// The following attributes are used to specify the signing key for the assembly,
4242
// if desired. See the Mono documentation for more information about signing.

‎CSF.MicroDi.BoDiCompatibility.Tests/CSF.MicroDi.BoDiCompatibility.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.MicroDi.BoDiCompatibility.Tests</RootNamespace>
99
<AssemblyName>CSF.MicroDi.BoDiCompatibility.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.2.0</ReleaseVersion>
11+
<ReleaseVersion>0.3.0</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎CSF.MicroDi.BoDiCompatibility.Tests/ObjectContainerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
namespace CSF.MicroDi.BoDiCompatibility.Tests
2929
{
30-
[TestFixture]
30+
[TestFixture,Parallelizable(ParallelScope.All)]
3131
public class ObjectContainerTests
3232
{
3333
[Test,AutoMoqData]

‎CSF.MicroDi.BoDiCompatibility.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
3737
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
3838

39-
[assembly: AssemblyVersion("0.2.0.1")]
39+
[assembly: AssemblyVersion("0.3.0.1")]
4040

4141
// The following attributes are used to specify the signing key for the assembly,
4242
// if desired. See the Mono documentation for more information about signing.

‎CSF.MicroDi.BoDiCompatibility/CSF.MicroDi.BoDiCompatibility.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>BoDi</RootNamespace>
99
<AssemblyName>BoDi</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.2.0</ReleaseVersion>
11+
<ReleaseVersion>0.3.0</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -44,6 +44,8 @@
4444
<Compile Include="Internal\BoDiResolverFactory.cs" />
4545
<Compile Include="Internal\DynamicResolutionObjectContainerProxy.cs" />
4646
<Compile Include="Internal\DynamicRecursionResolverProxy.cs" />
47+
<Compile Include="Internal\BoDiMicroDiContainerFactory.cs" />
48+
<Compile Include="Internal\DynamicRecursionResolverProxyFactory.cs" />
4749
</ItemGroup>
4850
<ItemGroup>
4951
<ProjectReference Include="..\CSF.MicroDi\CSF.MicroDi.csproj">

‎CSF.MicroDi.BoDiCompatibility/CSF.MicroDi.BoDiCompatibility.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<package>
33
<metadata>
44
<id>CSF.MicroDi.BoDiCompatibility</id>
5-
<version>0.2.0-alpha</version>
5+
<version>0.3.0-alpha</version>
66
<title>MicroDi BoDi compatibility</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseUrl>
9-
<projectUrl>https://github.com/csf-dev/CSF.MicroDi</projectUrl>
9+
<projectUrl>https://github.com/csf-dev/MicroDi</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>A compatible drop-in replacement for the BoDi dependency injection/IoC container (v1.3.0) using MicroDi.</description>
1212
<copyright>Copyright 2018</copyright>

0 commit comments

Comments
 (0)