Skip to content
This repository was archived by the owner on Dec 15, 2024. It is now read-only.

Commit 78d1da6

Browse files
ivanzivanz
authored
Merge pull request #39 from ivanz/iz-nsubstitute-fakeiteasy
Pull in latest stable version with .NET Standard support for NSubstit…
2 parents bcd734f + e0b09c8 commit 78d1da6

11 files changed

Lines changed: 37 additions & 59 deletions

‎Source/Machine.Fakes.Adapters.Specs/CommandOptionsSpecs.generated.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414

15-
#if !NETSTANDARD
15+
#if !NETSTANDARD
1616

1717

1818
namespace Machine.Fakes.Adapters.Specs.Rhinomocks
@@ -51,13 +51,12 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha
5151
}
5252
}
5353

54-
#endif
54+
#endif
5555

5656

5757

5858

5959

60-
#if !NETSTANDARD
6160

6261

6362
namespace Machine.Fakes.Adapters.Specs.NSubstitute
@@ -96,7 +95,6 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha
9695
}
9796
}
9897

99-
#endif
10098

10199

102100

@@ -145,8 +143,6 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha
145143

146144

147145

148-
#if !NETSTANDARD
149-
150146

151147
namespace Machine.Fakes.Adapters.Specs.FakeItEasy
152148
{
@@ -184,6 +180,5 @@ public class Given_an_exception_configured_on_a_command_when_triggering_the_beha
184180
}
185181
}
186182

187-
#endif
188183

189184

‎Source/Machine.Fakes.Adapters.Specs/EngineSpecs.generated.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ public class When_faking_a_delegate : WithCurrentEngine
120120
#endif
121121

122122

123-
#if !NETSTANDARD
124-
125123
namespace Machine.Fakes.Adapters.Specs.NSubstitute
126124
{
127125

@@ -234,7 +232,6 @@ public class When_faking_a_delegate : WithCurrentEngine
234232
}
235233
}
236234

237-
#endif
238235

239236

240237

@@ -352,7 +349,6 @@ public class When_faking_a_delegate : WithCurrentEngine
352349

353350

354351

355-
#if !NETSTANDARD
356352

357353
namespace Machine.Fakes.Adapters.Specs.FakeItEasy
358354
{
@@ -466,6 +462,3 @@ public class When_faking_a_delegate : WithCurrentEngine
466462
}
467463
}
468464

469-
#endif
470-
471-

‎Source/Machine.Fakes.Adapters.Specs/InlineConstraintSpecs.generated.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Machine.Specifications;
1111

1212

13-
#if !NETSTANDARD
13+
#if !NETSTANDARD
1414

1515

1616
namespace Machine.Fakes.Adapters.Specs.Rhinomocks
@@ -354,12 +354,11 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_
354354
}
355355
}
356356

357-
#endif
357+
#endif
358358

359359

360360

361361

362-
#if !NETSTANDARD
363362

364363

365364
namespace Machine.Fakes.Adapters.Specs.NSubstitute
@@ -703,7 +702,6 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_
703702
}
704703
}
705704

706-
#endif
707705

708706

709707

@@ -1055,7 +1053,6 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_
10551053

10561054

10571055

1058-
#if !NETSTANDARD
10591056

10601057

10611058
namespace Machine.Fakes.Adapters.Specs.FakeItEasy
@@ -1399,6 +1396,4 @@ public class When_matching_for_equality_without_explicit__Param__constraint_and_
13991396
}
14001397
}
14011398

1402-
#endif
1403-
14041399

‎Source/Machine.Fakes.Adapters.Specs/MethodCallOccurrenceSpecs.generated.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Machine.Specifications;
1212

1313

14-
#if !NETSTANDARD
14+
#if !NETSTANDARD
1515

1616

1717

@@ -139,11 +139,10 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_
139139
}
140140
}
141141

142-
#endif
142+
#endif
143143

144144

145145

146-
#if !NETSTANDARD
147146

148147

149148

@@ -271,7 +270,6 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_
271270
}
272271
}
273272

274-
#endif
275273

276274

277275

@@ -405,8 +403,6 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_
405403

406404

407405

408-
#if !NETSTANDARD
409-
410406

411407

412408
namespace Machine.Fakes.Adapters.Specs.FakeItEasy
@@ -533,5 +529,4 @@ public class Given_a_command_was_configured_on_a_fake_when_verifying_whether_it_
533529
}
534530
}
535531

536-
#endif
537532

‎Source/Machine.Fakes.Adapters.Specs/PropertyBehaviorSpecs.generated.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
using Machine.Specifications;
1111

1212

13-
14-
#if !NETSTANDARD
13+
14+
#if !NETSTANDARD
1515

1616

1717
namespace Machine.Fakes.Adapters.Specs.Rhinomocks
@@ -76,12 +76,10 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette
7676
}
7777
}
7878

79-
#endif
79+
#endif
8080

8181

8282

83-
84-
#if !NETSTANDARD
8583

8684

8785
namespace Machine.Fakes.Adapters.Specs.NSubstitute
@@ -146,11 +144,10 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette
146144
}
147145
}
148146

149-
#endif
150147

151148

152149

153-
150+
154151

155152

156153
namespace Machine.Fakes.Adapters.Specs.Moq
@@ -218,8 +215,7 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette
218215

219216

220217

221-
222-
#if !NETSTANDARD
218+
223219

224220

225221
namespace Machine.Fakes.Adapters.Specs.FakeItEasy
@@ -284,6 +280,5 @@ public class When_setting_up_a_return_value_for_a_property_with_getter_and_sette
284280
}
285281
}
286282

287-
#endif
288283

289284

‎Source/Machine.Fakes.Adapters.Specs/QueryOptionsSpecs.generated.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Machine.Specifications;
1313

1414

15-
#if !NETSTANDARD
15+
#if !NETSTANDARD
1616

1717

1818

@@ -96,12 +96,11 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi
9696
}
9797
}
9898

99-
#endif
99+
#endif
100100

101101

102102

103103

104-
#if !NETSTANDARD
105104

106105

107106

@@ -185,8 +184,6 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi
185184
}
186185
}
187186

188-
#endif
189-
190187

191188

192189

@@ -277,7 +274,6 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi
277274

278275

279276

280-
#if !NETSTANDARD
281277

282278

283279

@@ -361,6 +357,5 @@ public class Given_an_exception_configured_on_a_query_when_triggering_the_behavi
361357
}
362358
}
363359

364-
#endif
365360

366361

‎Source/Machine.Fakes.Adapters.Specs/project.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
},
1919
"Machine.Fakes.Rhinomocks": {
2020
"target": "project"
21-
},
22-
"Machine.Fakes.NSubstitute": {
23-
"target": "project"
24-
},
25-
"Machine.Fakes.FakeItEasy": {
26-
"target": "project"
2721
}
2822
}
2923
},
@@ -48,6 +42,12 @@
4842
"dotnet-test-mspec": "0.2-*",
4943
"Machine.Fakes.Moq": {
5044
"target": "project"
45+
},
46+
"Machine.Fakes.NSubstitute": {
47+
"target": "project"
48+
},
49+
"Machine.Fakes.FakeItEasy": {
50+
"target": "project"
5151
}
5252
}
5353
}

‎Source/Machine.Fakes.FakeItEasy/FakeItEasyEngine.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections;
33
using System.Collections.Generic;
44
using System.Linq.Expressions;
5+
using System.Reflection;
56

67
using FakeItEasy;
78
using FakeItEasy.Creation;

‎Source/Machine.Fakes.FakeItEasy/project.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@
1515
"Machine Project"
1616
],
1717
"frameworks": {
18-
"net40": {}
18+
"net40": {},
19+
"netstandard1.6": {
20+
"dependencies": {
21+
"NETStandard.Library": "1.6.0"
22+
}
23+
}
1924
},
2025
"dependencies": {
2126
"Machine.Fakes": {
2227
"target": "project"
2328
},
24-
"FakeItEasy": "2.0.0"
29+
"FakeItEasy": "3.1.0"
2530
}
2631
}

‎Source/Machine.Fakes.NSubstitute/project.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,17 @@
1515
"Machine Project"
1616
],
1717
"frameworks": {
18-
"net40": {}
18+
"net40": {},
19+
"netstandard1.5": {
20+
"dependencies": {
21+
"NETStandard.Library": "1.6.0"
22+
}
23+
}
1924
},
2025
"dependencies": {
2126
"Machine.Fakes": {
2227
"target": "project"
2328
},
24-
"NSubstitute": "1.8.2"
29+
"NSubstitute": "2.0.2"
2530
}
2631
}

0 commit comments

Comments
 (0)