Skip to content

Commit 308efce

Browse files
robdmoorerobdmoore
committed
Merge pull request #18 from BrainCrumbz/master
Update to NSubstitute 1.8.2
2 parents 639a3b8 + 8d6bb26 commit 308efce

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<SpecificVersion>False</SpecificVersion>
3838
<HintPath>..\packages\Autofac.3.3.0\lib\net40\Autofac.dll</HintPath>
3939
</Reference>
40-
<Reference Include="NSubstitute, Version=1.7.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
41-
<SpecificVersion>False</SpecificVersion>
42-
<HintPath>..\packages\NSubstitute.1.7.0.0\lib\NET40\NSubstitute.dll</HintPath>
40+
<Reference Include="NSubstitute, Version=1.8.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
41+
<HintPath>..\packages\NSubstitute.1.8.2.0\lib\net40\NSubstitute.dll</HintPath>
42+
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
4545
<SpecificVersion>False</SpecificVersion>
@@ -68,6 +68,9 @@
6868
<Name>AutofacContrib.NSubstitute</Name>
6969
</ProjectReference>
7070
</ItemGroup>
71+
<ItemGroup>
72+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
73+
</ItemGroup>
7174
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7275
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
7376
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎AutofacContrib.NSubstitute.Tests/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>
33
<package id="Autofac" version="3.3.0" targetFramework="net40" />
4-
<package id="NSubstitute" version="1.7.0.0" targetFramework="net40" />
4+
<package id="NSubstitute" version="1.8.2.0" targetFramework="net40" />
55
<package id="NUnit" version="2.6.3" targetFramework="net40" />
66
</packages>

‎AutofacContrib.NSubstitute/AutoSubstitute.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
namespace AutofacContrib.NSubstitute
99
{
10+
/// <summary>
11+
/// Deprecated auto mocking container. Use <see cref="AutoSubstitute"/> instead.
12+
/// </summary>
1013
[Obsolete("AutoMock has been deprecated in favour of AutoSubstitute.")]
1114
public class AutoMock : AutoSubstitute {}
1215

@@ -74,7 +77,7 @@ public T Resolve<T>(params Parameter[] parameters)
7477
/// <typeparam name="TService">The type to register the implementation as</typeparam>
7578
/// <typeparam name="TImplementation">The implementation type</typeparam>
7679
/// <param name="parameters">Optional constructor parameters</param>
77-
/// <returns>The resolved <see cref="TService"/></returns>
80+
/// <returns>The resolved service instance</returns>
7881
public TService Provide<TService, TImplementation>(params Parameter[] parameters)
7982
{
8083
Container.ComponentRegistry.Register(RegistrationBuilder.ForType<TImplementation>()
@@ -120,7 +123,7 @@ public TService Provide<TService>(TService instance, object serviceKey)
120123
/// <summary>
121124
/// Registers to the container and returns a substitute for a given concrete class given the explicit constructor parameters.
122125
/// This is used for concrete classes where NSubstitutes won't be created by default by the container when using Resolve.
123-
/// For advanced uses consider using directly <see cref="Substitute.For{TService}"/> and then calling <see cref="Provide{TService}"/> so that type is used on dependencies for other Resolved types.
126+
/// For advanced uses consider using directly <see cref="Substitute.For{TService}"/> and then calling <see cref="Provide{TService}(TService)"/> so that type is used on dependencies for other Resolved types.
124127
/// </summary>
125128
/// <typeparam name="TService">The type to register and return a substitute for</typeparam>
126129
/// <param name="parameters">Optional constructor parameters</param>
@@ -134,7 +137,7 @@ public TService SubstituteFor<TService>(params object[] parameters) where TServi
134137
/// <summary>
135138
/// Registers to the container and returns a substitute for a given concrete class using autofac to resolve the constructor parameters.
136139
/// This is used for concrete classes where NSubstitutes won't be created by default by the container when using Resolve.
137-
/// For advanced uses consider using directly <see cref="Substitute.For{TService}"/> and then calling <see cref="Provide{TService}"/> so that type is used on dependencies for other Resolved types.
140+
/// For advanced uses consider using directly <see cref="Substitute.For{TService}"/> and then calling <see cref="Provide{TService}(TService)"/> so that type is used on dependencies for other Resolved types.
138141
/// </summary>
139142
/// <typeparam name="TService">The type to register and return a substitute for</typeparam>
140143
/// <param name="parameters">Any constructor parameters that Autofac can't resolve automatically</param>

‎AutofacContrib.NSubstitute/AutofacContrib.NSubstitute.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<SpecificVersion>False</SpecificVersion>
4747
<HintPath>..\packages\Autofac.3.3.0\lib\net40\Autofac.dll</HintPath>
4848
</Reference>
49-
<Reference Include="NSubstitute, Version=1.7.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\packages\NSubstitute.1.7.0.0\lib\NET40\NSubstitute.dll</HintPath>
49+
<Reference Include="NSubstitute, Version=1.8.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
50+
<HintPath>..\packages\NSubstitute.1.8.2.0\lib\net40\NSubstitute.dll</HintPath>
51+
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="System" />
5454
<Reference Include="System.Core" />

‎AutofacContrib.NSubstitute/AutofacContrib.NSubstitute.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
en-US
3030
</language>
3131
<dependencies>
32-
<dependency id="NSubstitute" version="1.7.0.0" />
32+
<dependency id="NSubstitute" version="1.8.2.0" />
3333
<dependency id="Autofac" version="3.3.0" />
3434
</dependencies>
3535
</metadata>

‎AutofacContrib.NSubstitute/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Autofac" version="3.3.0" targetFramework="net40" />
4-
<package id="NSubstitute" version="1.7.0.0" targetFramework="net40" />
4+
<package id="NSubstitute" version="1.8.2.0" targetFramework="net40" />
55
</packages>

0 commit comments

Comments
 (0)