Skip to content

Commit 8c685a3

Browse files
robdmoorerobdmoore
authored
Merge pull request #24 from BrainCrumbz/chore/autofac-4_1_1
chore(deps): upgrade Autofac to 4.1.1 and switch to .NET 4.5.2
2 parents 706f903 + 479b0c7 commit 8c685a3

File tree

5 files changed

+23
-17
lines changed

5 files changed

+23
-17
lines changed

‎AutofacContrib.NSubstitute.Tests/AutofacContrib.NSubstitute.Tests.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +10,10 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>AutofacContrib.NSubstitute.Tests</RootNamespace>
1212
<AssemblyName>AutofacContrib.NSubstitute.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
2223
<DefineConstants>DEBUG;TRACE</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2729
<DebugType>pdbonly</DebugType>
@@ -30,18 +32,19 @@
3032
<DefineConstants>TRACE</DefineConstants>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3336
</PropertyGroup>
3437
<ItemGroup>
35-
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
38+
<Reference Include="Autofac, Version=4.1.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Autofac.4.1.1\lib\net45\Autofac.dll</HintPath>
3740
<Private>True</Private>
3841
</Reference>
3942
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
40-
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net40\NSubstitute.dll</HintPath>
43+
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
4144
<Private>True</Private>
4245
</Reference>
4346
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44-
<HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
47+
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
4548
<Private>True</Private>
4649
</Reference>
4750
<Reference Include="System" />

‎AutofacContrib.NSubstitute.Tests/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.5.2" targetFramework="net40" />
4-
<package id="NSubstitute" version="1.10.0.0" targetFramework="net40" />
5-
<package id="NUnit" version="3.5.0" targetFramework="net40" />
3+
<package id="Autofac" version="4.1.1" targetFramework="net452" />
4+
<package id="NSubstitute" version="1.10.0.0" targetFramework="net452" />
5+
<package id="NUnit" version="3.5.0" targetFramework="net452" />
66
</packages>

‎AutofacContrib.NSubstitute/AutofacContrib.NSubstitute.csproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +10,10 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>AutofacContrib.NSubstitute</RootNamespace>
1212
<AssemblyName>AutofacContrib.NSubstitute</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
2526
<DocumentationFile>bin\Debug\AutofacContrib.NSubstitute.XML</DocumentationFile>
27+
<Prefer32Bit>false</Prefer32Bit>
2628
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2830
<DebugType>pdbonly</DebugType>
@@ -32,6 +34,7 @@
3234
<ErrorReport>prompt</ErrorReport>
3335
<WarningLevel>4</WarningLevel>
3436
<DocumentationFile>bin\Release\AutofacContrib.NSubstitute.XML</DocumentationFile>
37+
<Prefer32Bit>false</Prefer32Bit>
3538
</PropertyGroup>
3639
<PropertyGroup>
3740
<SignAssembly>false</SignAssembly>
@@ -41,12 +44,12 @@
4144
</AssemblyOriginatorKeyFile>
4245
</PropertyGroup>
4346
<ItemGroup>
44-
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
47+
<Reference Include="Autofac, Version=4.1.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Autofac.4.1.1\lib\net45\Autofac.dll</HintPath>
4649
<Private>True</Private>
4750
</Reference>
4851
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
49-
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net40\NSubstitute.dll</HintPath>
52+
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
5053
<Private>True</Private>
5154
</Reference>
5255
<Reference Include="System" />

‎AutofacContrib.NSubstitute/AutofacContrib.NSubstitute.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</language>
3131
<dependencies>
3232
<dependency id="NSubstitute" version="1.10.0.0" />
33-
<dependency id="Autofac" version="3.5.2" />
33+
<dependency id="Autofac" version="4.1.1" />
3434
</dependencies>
3535
</metadata>
3636
<files>

‎AutofacContrib.NSubstitute/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.5.2" targetFramework="net40" />
4-
<package id="NSubstitute" version="1.10.0.0" targetFramework="net40" />
3+
<package id="Autofac" version="4.1.1" targetFramework="net452" />
4+
<package id="NSubstitute" version="1.10.0.0" targetFramework="net452" />
55
</packages>

0 commit comments

Comments
 (0)