Merge pull request #261 from TestStack/dotnetcore2

Upgrading to dotnetcore 2.0

.gitignore

@@ -11,6 +11,8 @@ obj/
 *.crunchproject.local.xml
 *.crunchsolution.local.xml
 *.cache
+*.userprefs
+.DS_Store
 packages/*
 PackageBuild/*
 Build/*
@@ -20,7 +22,9 @@ _NCrunch_TestStack.BDDfy/
 TestStack.BDDfy.sln.ide/
 src/packages/
 src/.vs/
+.vs/
 project.lock.json
 tools/Cake/
 tools/GitReleaseNotes/
+tools/gitversion.commandline/
 artifacts/

GitVersion.yml

@@ -0,0 +1,5 @@
+mode: ContinuousDelivery
+next-version: 4.1.0
+branches: {}
+ignore:
+  sha: []

appveyor.yml

@@ -8,7 +8,7 @@ configuration:
   - Release
 
 build_script:
-  - ps: .\build.ps1
+  - powershell .\build.ps1
 
 test: off
 skip_tags: true

build.cake

@@ -1,7 +1,8 @@
 #tool "nuget:?package=GitReleaseNotes"
+#tool "nuget:?package=GitVersion.CommandLine"
 
 var target = Argument("target", "Default");
-var bddfyProj = "./src/TestStack.BDDfy/project.json";
+var bddfyProj = "./src/TestStack.BDDfy/TestStack.BDDfy.csproj";
 var outputDir = "./artifacts/";
 
 Task("Clean")
@@ -24,12 +25,7 @@ Task("Version")
             UpdateAssemblyInfo = true,
             OutputType = GitVersionOutput.BuildServer
         });
-        versionInfo = GitVersion(new GitVersionSettings{ OutputType = GitVersionOutput.Json });
-        // Update project.json
-        var updatedProjectJson = System.IO.File.ReadAllText(bddfyProj)
-            .Replace("1.0.0-*", versionInfo.NuGetVersion);
-
-        System.IO.File.WriteAllText(bddfyProj, updatedProjectJson);
+        versionInfo = GitVersion(new GitVersionSettings{ OutputType = GitVersionOutput.Json });        
     });
 
 Task("Build")
@@ -52,6 +48,7 @@ Task("Package")
     .Does(() => {
         var settings = new DotNetCorePackSettings
         {
+            ArgumentCustomization = args=> args.Append(" --include-symbols /p:PackageVersion=" + versionInfo.NuGetVersion),
             OutputDirectory = outputDir,
             NoBuild = true
         };
@@ -61,6 +58,7 @@ Task("Package")
         var releaseNotesExitCode = StartProcess(
             @"tools\GitReleaseNotes\tools\gitreleasenotes.exe", 
             new ProcessSettings { Arguments = ". /o artifacts/releasenotes.md" });
+
         if (string.IsNullOrEmpty(System.IO.File.ReadAllText("./artifacts/releasenotes.md")))
             System.IO.File.WriteAllText("./artifacts/releasenotes.md", "No issues closed since last release");
 

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

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <AssemblyName>TestStack.BDDfy.Samples</AssemblyName>
+    <PackageId>TestStack.BDDfy.Samples</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../../TestStack.BDDfy/TestStack.BDDfy.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
+    <PackageReference Include="shouldly" Version="3.0.0-beta0003" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="System.Linq" Version="4.3.0" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <DefineConstants>$(DefineConstants);Approvals;Culture;NSubstitute</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <AssemblyName>TestStack.BDDfy.Tests</AssemblyName>
+    <PackageId>TestStack.BDDfy.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../TestStack.BDDfy/TestStack.BDDfy.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
+    <PackageReference Include="nsubstitute" Version="3.1.0" />
+    <PackageReference Include="shouldly" Version="3.0.0-beta0003" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+    <PackageReference Include="System.Linq" Version="4.3.0" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <DefineConstants>$(DefineConstants);Approvals;Culture</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>