Skip to content

Commit

Permalink
Merge branch 'codecoverage'
Browse files Browse the repository at this point in the history
  • Loading branch information
qujck committed Sep 29, 2015
2 parents 1e39396 + 7c4a664 commit 257ba0f
Show file tree
Hide file tree
Showing 8 changed files with 358 additions and 219 deletions.
405 changes: 203 additions & 202 deletions .gitignore

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Simple Injector

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/simpleinjector/SimpleInjector?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build status](https://ci.appveyor.com/api/projects/status/2k9ududhkqqufk76?svg=true)](https://ci.appveyor.com/project/simpleinjector/simpleinjector)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/simpleinjector/SimpleInjector?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build status](https://ci.appveyor.com/api/projects/status/2k9ududhkqqufk76?svg=true)](https://ci.appveyor.com/project/simpleinjector/simpleinjector) [![Coverage Status](https://coveralls.io/repos/simpleinjector/SimpleInjector/badge.svg?branch=codecoverage&service=github)](https://coveralls.io/github/simpleinjector/SimpleInjector?branch=codecoverage) [![NuGet](https://img.shields.io/nuget/dt/SimpleInjector.svg)](https://www.nuget.org/packages/simpleinjector) [![NuGet](https://img.shields.io/nuget/v/SimpleInjector.svg)](https://www.nuget.org/packages/simpleinjector)

_**To get a high level overview of Simple Injector, please [visit our website](https://simpleinjector.org/)**. And did you know there's a [Simple Injector blog](https://simpleinjector.org/blog)?_

Expand Down
36 changes: 36 additions & 0 deletions SimpleInjector.CI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SimpleInjector.CI")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleInjector.CI")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6c96df05-104b-4ad0-b686-0fb59aef1dc2")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
56 changes: 56 additions & 0 deletions SimpleInjector.CI/SimpleInjector.CI.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SimpleInjector.CI</RootNamespace>
<AssemblyName>SimpleInjector.CI</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
5 changes: 5 additions & 0 deletions SimpleInjector.CI/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="coveralls.net" version="0.6.0" targetFramework="net452" />
<package id="OpenCover" version="4.6.166" targetFramework="net452" />
</packages>
16 changes: 16 additions & 0 deletions SimpleInjector.sln
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleInjector.Packaging",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildTools", "BuildTools", "{D1A45E86-CD79-4F65-AC0B-25A21166B1E9}"
ProjectSection(SolutionItems) = preProject
appveyor.bat = appveyor.bat
appveyor.yml = appveyor.yml
BuildTools\BetterAssemblyInfoTask.dll = BuildTools\BetterAssemblyInfoTask.dll
BuildTools\BetterAssemblyInfoTask.pdb = BuildTools\BetterAssemblyInfoTask.pdb
build.bat = build.bat
Expand Down Expand Up @@ -124,6 +126,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleInjector.Integration.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleInjector.Extensions.LifetimeScoping.PCL", "SimpleInjector.Extensions.LifetimeScoping.PCL\SimpleInjector.Extensions.LifetimeScoping.PCL.csproj", "{B7AE02F3-D306-4028-8646-4844DBA2CFCD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleInjector.CI", "SimpleInjector.CI\SimpleInjector.CI.csproj", "{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -330,6 +334,18 @@ Global
{B7AE02F3-D306-4028-8646-4844DBA2CFCD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B7AE02F3-D306-4028-8646-4844DBA2CFCD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B7AE02F3-D306-4028-8646-4844DBA2CFCD}.Release|x86.ActiveCfg = Release|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Debug|x86.ActiveCfg = Debug|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Debug|x86.Build.0 = Debug|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Release|Any CPU.Build.0 = Release|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Release|x86.ActiveCfg = Release|Any CPU
{6C96DF05-104B-4AD0-B686-0FB59AEF1DC2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
32 changes: 16 additions & 16 deletions appveyor.bat
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
REM nuget restore

ren fake.snk SimpleInjector.snk

msbuild "SimpleInjector.NET\SimpleInjector.NET.csproj" /nologo
msbuild "SimpleInjector.Packaging\SimpleInjector.Packaging.csproj" /nologo
msbuild "SimpleInjector.Extensions.LifetimeScoping\SimpleInjector.Extensions.LifetimeScoping.csproj" /nologo
msbuild "SimpleInjector.Integration.Web\SimpleInjector.Integration.Web.csproj" /nologo
rem msbuild "SimpleInjector.Integration.Web.Mvc\SimpleInjector.Integration.Web.Mvc.csproj" /nologo
msbuild "SimpleInjector.Integration.Wcf\SimpleInjector.Integration.Wcf.csproj" /nologo

msbuild "SimpleInjector.NET.Tests.Unit\SimpleInjector.NET.Tests.Unit.csproj" /nologo
msbuild "SimpleInjector.Extensions.LifetimeScoping.Tests.Unit\SimpleInjector.Extensions.LifetimeScoping.Tests.Unit.csproj" /nologo
msbuild "SimpleInjector.Integration.Web.Tests.Unit\SimpleInjector.Integration.Web.Tests.Unit.csproj" /nologo

ren SimpleInjector.snk fake.snk
REM nuget restore

ren fake.snk SimpleInjector.snk

msbuild "SimpleInjector.NET\SimpleInjector.NET.csproj" /nologo /p:Configuration=Debug
msbuild "SimpleInjector.Packaging\SimpleInjector.Packaging.csproj" /nologo /p:Configuration=Debug
msbuild "SimpleInjector.Extensions.LifetimeScoping\SimpleInjector.Extensions.LifetimeScoping.csproj" /nologo /p:Configuration=Debug
msbuild "SimpleInjector.Integration.Web\SimpleInjector.Integration.Web.csproj" /nologo /p:Configuration=Debug
rem msbuild "SimpleInjector.Integration.Web.Mvc\SimpleInjector.Integration.Web.Mvc.csproj" /nologo /p:Configuration=Debug
msbuild "SimpleInjector.Integration.Wcf\SimpleInjector.Integration.Wcf.csproj" /nologo /p:Configuration=Debug

msbuild "SimpleInjector.NET.Tests.Unit\SimpleInjector.NET.Tests.Unit.csproj" /nologo /p:Configuration=Debug
msbuild "SimpleInjector.Extensions.LifetimeScoping.Tests.Unit\SimpleInjector.Extensions.LifetimeScoping.Tests.Unit.csproj" /nologo /p:Configuration=Debug
msbuild "SimpleInjector.Integration.Web.Tests.Unit\SimpleInjector.Integration.Web.Tests.Unit.csproj" /nologo /p:Configuration=Debug

ren SimpleInjector.snk fake.snk
25 changes: 25 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 3.1.0.{build}
branches:
only:
- CI
os: Visual Studio 2015
before_build:
- nuget restore
skip_tags: true
configuration: Debug
assembly_info:
patch: true
file: '**\AssemblyInfo.*'
assembly_version: '{version}'
assembly_file_version: '{version}'
assembly_informational_version: '{version}'
build_script:
- cmd: >-
appveyor.bat
environment:
COVERALLS_REPO_TOKEN:
secure: Hw9xA9D3SRGgpH9hNHoiHqnilSWV6/32NecYMp0Pa7LDykWa1oXpjN0CQ4JLDz/e
after_test:
- mkdir reports
- packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -mergeoutput -register:user -target:"C:\Tools\NUnit\bin\nunit-console.exe" "-targetargs:\"SimpleInjector.NET.Tests.Unit\bin\Debug\SimpleInjector.Tests.Unit.dll\" -noshadow" -filter:"+[*]SimpleInjector.* -[*.Tests.*]*" -output:reports\opencoverCoverage.xml
- packages\coveralls.net.0.6.0\tools\csmacnz.Coveralls.exe --opencover -i reports\opencoverCoverage.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%

0 comments on commit 257ba0f

Please sign in to comment.