Should be able to build netstandard2.0

mausch · Apr 28, 2018 · d7f8966 · d7f8966
1 parent 7baeb58
commit d7f8966
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/Fuchu.FsCheck/Fuchu.FsCheck.fsproj b/Fuchu.FsCheck/Fuchu.FsCheck.fsproj
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>Fuchu.FsCheck</RootNamespace>
     <AssemblyName>Fuchu.FsCheck</AssemblyName>
     <Name>Fuchu.FsCheck</Name>
     <Authors>Mauricio Scheffer</Authors>
     <Description>Integrates Fuchu with FsCheck</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

diff --git a/Fuchu.MbUnit/Fuchu.MbUnit.fsproj b/Fuchu.MbUnit/Fuchu.MbUnit.fsproj
@@ -9,6 +9,8 @@
     <Authors>Mauricio Scheffer</Authors>
     <Description>Converts Fuchu tests to MbUnit tests</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

diff --git a/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj b/Fuchu.PerfUtil/Fuchu.PerfUtil.fsproj
@@ -10,6 +10,8 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Authors>Henrik Feldt</Authors>
     <Description>Integrates Fuchu with PerfUtil</Description>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

diff --git a/Fuchu/Fuchu.fs b/Fuchu/Fuchu.fs
@@ -36,7 +36,7 @@ module Helpers =
     /// Print to Console and Trace
     let tprintf fmt = 
         Printf.kprintf (fun s -> 
-                            System.Diagnostics.Trace.Write s
+                            //System.Diagnostics.Trace.Write s
                             Console.Write s) fmt
 
     open System.Text.RegularExpressions

diff --git a/Fuchu/Fuchu.fsproj b/Fuchu/Fuchu.fsproj
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>Fuchu</RootNamespace>
     <AssemblyName>Fuchu</AssemblyName>
     <Name>Fuchu</Name>
     <Authors>Mauricio Scheffer</Authors>
     <Description>Functional test library</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

diff --git a/build.fsx b/build.fsx
@@ -4,7 +4,6 @@
 
 open System
 open Fake
-open Fake.ProcessHelper
 open Fake.AssemblyInfoFile
 
 let version = "1.0.3.0"
@@ -16,9 +15,14 @@ type Package = {
     Description: string
     Sign: bool
 }
+let vsProjProps = [
+     ("VersionSuffix", "")
+     ("VersionPrefix", version)
+]
+
 module Pkg=
   let build (pkg:Package) = 
-    MSBuildRelease null "pack" ["./"+pkg.Name]
+    MSBuildReleaseExt null vsProjProps "pack" ["./"+pkg.Name]
     |> Log "Package-Output: "
 
 let packages =