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

Commit f7e2dac

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/1.1.0' into production
2 parents 86f3f36 + 1a5e731 commit f7e2dac

76 files changed

Lines changed: 1250 additions & 1768 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: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
version: '{branch}-{build}'
2-
before_build:
3-
- cmd: >-
4-
nuget restore CSF.FlexDi.sln
2+
image: Visual Studio 2017
3+
4+
environment:
5+
JAVA_HOME: "C:\\Program Files\\Java\\jdk13"
6+
7+
init:
8+
- cmd: git config --global core.autocrlf true
59

6-
nuget install NUnit.ConsoleRunner -Version 3.6.1 -OutputDirectory testrunner
10+
install:
11+
- cmd: dotnet tool install --global dotnet-sonarscanner
712

8-
nuget install NUnit.Extension.NUnitV2Driver -Version 3.6.0 -OutputDirectory testrunner
13+
before_build:
14+
- cmd: dotnet --version
15+
- cmd: dotnet restore --verbosity m
16+
- cmd: dotnet-sonarscanner begin /k:"CSF.FlexDi" /v:AppVeyor_build_%APPVEYOR_BUILD_NUMBER% /o:craigfowler-github /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login=%SONARCLOUD_SECRET_KEY% /d:sonar.cs.nunit.reportsPaths=%APPVEYOR_BUILD_FOLDER%\**\TestResults\TestResults.xml /d:sonar.cs.opencover.reportsPaths=%APPVEYOR_BUILD_FOLDER%\**\TestResults\coverage.opencover.xml
17+
18+
build_script:
19+
- cmd: dotnet build
920

10-
build:
11-
verbosity: minimal
1221
test_script:
13-
- cmd: testrunner\\NUnit.ConsoleRunner.3.6.1\\tools\\nunit3-console.exe CSF.FlexDi.Tests\\bin\\Debug\\CSF.FlexDi.Tests.dll CSF.FlexDi.BoDiCompatibility.Tests\\bin\\Debug\\CSF.FlexDi.BoDiCompatibility.Tests.dll CSF.FlexDi.BoDiCompatibility.IntegrationTests\\bin\\Debug\\BoDi.Tests.dll --result=myresults.xml
22+
- cmd: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=\"json,opencover\" /p:CoverletOutput=\"TestResults/\" --test-adapter-path:. --logger:\"nunit\"
23+
24+
after_test:
25+
- cmd: dotnet-sonarscanner end /d:"sonar.login=%SONARCLOUD_SECRET_KEY%"

‎.travis.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
language: csharp
22
solution: CSF.FlexDi.sln
33

4-
install:
5-
- tools/install.sh
4+
jobs:
5+
include:
6+
- dotnet: 2.2.207
7+
mono: latest
68

79
script:
8-
- msbuild /p:Configuration=Debug CSF.FlexDi.sln
9-
- tools/run-tests.sh
10+
- dotnet build
11+
- dotnet test

‎CSF.FlexDi.BoDiCompatibility.IntegrationTests/App.config‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,5 @@
1919
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
2020
</startup>
2121

22-
<runtime>
23-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
24-
<dependentAssembly>
25-
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
26-
<bindingRedirect oldVersion="0.0.0.0-2.6.4.14350" newVersion="2.6.4.14350" />
27-
</dependentAssembly>
28-
<dependentAssembly>
29-
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
30-
<bindingRedirect oldVersion="0.0.0.0-4.2.1409.1722" newVersion="4.2.1409.1722" />
31-
</dependentAssembly>
32-
</assemblyBinding>
33-
</runtime>
34-
3522
</configuration>
3623

‎CSF.FlexDi.BoDiCompatibility.IntegrationTests/CSF.FlexDi.BoDiCompatibility.IntegrationTests.csproj‎

Lines changed: 20 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,28 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{97CAB1CC-30E5-4ABE-9B36-669E9F5EA381}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<RootNamespace>BoDi.Tests</RootNamespace>
4+
<TargetFramework>net45</TargetFramework>
5+
<IsTestProject>true</IsTestProject>
6+
<ReleaseVersion>1.1.0</ReleaseVersion>
97
<AssemblyName>BoDi.Tests</AssemblyName>
10-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.2</ReleaseVersion>
128
</PropertyGroup>
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14-
<DebugSymbols>true</DebugSymbols>
15-
<DebugType>full</DebugType>
16-
<Optimize>false</Optimize>
17-
<OutputPath>bin\Debug</OutputPath>
18-
<DefineConstants>DEBUG;</DefineConstants>
19-
<ErrorReport>prompt</ErrorReport>
20-
<WarningLevel>4</WarningLevel>
21-
<ConsolePause>false</ConsolePause>
22-
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
24-
<Optimize>true</Optimize>
25-
<OutputPath>bin\Release</OutputPath>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
28-
<ConsolePause>false</ConsolePause>
29-
</PropertyGroup>
30-
<ItemGroup>
31-
<Reference Include="Moq">
32-
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
33-
</Reference>
34-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
35-
<SpecificVersion>False</SpecificVersion>
36-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
37-
</Reference>
38-
<Reference Include="Should">
39-
<HintPath>..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
40-
</Reference>
41-
<Reference Include="System" />
42-
<Reference Include="System.Configuration" />
43-
</ItemGroup>
44-
<ItemGroup>
45-
<Compile Include="Properties\AssemblyInfo.cs" />
46-
<Compile Include="ContainerTests.cs" />
47-
<Compile Include="DisposeTests.cs" />
48-
<Compile Include="IsRegisteredTests.cs" />
49-
<Compile Include="NamedRegistrationTests.cs" />
50-
<Compile Include="ObjectCreationTests.cs" />
51-
<Compile Include="RegisterFactoryDelegateTests.cs" />
52-
<Compile Include="RegisterFromConfigTests.cs" />
53-
<Compile Include="RegisterInstanceTests.cs" />
54-
<Compile Include="RegisterTypeTests.cs" />
55-
<Compile Include="ResolveAllTests.cs" />
56-
<Compile Include="ResolveTests.cs" />
57-
<Compile Include="SubContainerTests.cs" />
58-
<Compile Include="TestClasses.cs" />
59-
<Compile Include="TestConfigSection.cs" />
60-
<Compile Include="ObjectContainerTests.cs" />
61-
</ItemGroup>
9+
6210
<ItemGroup>
63-
<None Include="App.config" />
64-
<None Include="packages.config" />
11+
<PackageReference Include="Should" Version="1.1.12" />
12+
<PackageReference Include="NUnit" Version="2.6.4" />
13+
<PackageReference Include="Moq" Version="4.2.1409.1722" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
15+
<PackageReference Include="NUnitTestAdapter" Version="2.3.0" />
16+
<PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
17+
<PackageReference Include="coverlet.msbuild" Version="2.8.0">
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
<PrivateAssets>all</PrivateAssets>
20+
</PackageReference>
6521
</ItemGroup>
22+
6623
<ItemGroup>
67-
<ProjectReference Include="..\CSF.FlexDi.BoDiCompatibility\CSF.FlexDi.BoDiCompatibility.csproj">
68-
<Project>{5E23B329-5C3A-41D2-8156-CC5F04986454}</Project>
69-
<Name>CSF.FlexDi.BoDiCompatibility</Name>
70-
</ProjectReference>
24+
<ProjectReference Include="..\CSF.FlexDi.BoDiCompatibility\CSF.FlexDi.BoDiCompatibility.csproj" />
25+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
26+
<Reference Include="System.Configuration" />
7127
</ItemGroup>
72-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
7328
</Project>

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

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

‎CSF.FlexDi.BoDiCompatibility.IntegrationTests/packages.config‎

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

‎CSF.FlexDi.BoDiCompatibility.Tests/App.config‎

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

‎CSF.FlexDi.BoDiCompatibility.Tests/Autofixture/AutoMoqDataAttribute.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
// list, please refer to the file NOTICE.txt
2020

2121
using System;
22-
using Ploeh.AutoFixture;
23-
using Ploeh.AutoFixture.AutoMoq;
24-
using Ploeh.AutoFixture.NUnit3;
22+
using AutoFixture;
23+
using AutoFixture.AutoMoq;
24+
using AutoFixture.NUnit3;
2525

2626
namespace CSF.FlexDi.BoDiCompatibility.Tests.Autofixture
2727
{
2828
public class AutoMoqDataAttribute : AutoDataAttribute
2929
{
30-
public AutoMoqDataAttribute() : base(new Fixture().Customize(new AutoMoqCustomization()))
30+
public AutoMoqDataAttribute() : base(() => new Fixture().Customize(new AutoMoqCustomization()))
3131
{
3232
}
3333
}

‎CSF.FlexDi.BoDiCompatibility.Tests/Autofixture/ParentServiceAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
using CSF.FlexDi.Resolution;
2525
using CSF.FlexDi.Tests.Stubs;
2626
using Moq;
27-
using Ploeh.AutoFixture;
28-
using Ploeh.AutoFixture.NUnit3;
27+
using AutoFixture;
28+
using AutoFixture.NUnit3;
2929

3030
namespace CSF.FlexDi.Tests.Autofixture
3131
{

‎CSF.FlexDi.BoDiCompatibility.Tests/Autofixture/SampleServiceAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
using CSF.FlexDi.Registration;
2424
using CSF.FlexDi.Tests.Stubs;
2525
using Moq;
26-
using Ploeh.AutoFixture;
27-
using Ploeh.AutoFixture.NUnit3;
26+
using AutoFixture;
27+
using AutoFixture.NUnit3;
2828

2929
namespace CSF.FlexDi.Tests.Autofixture
3030
{

0 commit comments

Comments
 (0)