Skip to content
This repository was archived by the owner on Nov 7, 2019. It is now read-only.

Commit b6d3057

Browse files
stajsstajs
committed
Merge branch 'net-2.0'
2 parents 5b6217f + 066092d commit b6d3057

30 files changed

Lines changed: 129 additions & 126 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#NuGet for local development
2+
.local-nuget
3+
14
## Ignore Specflow generated code
25
*.feature.cs
36
app.config

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,38 @@ Update your project:
1717
* [xUnit](https://github.com/xunit/dotnet-test-xunit):
1818
```xml
1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2121
<PackageReference Include="SpecFlow" Version="2.1.0" />
22-
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
23+
<PackageReference Include="xunit" Version="2.2.0" />
2424
</ItemGroup>
2525
```
2626

2727
* [NUnit](https://github.com/nunit/dotnet-test-nunit) _(Experimental)_:
2828
```xml
2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
3131
<PackageReference Include="SpecFlow" Version="2.1.0" />
32-
<PackageReference Include="NUnit" Version="3.4.1" />
33-
<PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-2" />
32+
<PackageReference Include="NUnit" Version="3.8.1" />
33+
<PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-2" />
3434
</ItemGroup>
3535
```
3636

3737
* [MsTest](https://www.nuget.org/packages/dotnet-test-mstest/1.1.1-preview) _(Experimental)_:
3838
```xml
3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
40+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
4141
<PackageReference Include="SpecFlow" Version="2.1.0" />
42-
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
43-
<PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" />
42+
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
43+
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
4444
</ItemGroup>
4545
```
4646

4747
2. Include [`SpecFlow.NetCore`](https://www.nuget.org/packages/SpecFlow.NetCore):
4848

4949
```xml
5050
<ItemGroup>
51-
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc8" />
51+
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc9" />
5252
</ItemGroup>
5353
```
5454

@@ -65,7 +65,7 @@ Update your project:
6565
### Notes
6666

6767
- There is [a bug with the .NET Core CLI requiring a second build for newly added files to be discovered](https://github.com/stajs/SpecFlow.NetCore/issues/22).
68-
- Support for the .NET Core 1.0.0-rc4 tooling and `.csproj` was added by the community in February 2017 (thanks @richardjharding!) but has not yet been officially tested.
68+
- Support for the .NET Core switch from `project.json` to MSBuild `.csproj` was added by the community in February 2017 (thanks @richardjharding!) but has not yet been officially tested.
6969

7070
### Samples
7171

@@ -75,7 +75,7 @@ If you build the [samples](https://github.com/stajs/SpecFlow.NetCore/tree/master
7575

7676
### .NET Core
7777

78-
- ~~`netcoreapp1.0`~~ (see [#39](https://github.com/stajs/SpecFlow.NetCore/issues/39))
78+
- ~~`netcoreapp2.0`~~ (see [#39](https://github.com/stajs/SpecFlow.NetCore/issues/39))
7979
- `net46`
8080
- `net461`
8181

‎samples/VS2015/SpecFlow 2.1.0/net461/NuGet.config‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎samples/VS2017/SpecFlow 2.1.0/net461/NuGet.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="SpecFlow.NetCore - Local NuGet" value="..\..\..\..\.local-nuget" />
5+
</packageSources>
6+
</configuration>

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Folder/Folder.feature renamed to samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Folder/Folder.feature

File renamed without changes.

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Properties/AssemblyInfo.cs renamed to samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Properties/AssemblyInfo.cs

File renamed without changes.

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Root.feature renamed to samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Root.feature

File renamed without changes.

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Sample.Website.Tests.MSTest.csproj renamed to samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/Sample.Website.Tests.MSTest.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
24-
<PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2524
<PackageReference Include="SpecFlow" Version="2.1.0" />
26-
<PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
25+
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
26+
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
2727
</ItemGroup>
2828

2929
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -36,7 +36,7 @@
3636
</Target>
3737

3838
<ItemGroup>
39-
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc9-00004" />
39+
<DotNetCliToolReference Include="SpecFlow.NetCore" Version="1.0.0-rc9-0010" />
4040
</ItemGroup>
4141

4242
</Project>

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/StepDefinitions.cs renamed to samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.MsTest/StepDefinitions.cs

File renamed without changes.

samples/VS2015/SpecFlow 2.1.0/net461/Sample.Website.Tests.NUnit/Folder/Folder.feature renamed to samples/VS2017/SpecFlow 2.1.0/net461/Sample.Website.Tests.NUnit/Folder/Folder.feature

File renamed without changes.

0 commit comments

Comments
 (0)