Merge pull request #3 from panesofglass/netstandard2.0

Update to netstandard2.0

Author: panesofglass

.travis.yml

@@ -0,0 +1,31 @@
+language: csharp
+
+mono: 5.2.0
+dotnet: 2.0.0
+
+install:
+  - mozroots --import --sync
+  # workaround for missing .net 4.5 targing pack
+  - export FrameworkPathOverride=$(dirname $(which mono))/../lib/mono/4.5/
+
+matrix:
+  include:
+    - os: linux # Ubuntu 14.04
+      dist: trusty
+      sudo: required
+      dotnet: 2.0.0
+    - os: osx # OSX 10.12
+      osx_image: xcode9.1
+      dotnet: 2.0.0
+      dist: trusty
+      sudo: required
+
+script: 
+  - dotnet --info
+  - dotnet restore
+  - dotnet build -c Release
+  - dotnet pack -c Release --include-symbols
+
+branches:
+  except:
+    - gh-pages

global.json

@@ -1,4 +1,5 @@
-<Project>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionPrefix>4.0.0</VersionPrefix>
     <Authors>Andrew Cherry, Ryan Riley, Marcus Griep</Authors>

nuget.props src/Directory.Build.propsnuget.props renamed to src/Directory.Build.props

@@ -1,25 +1,22 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DefineConstants Condition="'$(Hopac)' == 'true'">$(DefineConstants);HOPAC</DefineConstants>
   </PropertyGroup>
-  <Import Project="..\nuget.props" />
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Freya.Testing\Testing.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.NET.Sdk" Version="1.*" PrivateAssets="All" />
-    <PackageReference Include="FSharp.Core" Version="4.1.0" />
     <PackageReference Include="Aether" Version="[8.2.0,9)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <PackageReference Include="Unquote" Version="3.1.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
-    <PackageReference Include="Unquote" Version="3.1.3-alpha-*" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Unquote" Version="4.*" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Hopac)' != 'true'">

src/Freya.Testing.Common.targets

@@ -1,4 +1,4 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Hopac>true</Hopac>
   </PropertyGroup>

src/Freya.Testing.Hopac/Freya.Testing.Hopac.fsproj

@@ -1,3 +1,3 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Freya.Testing.Common.targets" />
 </Project>