Skip to content

Commit 5b795ae

Browse files
committed
The solution builds again and tests run
1 parent 546d4b0 commit 5b795ae

File tree

6 files changed

+58
-46
lines changed

6 files changed

+58
-46
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ _NCrunch_TestStack.BDDfy/
2222
TestStack.BDDfy.sln.ide/
2323
src/packages/
2424
src/.vs/
25+
.vs/
2526
project.lock.json
2627
tools/Cake/
2728
tools/GitReleaseNotes/

src/Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
1920
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
2021
<PackageReference Include="shouldly" Version="3.0.0-beta0003" />
2122
<PackageReference Include="xunit" Version="2.3.1" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
2224
</ItemGroup>
2325

2426
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19+
<PackageReference Include="dotnet-xunit" Version="2.3.1" />
1920
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2021
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
2122
<PackageReference Include="nsubstitute" Version="3.1.0" />
2223
<PackageReference Include="shouldly" Version="3.0.0-beta0003" />
2324
<PackageReference Include="xunit" Version="2.3.1" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
2426
</ItemGroup>
2527

2628
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

src/TestStack.BDDfy.sln

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,86 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26114.2
3+
VisualStudioVersion = 15.0.27004.2002
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8F515887-AAB5-4873-8BE9-5AB10685EBCB}"
76
ProjectSection(SolutionItems) = preProject
8-
.gitattributes = .gitattributes
9-
.gitignore = .gitignore
7+
..\.gitattributes = ..\.gitattributes
8+
..\.gitignore = ..\.gitignore
9+
..\appveyor.deploy.yml = ..\appveyor.deploy.yml
1010
..\appveyor.yml = ..\appveyor.yml
11+
..\build.cake = ..\build.cake
12+
..\build.ps1 = ..\build.ps1
13+
..\deploy.cake = ..\deploy.cake
14+
..\deploy.ps1 = ..\deploy.ps1
15+
..\GitVersionConfig.yaml = ..\GitVersionConfig.yaml
16+
..\license.txt = ..\license.txt
17+
..\logo.png = ..\logo.png
1118
NuGet.config = NuGet.config
12-
readme.md = readme.md
13-
release-notes.md = release-notes.md
19+
..\readme.md = ..\readme.md
1420
EndProjectSection
1521
EndProject
1622
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{AA78EE3D-14A7-47F0-85EF-4412F1514AE3}"
1723
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.BDDfy.Tests", "TestStack.BDDfy.Tests\TestStack.BDDfy.Tests.csproj", "{0D4A804C-C52D-4916-846B-D57B20322212}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStack.BDDfy.Tests", "TestStack.BDDfy.Tests\TestStack.BDDfy.Tests.csproj", "{0D4A804C-C52D-4916-846B-D57B20322212}"
1925
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.BDDfy", "TestStack.BDDfy\TestStack.BDDfy.csproj", "{C1A46283-A5F2-4F93-9863-D731E5FC535B}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStack.BDDfy", "TestStack.BDDfy\TestStack.BDDfy.csproj", "{C1A46283-A5F2-4F93-9863-D731E5FC535B}"
2127
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.BDDfy.Samples", "Samples\TestStack.BDDfy.Samples\TestStack.BDDfy.Samples.csproj", "{267EA75C-EB57-4A15-80E7-9804A7B5F52B}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStack.BDDfy.Samples", "Samples\TestStack.BDDfy.Samples\TestStack.BDDfy.Samples.csproj", "{267EA75C-EB57-4A15-80E7-9804A7B5F52B}"
2329
EndProject
2430
Global
2531
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2632
Debug|Any CPU = Debug|Any CPU
27-
Release|Any CPU = Release|Any CPU
2833
Debug|x64 = Debug|x64
2934
Debug|x86 = Debug|x86
35+
Release|Any CPU = Release|Any CPU
3036
Release|x64 = Release|x64
3137
Release|x86 = Release|x86
3238
EndGlobalSection
3339
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3440
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3541
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x64.ActiveCfg = Debug|x64
37-
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x64.Build.0 = Debug|x64
38-
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x86.ActiveCfg = Debug|x86
39-
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x86.Build.0 = Debug|x86
42+
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x64.ActiveCfg = Debug|Any CPU
43+
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x64.Build.0 = Debug|Any CPU
44+
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x86.ActiveCfg = Debug|Any CPU
45+
{0D4A804C-C52D-4916-846B-D57B20322212}.Debug|x86.Build.0 = Debug|Any CPU
4046
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|Any CPU.ActiveCfg = Release|Any CPU
4147
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x64.ActiveCfg = Release|x64
43-
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x64.Build.0 = Release|x64
44-
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x86.ActiveCfg = Release|x86
45-
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x86.Build.0 = Release|x86
48+
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x64.ActiveCfg = Release|Any CPU
49+
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x64.Build.0 = Release|Any CPU
50+
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x86.ActiveCfg = Release|Any CPU
51+
{0D4A804C-C52D-4916-846B-D57B20322212}.Release|x86.Build.0 = Release|Any CPU
4652
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4753
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x64.ActiveCfg = Debug|x64
49-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x64.Build.0 = Debug|x64
50-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x86.ActiveCfg = Debug|x86
51-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x86.Build.0 = Debug|x86
54+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x64.ActiveCfg = Debug|Any CPU
55+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x64.Build.0 = Debug|Any CPU
56+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x86.ActiveCfg = Debug|Any CPU
57+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Debug|x86.Build.0 = Debug|Any CPU
5258
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|Any CPU.ActiveCfg = Release|Any CPU
5359
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x64.ActiveCfg = Release|x64
55-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x64.Build.0 = Release|x64
56-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x86.ActiveCfg = Release|x86
57-
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x86.Build.0 = Release|x86
60+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x64.ActiveCfg = Release|Any CPU
61+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x64.Build.0 = Release|Any CPU
62+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x86.ActiveCfg = Release|Any CPU
63+
{C1A46283-A5F2-4F93-9863-D731E5FC535B}.Release|x86.Build.0 = Release|Any CPU
5864
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5965
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x64.ActiveCfg = Debug|x64
61-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x64.Build.0 = Debug|x64
62-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x86.ActiveCfg = Debug|x86
63-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x86.Build.0 = Debug|x86
66+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x64.ActiveCfg = Debug|Any CPU
67+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x64.Build.0 = Debug|Any CPU
68+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x86.ActiveCfg = Debug|Any CPU
69+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Debug|x86.Build.0 = Debug|Any CPU
6470
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
6571
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|Any CPU.Build.0 = Release|Any CPU
66-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x64.ActiveCfg = Release|x64
67-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x64.Build.0 = Release|x64
68-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x86.ActiveCfg = Release|x86
69-
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x86.Build.0 = Release|x86
72+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x64.ActiveCfg = Release|Any CPU
73+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x64.Build.0 = Release|Any CPU
74+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x86.ActiveCfg = Release|Any CPU
75+
{267EA75C-EB57-4A15-80E7-9804A7B5F52B}.Release|x86.Build.0 = Release|Any CPU
7076
EndGlobalSection
7177
GlobalSection(SolutionProperties) = preSolution
7278
HideSolutionNode = FALSE
7379
EndGlobalSection
7480
GlobalSection(NestedProjects) = preSolution
7581
{267EA75C-EB57-4A15-80E7-9804A7B5F52B} = {AA78EE3D-14A7-47F0-85EF-4412F1514AE3}
7682
EndGlobalSection
83+
GlobalSection(ExtensibilityGlobals) = postSolution
84+
SolutionGuid = {D9DD26E5-F04A-49BF-B9AA-68D5D17A8F36}
85+
EndGlobalSection
7786
EndGlobal

src/TestStack.BDDfy/Processors/UnusedExampleException.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System;
2-
using System.Runtime.Serialization;
32

43
namespace TestStack.BDDfy.Processors
54
{
6-
#if NET40
7-
[System.Runtime.Serialization.Serializable]
8-
#else
5+
#if NET40
96
[System.Serializable]
7+
#else
8+
[System.Runtime.Serialization.Serializable]
109
#endif
1110
public class UnusedExampleException : Exception
1211
{
@@ -17,8 +16,8 @@ public UnusedExampleException(ExampleValue unusedValue) :
1716
#if NET40
1817

1918
protected UnusedExampleException(
20-
SerializationInfo info,
21-
StreamingContext context)
19+
System.Runtime.Serialization.SerializationInfo info,
20+
System.Runtime.Serialization.StreamingContext context)
2221
: base(info, context)
2322
{
2423
}

src/TestStack.BDDfy/Scanners/StepScanners/Examples/UnassignableExampleException.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System;
2-
using System.Runtime.Serialization;
32

43
namespace TestStack.BDDfy
54
{
6-
#if NET40
7-
[System.Runtime.Serialization.Serializable]
8-
#else
5+
#if NET40
96
[System.Serializable]
7+
#else
8+
[System.Runtime.Serialization.Serializable]
109
#endif
1110
public class UnassignableExampleException : Exception
1211
{
@@ -17,8 +16,8 @@ public UnassignableExampleException(string message, Exception inner, ExampleValu
1716
#if NET40
1817

1918
protected UnassignableExampleException(
20-
SerializationInfo info,
21-
StreamingContext context) : base(info, context)
19+
System.Runtime.Serialization.SerializationInfo info,
20+
System.Runtime.Serialization.StreamingContext context) : base(info, context)
2221
{
2322
}
2423

0 commit comments

Comments
 (0)