Skip to content

Commit

Permalink
Merge pull request #90 from jbatte47/feature/issue-73
Browse files Browse the repository at this point in the history
Feature/issue 73
  • Loading branch information
TheTribe committed Aug 14, 2013
2 parents af2193e + 69b8d27 commit fbd6150
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 29 deletions.
6 changes: 1 addition & 5 deletions src/Patterns.Autofac/Patterns.Autofac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@
<ItemGroup>
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
<HintPath>..\packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="AutoMapper">
<HintPath>..\packages\AutoMapper.2.2.1\lib\net40\AutoMapper.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Patterns.Autofac/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.0.1" targetFramework="net40" />
<package id="Autofac" version="3.1.1" targetFramework="net40" />
<package id="AutoMapper" version="2.2.1" targetFramework="net40" />
<package id="Castle.Core" version="3.2.0" targetFramework="net40" />
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />
Expand Down
13 changes: 6 additions & 7 deletions src/Patterns.Testing.Autofac/Patterns.Testing.Autofac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,13 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac">
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="Autofac.Configuration">
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="Autofac.Extras.CommonServiceLocator">
<HintPath>..\packages\Autofac.Extras.CommonServiceLocator.3.0.0\lib\net40\Autofac.Extras.CommonServiceLocator.dll</HintPath>
<Reference Include="Autofac.Extras.CommonServiceLocator, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.Extras.CommonServiceLocator.3.0.1\lib\net40\Autofac.Extras.CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/Patterns.Testing.Autofac/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.0.1" targetFramework="net45" />
<package id="Autofac.Extras.CommonServiceLocator" version="3.0.0" targetFramework="net45" />
<package id="Autofac" version="3.1.1" targetFramework="net40" />
<package id="Autofac.Extras.CommonServiceLocator" version="3.0.1" targetFramework="net40" />
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />
<package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
<package id="Moq" version="4.0.10827" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/Patterns/SolutionAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: AssemblyVersion("3.9.2")]
[assembly: AssemblyVersion("3.9.3")]
2 changes: 1 addition & 1 deletion src/Patterns/SolutionAssemblyInfo.settings.tt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Settings.Initialize(
majorNumber: 3,
minorNumber: 9,
patchNumber: 2,
patchNumber: 3,
buildNumber: null,
buildLevel: BuildLevels.None
);
Expand Down
17 changes: 8 additions & 9 deletions src/_specs/_specs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,11 @@
<ItemGroup>
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.dll</HintPath>
<HintPath>..\packages\Autofac.3.1.1\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="Autofac.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<Reference Include="Autofac.Extras.DynamicProxy2, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
</Reference>
<Reference Include="Autofac.Extras.DynamicProxy2">
<HintPath>..\packages\Autofac.Extras.DynamicProxy2.3.0.0\lib\net40\Autofac.Extras.DynamicProxy2.dll</HintPath>
<HintPath>..\packages\Autofac.Extras.DynamicProxy2.3.0.2\lib\net40\Autofac.Extras.DynamicProxy2.dll</HintPath>
</Reference>
<Reference Include="AutoMapper">
<HintPath>..\packages\AutoMapper.2.2.1\lib\net40\AutoMapper.dll</HintPath>
Expand All @@ -58,9 +55,9 @@
<Reference Include="FizzWare.NBuilder">
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
</Reference>
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
<HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
Expand Down Expand Up @@ -301,7 +298,9 @@
<Generator>SpecFlowSingleFileGenerator</Generator>
<LastGenOutput>CompiledRegex.feature.cs</LastGenOutput>
</None>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Patterns\Patterns.csproj">
Expand Down
6 changes: 3 additions & 3 deletions src/_specs/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Autofac" version="3.0.1" targetFramework="net40" />
<package id="Autofac.Extras.DynamicProxy2" version="3.0.0" targetFramework="net40" />
<package id="Autofac" version="3.1.1" targetFramework="net40" />
<package id="Autofac.Extras.DynamicProxy2" version="3.0.2" targetFramework="net40" />
<package id="AutoMapper" version="2.2.1" targetFramework="net40" />
<package id="Castle.Core" version="3.2.0" targetFramework="net40" />
<package id="Common.Logging" version="2.1.2" targetFramework="net40" />
<package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
<package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
<package id="Moq" version="4.0.10827" targetFramework="net40" />
<package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
<package id="NUnit" version="2.6.2" targetFramework="net40" />
Expand Down

0 comments on commit fbd6150

Please sign in to comment.