Skip to content

Commit fbd6150

Browse files
author
TheTribe
committed
Merge pull request #90 from jbatte47/feature/issue-73
Feature/issue 73
2 parents af2193e + 69b8d27 commit fbd6150

8 files changed

Lines changed: 23 additions & 29 deletions

File tree

‎src/Patterns.Autofac/Patterns.Autofac.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@
3737
<ItemGroup>
3838
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
3939
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
43-
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
40+
<HintPath>..\packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
4541
</Reference>
4642
<Reference Include="AutoMapper">
4743
<HintPath>..\packages\AutoMapper.2.2.1\lib\net40\AutoMapper.dll</HintPath>

‎src/Patterns.Autofac/packages.config‎

Lines changed: 1 addition & 1 deletion
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.0.1" targetFramework="net40" />
3+
<package id="Autofac" version="3.1.1" targetFramework="net40" />
44
<package id="AutoMapper" version="2.2.1" targetFramework="net40" />
55
<package id="Castle.Core" version="3.2.0" targetFramework="net40" />
66
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />

‎src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@
3737
<Prefer32Bit>false</Prefer32Bit>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="Autofac">
41-
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Autofac.Configuration">
44-
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
40+
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
41+
<SpecificVersion>False</SpecificVersion>
42+
<HintPath>..\packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
4543
</Reference>
46-
<Reference Include="Autofac.Extras.CommonServiceLocator">
47-
<HintPath>..\packages\Autofac.Extras.CommonServiceLocator.3.0.0\lib\net40\Autofac.Extras.CommonServiceLocator.dll</HintPath>
44+
<Reference Include="Autofac.Extras.CommonServiceLocator, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\packages\Autofac.Extras.CommonServiceLocator.3.0.1\lib\net40\Autofac.Extras.CommonServiceLocator.dll</HintPath>
4847
</Reference>
4948
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
5049
<SpecificVersion>False</SpecificVersion>

‎src/Patterns.Testing.Autofac/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.0.1" targetFramework="net45" />
4-
<package id="Autofac.Extras.CommonServiceLocator" version="3.0.0" targetFramework="net45" />
3+
<package id="Autofac" version="3.1.1" targetFramework="net40" />
4+
<package id="Autofac.Extras.CommonServiceLocator" version="3.0.1" targetFramework="net40" />
55
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />
66
<package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
77
<package id="Moq" version="4.0.10827" targetFramework="net45" />

‎src/Patterns/SolutionAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
[assembly: AssemblyCulture("")]
3232
[assembly: ComVisible(false)]
3333
[assembly: NeutralResourcesLanguage("en-US")]
34-
[assembly: AssemblyVersion("3.9.2")]
34+
[assembly: AssemblyVersion("3.9.3")]

‎src/Patterns/SolutionAssemblyInfo.settings.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Settings.Initialize(
33
majorNumber: 3,
44
minorNumber: 9,
5-
patchNumber: 2,
5+
patchNumber: 3,
66
buildNumber: null,
77
buildLevel: BuildLevels.None
88
);

‎src/_specs/_specs.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@
3535
<ItemGroup>
3636
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
3737
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
38+
<HintPath>..\packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
3939
</Reference>
40-
<Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
40+
<Reference Include="Autofac.Extras.DynamicProxy2, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
4141
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Autofac.Extras.DynamicProxy2">
45-
<HintPath>..\packages\Autofac.Extras.DynamicProxy2.3.0.0\lib\net40\Autofac.Extras.DynamicProxy2.dll</HintPath>
42+
<HintPath>..\packages\Autofac.Extras.DynamicProxy2.3.0.2\lib\net40\Autofac.Extras.DynamicProxy2.dll</HintPath>
4643
</Reference>
4744
<Reference Include="AutoMapper">
4845
<HintPath>..\packages\AutoMapper.2.2.1\lib\net40\AutoMapper.dll</HintPath>
@@ -58,9 +55,9 @@
5855
<Reference Include="FizzWare.NBuilder">
5956
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
6057
</Reference>
61-
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
58+
<Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
6259
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
60+
<HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
6461
</Reference>
6562
<Reference Include="Microsoft.Practices.ServiceLocation">
6663
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
@@ -301,7 +298,9 @@
301298
<Generator>SpecFlowSingleFileGenerator</Generator>
302299
<LastGenOutput>CompiledRegex.feature.cs</LastGenOutput>
303300
</None>
304-
<None Include="packages.config" />
301+
<None Include="packages.config">
302+
<SubType>Designer</SubType>
303+
</None>
305304
</ItemGroup>
306305
<ItemGroup>
307306
<ProjectReference Include="..\Patterns\Patterns.csproj">

‎src/_specs/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.0.1" targetFramework="net40" />
4-
<package id="Autofac.Extras.DynamicProxy2" version="3.0.0" targetFramework="net40" />
3+
<package id="Autofac" version="3.1.1" targetFramework="net40" />
4+
<package id="Autofac.Extras.DynamicProxy2" version="3.0.2" targetFramework="net40" />
55
<package id="AutoMapper" version="2.2.1" targetFramework="net40" />
66
<package id="Castle.Core" version="3.2.0" targetFramework="net40" />
77
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />
88
<package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
9-
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
9+
<package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
1010
<package id="Moq" version="4.0.10827" targetFramework="net40" />
1111
<package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
1212
<package id="NUnit" version="2.6.2" targetFramework="net40" />

0 commit comments

Comments
 (0)