Skip to content

Commit 546d4b0

Browse files
committed
Upgraded the solution to dotnetcore2
1 parent 2d74ac0 commit 546d4b0

File tree

18 files changed

+182
-285
lines changed

18 files changed

+182
-285
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ obj/
1111
*.crunchproject.local.xml
1212
*.crunchsolution.local.xml
1313
*.cache
14+
*.userprefs
15+
.DS_Store
1416
packages/*
1517
PackageBuild/*
1618
Build/*
@@ -23,4 +25,5 @@ src/.vs/
2325
project.lock.json
2426
tools/Cake/
2527
tools/GitReleaseNotes/
28+
tools/gitversion.commandline/
2629
artifacts/

build.cake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#tool "nuget:?package=GitReleaseNotes"
2+
#tool "nuget:?package=GitVersion.CommandLine"
23

34
var target = Argument("target", "Default");
4-
var bddfyProj = "./src/TestStack.BDDfy/project.json";
5+
var bddfyProj = "./src/TestStack.BDDfy/TestStack.BDDfy.csproj";
56
var outputDir = "./artifacts/";
67

78
Task("Clean")

src/Samples/TestStack.BDDfy.Samples/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
5+
<AssemblyName>TestStack.BDDfy.Samples</AssemblyName>
6+
<PackageId>TestStack.BDDfy.Samples</PackageId>
7+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8+
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="../../TestStack.BDDfy/TestStack.BDDfy.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
20+
<PackageReference Include="shouldly" Version="3.0.0-beta0003" />
21+
<PackageReference Include="xunit" Version="2.3.1" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
25+
<PackageReference Include="System.Linq" Version="4.3.0" />
26+
</ItemGroup>
27+
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
29+
<DefineConstants>$(DefineConstants);Approvals;Culture;NSubstitute</DefineConstants>
30+
</PropertyGroup>
31+
32+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
33+
<Reference Include="System" />
34+
<Reference Include="Microsoft.CSharp" />
35+
</ItemGroup>
36+
37+
</Project>

src/Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.xproj

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

src/Samples/TestStack.BDDfy.Samples/project.json

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

src/TestStack.BDDfy.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
5+
<AssemblyName>TestStack.BDDfy.Tests</AssemblyName>
6+
<PackageId>TestStack.BDDfy.Tests</PackageId>
7+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8+
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="../TestStack.BDDfy/TestStack.BDDfy.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
20+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
21+
<PackageReference Include="nsubstitute" Version="3.1.0" />
22+
<PackageReference Include="shouldly" Version="3.0.0-beta0003" />
23+
<PackageReference Include="xunit" Version="2.3.1" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
27+
<PackageReference Include="System.Linq" Version="4.3.0" />
28+
</ItemGroup>
29+
30+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
31+
<DefineConstants>$(DefineConstants);Approvals;Culture</DefineConstants>
32+
</PropertyGroup>
33+
34+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
35+
<Reference Include="System" />
36+
<Reference Include="Microsoft.CSharp" />
37+
</ItemGroup>
38+
39+
</Project>

src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.xproj

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

src/TestStack.BDDfy.Tests/project.json

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

0 commit comments

Comments
 (0)