Merge pull request #8 from panesofglass/netstandard2.0

panesofglass · web-flow · commit 90e6c31f0ac9 · 2018-09-06T08:59:31.000-05:00
Update to netstandard2.0
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,34 @@
+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 test tests/Freya.Core.Tests/Freya.Core.Tests.fsproj -c Release 
+  - dotnet test tests/Freya.Core.Hopac.Tests/Freya.Core.Hopac.Tests.fsproj -c Release 
+  - dotnet pack -c Release --include-symbols
+  - dotnet tests/Freya.Core.Benchmarks/bin/Release/netcoreapp2.0/Freya.Core.Benchmarks.dll
+
+branches:
+  except:
+    - gh-pages
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,7 +7,7 @@ build_script:
   - ps: dotnet test -c Release tests\Freya.Core.Tests\Freya.Core.Tests.fsproj
   - ps: dotnet test -c Release tests\Freya.Core.Hopac.Tests\Freya.Core.Hopac.Tests.fsproj
   - ps: dotnet pack -c Release --include-symbols --version-suffix "aci-${env:APPVEYOR_BUILD_NUMBER}"
-  - ps: dotnet .\tests\Freya.Core.Benchmarks\bin\Release\netcoreapp1.1\Freya.Core.Benchmarks.dll
+  - ps: dotnet .\tests\Freya.Core.Benchmarks\bin\Release\netcoreapp2.0\Freya.Core.Benchmarks.dll
 
 test: off
 
diff --git a/global.json b/global.json
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -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>
diff --git a/src/Freya.Core.Common.targets b/src/Freya.Core.Common.targets
@@ -1,14 +1,12 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <StructFreya>false</StructFreya>
     <DefineConstants Condition="'$(StructFreya)' == 'true'">$(DefineConstants);STRUCT</DefineConstants>
     <DefineConstants Condition="'$(Hopac)' == 'true'">$(DefineConstants);HOPAC</DefineConstants>
   </PropertyGroup>
 
-  <Import Project="..\nuget.props" />
-
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Freya.Core\Prelude.fs" />
     <Compile Include="$(MSBuildThisFileDirectory)Freya.Core\Core.fs" />
@@ -22,8 +20,6 @@
   </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>
 
diff --git a/src/Freya.Core.Hopac/Freya.Core.Hopac.fsproj b/src/Freya.Core.Hopac/Freya.Core.Hopac.fsproj
@@ -1,4 +1,4 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Hopac>true</Hopac>
   </PropertyGroup>
diff --git a/src/Freya.Core/Freya.Core.fsproj b/src/Freya.Core/Freya.Core.fsproj
@@ -1,3 +1,3 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Freya.Core.Common.targets" />
 </Project>
diff --git a/tests/Freya.Core.Benchmarks/Freya.Core.Benchmarks.fsproj b/tests/Freya.Core.Benchmarks/Freya.Core.Benchmarks.fsproj
@@ -1,8 +1,8 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <DebugType>none</DebugType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
@@ -17,8 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.NET.Sdk" Version="1.*" PrivateAssets="All" />
-    <PackageReference Include="FSharp.Core" Version="4.*" />
     <PackageReference Include="BenchmarkDotNet" Version="0.10.*" />
     <!--PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.10.2" /-->
   </ItemGroup>
diff --git a/tests/Freya.Core.Hopac.Tests/Freya.Core.Hopac.Tests.fsproj b/tests/Freya.Core.Hopac.Tests/Freya.Core.Hopac.Tests.fsproj
@@ -1,4 +1,4 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Hopac>true</Hopac>
   </PropertyGroup>
diff --git a/tests/Freya.Core.Tests.Common.targets b/tests/Freya.Core.Tests.Common.targets
@@ -1,25 +1,22 @@
 <Project>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <DefineConstants Condition="'$(Hopac)' == 'true'">$(DefineConstants);HOPAC</DefineConstants>
     <ServerGarbageCollection Condition="'$(Hopac)' == 'true'">true</ServerGarbageCollection>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Freya.Core.Tests\Core.Tests.fs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Freya.Core.Tests\Program.fs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.NET.Sdk" Version="1.*" PrivateAssets="All" />
-    <PackageReference Include="FSharp.Core" Version="4.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
-    <PackageReference Include="xunit" Version="2.2.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.*" />
-    <PackageReference Include="Unquote" Version="3.*" />
-    <PackageReference Include="FsCheck.Xunit" Version="2.*" />
-    <PackageReference Include="FsCheck" Version="2.*" />
+    <PackageReference Include="xunit" Version="2.3.*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.*" />
+    <PackageReference Include="Unquote" Version="4.*" />
+    <PackageReference Include="FsCheck.Xunit" Version="3.0.0-*" />
+    <PackageReference Include="FsCheck" Version="3.0.0-*" />
   </ItemGroup>
 </Project>
diff --git a/tests/Freya.Core.Tests/Freya.Core.Tests.fsproj b/tests/Freya.Core.Tests/Freya.Core.Tests.fsproj
@@ -1,4 +1,4 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Freya.Core.Tests.Common.targets" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Freya.Core\Freya.Core.fsproj" />
diff --git a/tests/Freya.Core.Tests/Program.fs b/tests/Freya.Core.Tests/Program.fs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<Hopac>true</Hopac>`
`4`	`4`	`</PropertyGroup>`