Skip to content

Commit 5a36a79

Browse files
mwhelanmwhelan
committed
Merge pull request #80 from MehdiK/remove-net35
removed .net 3.5 support
2 parents 2c1171f + 5f30690 commit 5a36a79

12 files changed

Lines changed: 10 additions & 137 deletions

File tree

‎Packages.build‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,12 @@
4242
<Copy SourceFiles="$(ZipPath)\TestStack.BDDfy-$(Version)-NET40.zip" DestinationFolder="$(PackageOutput)" />
4343
</Target>
4444

45-
<Target Name="Net35Build">
46-
<MSBuild Projects="$(BDDfyBuild)" Properties="Version=$(Version);BuildFramework=NET35" Targets="Release" />
47-
<MakeDir Directories="$(ArtifactTemp)\NET35"/>
48-
<CreateItem Include="$(ArtifactPath)\*.*">
49-
<Output ItemName="Net35Artifact" TaskParameter="Include"/>
50-
</CreateItem>
51-
<Copy SourceFiles="@(Net35Artifact)" DestinationFolder="$(ArtifactTemp)\NET35" />
52-
<Copy SourceFiles="$(ZipPath)\TestStack.BDDfy-$(Version)-NET35.zip" DestinationFolder="$(PackageOutput)" />
53-
</Target>
54-
5545
<Target Name="Build">
5646
<CallTarget Targets="Net40Build" />
57-
<CallTarget Targets="Net35Build" />
5847
</Target>
5948

6049
<Target Name="CopyBDDfyLibs">
6150
<Copy SourceFiles="$(ArtifactTemp)\NET40\TestStack.BDDfy.dll;$(ArtifactTemp)\NET40\TestStack.BDDfy.dll" DestinationFolder="$(BDDfySpecPath)\lib\NET40" />
62-
<Copy SourceFiles="$(ArtifactTemp)\NET35\TestStack.BDDfy.dll;$(ArtifactTemp)\NET35\TestStack.BDDfy.dll" DestinationFolder="$(BDDfySpecPath)\lib\NET35" />
6351
</Target>
6452

6553
<Target Name="CopyBDDfySampleFiles">

‎Samples/TestStack.BDDfy.Samples/AsyncExample.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NET35
2-
using System;
1+
using System;
32
using System.Threading.Tasks;
43
using NUnit.Framework;
54

@@ -53,5 +52,4 @@ internal class Sut
5352
{
5453
}
5554
}
56-
}
57-
#endif
55+
}

‎TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if !NET35
2-
using System;
1+
using System;
32
using System.Reflection;
43
using System.Threading.Tasks;
54
using NUnit.Framework;
@@ -59,5 +58,4 @@ private class SomeScenario
5958
{
6059
}
6160
}
62-
}
63-
#endif
61+
}

‎TestStack.BDDfy.build‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
3434
</PropertyGroup>
3535

36-
<PropertyGroup Condition="$(BuildFramework)=='NET35'">
37-
<PackageName>$(ProjectName)-$(Version)-NET35</PackageName>
38-
<BuildConstants>NET35;TRACE</BuildConstants>
39-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
40-
</PropertyGroup>
41-
4236
<!--
4337
Solution redirects. Every VS project normally knows how to support these targets
4438
-->

‎TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public static IEnumerable<object> ExtractConstants<T>(this Expression<Action<T>>
2222
return ExtractConstants(methodCallExpression);
2323
}
2424

25-
#if !NET35
2625
public static IEnumerable<object> ExtractConstants<T>(this Expression<Func<T, System.Threading.Tasks.Task>> expression)
2726
{
2827
var lambdaExpression = expression as LambdaExpression;
@@ -35,7 +34,6 @@ public static IEnumerable<object> ExtractConstants<T>(this Expression<Func<T, Sy
3534

3635
return ExtractConstants(methodCallExpression);
3736
}
38-
#endif
3937

4038
private static IEnumerable<object> ExtractConstants(Expression expression)
4139
{
@@ -195,4 +193,4 @@ private static IEnumerable<object> ExtractConstants(MemberExpression memberExpre
195193
return constants;
196194
}
197195
}
198-
}
196+
}

‎TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs‎

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
using System.Linq.Expressions;
44
using System.Reflection;
55
using System.Linq;
6-
7-
#if !NET35
86
using System.Threading.Tasks;
9-
#endif
107

118
namespace TestStack.BDDfy
129
{
@@ -57,55 +54,7 @@ IScanner IHasScanner.GetScanner(string scenarioTitle, Type explicitStoryType)
5754
{
5855
return new DefaultScanner(_testObject, new FluentScenarioScanner(_steps, scenarioTitle), explicitStoryType);
5956
}
60-
#if NET35
61-
public void AddStep(Expression<Action<TScenario>> stepAction, string stepTextTemplate, bool asserts, ExecutionOrder executionOrder)
62-
{
63-
AddStep(stepAction, stepTextTemplate, asserts, executionOrder, true);
64-
}
65-
66-
public IWhen<TScenario> When(Expression<Action<TScenario>> whenStep)
67-
{
68-
AddStep(whenStep, null, false, ExecutionOrder.Transition);
69-
return this;
70-
}
71-
72-
public IGiven<TScenario> Given(Expression<Action<TScenario>> givenStep)
73-
{
74-
return Given(givenStep, null);
75-
}
76-
77-
IWhen<TScenario> IGiven<TScenario>.When(Expression<Action<TScenario>> whenStep)
78-
{
79-
return When(whenStep);
80-
}
81-
82-
IThen<TScenario> IWhen<TScenario>.Then(Expression<Action<TScenario>> thenStep)
83-
{
84-
AddStep(thenStep, null, true, ExecutionOrder.Assertion);
85-
return this;
86-
}
87-
88-
IThen<TScenario> IGiven<TScenario>.Then(Expression<Action<TScenario>> thenStep)
89-
{
90-
AddStep(thenStep, null, true, ExecutionOrder.Assertion);
91-
return this;
92-
}
93-
94-
IAndThen<TScenario> IThen<TScenario>.And(Expression<Action<TScenario>> andThenStep)
95-
{
96-
return ((IThen<TScenario>)this).And(andThenStep, null);
97-
}
98-
99-
IAndWhen<TScenario> IWhen<TScenario>.And(Expression<Action<TScenario>> andWhenStep)
100-
{
101-
return ((IWhen<TScenario>)this).And(andWhenStep, null);
102-
}
103-
104-
IAndGiven<TScenario> IGiven<TScenario>.And(Expression<Action<TScenario>> andGivenStep)
105-
{
106-
return ((IGiven<TScenario>)this).And(andGivenStep, null);
107-
}
108-
#else
57+
10958
IGiven<TScenario> IInitialStep<TScenario>.Given(Expression<Func<TScenario, Task>> givenStep, string stepTextTemplate)
11059
{
11160
AddStep(givenStep, stepTextTemplate, false, ExecutionOrder.SetupState);
@@ -238,7 +187,6 @@ private static MethodInfo GetMethodInfo(Expression<Func<TScenario, Task>> stepAc
238187
var methodCall = (MethodCallExpression)stepAction.Body;
239188
return methodCall.Method;
240189
}
241-
#endif
242190

243191
private void AddStep(Expression<Action<TScenario>> stepAction, string stepTextTemplate, bool asserts, ExecutionOrder executionOrder, bool reports = true, bool includeInputsInStepTitle = true)
244192
{
@@ -373,4 +321,4 @@ private static MethodInfo GetMethodInfo(Expression<Action<TScenario>> stepAction
373321
return methodCall.Method;
374322
}
375323
}
376-
}
324+
}

‎TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ namespace TestStack.BDDfy
66
public interface IFluentScanner<TScenario> : IHasScanner
77
{
88
IFluentScanner<TScenario> TearDownWith(Expression<Action<TScenario>> tearDownStep);
9-
#if !NET35
109
IFluentScanner<TScenario> TearDownWith(Expression<Func<TScenario, System.Threading.Tasks.Task>> tearDownStep);
11-
#endif
1210
}
13-
}
11+
}

‎TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
using System;
22
using System.Linq.Expressions;
3-
4-
#if !NET35
53
using System.Threading.Tasks;
6-
#endif
74

85
namespace TestStack.BDDfy
96
{
@@ -12,15 +9,7 @@ public interface IGiven<TScenario>
129
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep, bool includeInputsInStepTitle);
1310
IAndGiven<TScenario> And(Expression<Action<TScenario>> andGivenStep, bool includeInputsInStepTitle);
1411
IThen<TScenario> Then(Expression<Action<TScenario>> thenStep, bool includeInputsInStepTitle);
15-
#if NET35
16-
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep);
17-
IAndGiven<TScenario> And(Expression<Action<TScenario>> andGivenStep);
18-
IThen<TScenario> Then(Expression<Action<TScenario>> thenStep);
1912

20-
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep, string stepTextTemplate);
21-
IAndGiven<TScenario> And(Expression<Action<TScenario>> andGivenStep, string stepTextTemplate);
22-
IThen<TScenario> Then(Expression<Action<TScenario>> thenStep, string stepTextTemplate);
23-
#else
2413
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep, string stepTextTemplate = null);
2514
IAndGiven<TScenario> And(Expression<Action<TScenario>> andGivenStep, string stepTextTemplate = null);
2615
IThen<TScenario> Then(Expression<Action<TScenario>> thenStep, string stepTextTemplate = null);
@@ -32,6 +21,5 @@ public interface IGiven<TScenario>
3221
IWhen<TScenario> When(Expression<Func<TScenario, Task>> whenStep, bool includeInputsInStepTitle);
3322
IAndGiven<TScenario> And(Expression<Func<TScenario, Task>> andGivenStep, bool includeInputsInStepTitle);
3423
IThen<TScenario> Then(Expression<Func<TScenario, Task>> thenStep, bool includeInputsInStepTitle);
35-
#endif
3624
}
3725
}

‎TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
11
using System;
22
using System.Linq.Expressions;
3-
4-
#if !NET35
53
using System.Threading.Tasks;
6-
#endif
74

85
namespace TestStack.BDDfy
96
{
107
public interface IInitialStep<TScenario>
118
{
129
IGiven<TScenario> Given(Expression<Action<TScenario>> givenStep, bool includeInputsInStepTitle);
1310
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep, bool includeInputsInStepTitle);
14-
#if NET35
15-
IGiven<TScenario> Given(Expression<Action<TScenario>> givenStep);
16-
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep);
1711

18-
IGiven<TScenario> Given(Expression<Action<TScenario>> givenStep, string stepTextTemplate);
19-
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep, string stepTextTemplate);
20-
#else
2112
IGiven<TScenario> Given(Expression<Action<TScenario>> givenStep, string stepTextTemplate = null);
2213
IWhen<TScenario> When(Expression<Action<TScenario>> whenStep, string stepTextTemplate = null);
2314

2415
IGiven<TScenario> Given(Expression<Func<TScenario, Task>> givenStep, string stepTextTemplate = null);
2516
IWhen<TScenario> When(Expression<Func<TScenario, Task>> whenStep, string stepTextTemplate = null);
2617
IGiven<TScenario> Given(Expression<Func<TScenario, Task>> givenStep, bool includeInputsInStepTitle);
2718
IWhen<TScenario> When(Expression<Func<TScenario, Task>> whenStep, bool includeInputsInStepTitle);
28-
#endif
2919
}
3020
}

‎TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
using System;
22
using System.Linq.Expressions;
3-
4-
#if !NET35
53
using System.Threading.Tasks;
6-
#endif
74

85
namespace TestStack.BDDfy
96
{
107
public interface IThen<TScenario> : IFluentScanner<TScenario>
118
{
129
IAndThen<TScenario> And(Expression<Action<TScenario>> andThenStep, bool includeInputsInStepTitle);
13-
#if NET35
14-
IAndThen<TScenario> And(Expression<Action<TScenario>> andThenStep);
15-
IAndThen<TScenario> And(Expression<Action<TScenario>> andThenStep, string stepTextTemplate);
16-
#else
1710
IAndThen<TScenario> And(Expression<Action<TScenario>> andThenStep, string stepTextTemplate = null);
11+
1812
IAndThen<TScenario> And(Expression<Func<TScenario, Task>> andThenStep, string stepTextTemplate = null);
1913
IAndThen<TScenario> And(Expression<Func<TScenario, Task>> andThenStep, bool includeInputsInStepTitle);
20-
#endif
2114
}
2215
}

0 commit comments

Comments
 (0)