Update to .NET Standard 2.0

Build.fsx

@@ -1,37 +1,40 @@
-#r @"packages/FAKE.4.11.3/tools/FakeLib.dll"
-
-open Fake
-open Fake.Testing
-
-Target "Clean" (fun _ ->
-    directExec (fun info ->
-        info.FileName <- "git"
-        info.Arguments <- "clean -xdf")
-    |> ignore)
-
-Target "Build" (fun _ ->
-    !! "Numsense.sln"
-    |> MSBuildRelease "" "Rebuild"
-    |> ignore)
-
-Target "Test" (fun _ ->
-    !! "*/bin/Release/*Ploeh.*.*Tests*.dll"
-    |> xUnit2 (fun p -> { p with Parallel = ParallelMode.All }))
-
-Target "PackageNuGet" (fun _ ->
-    let version = GetAssemblyVersion "Numsense/bin/Release/Ploeh.Numsense.dll"
-    let semVerString (v : System.Version) =
-        sprintf "%i.%i.%i" v.Major v.Minor v.Build
-
-    NuGet (fun p ->
-        { p with
-            Version = semVerString version
-            WorkingDir = "."
-            OutputPath = "."}) "Numsense.nuspec")
+#r @"packages/FAKE.5.16.0/tools/FakeLib.dll"
+
+open System
+open System.Diagnostics
+open System.IO
+open Fake.Core
+open Fake.DotNet
+open Fake.Tools
+open Fake.Api
+open Fake.DotNet.Testing
+open Fake.IO
+open Fake.Core.TargetOperators
+open Fake.IO.Globbing.Operators
+
+Target.create "Clean" <| fun _ ->
+    let psi = ProcessStartInfo()
+    psi.FileName <- "git"
+    psi.Arguments <- "clean -xdf"
+    psi.UseShellExecute <- true
+
+    Process.Start psi |> ignore
+
+Target.create "Build" <| fun _ ->
+    DotNet.build (fun opts -> {
+        opts with Configuration = DotNet.Release
+    }) "Numsense.sln"
+
+Target.create "Test" <| fun _ ->
+    DotNet.test (fun opts -> { opts with Configuration = DotNet.Release }) "Numsense.sln"
+
+Target.create "CopyNuGetPackage" <| fun _ ->
+     !! "Numsense/bin/Release/*.nupkg"
+    |> Shell.copy "."
 
 "Clean"
 ==> "Build"
 ==> "Test"
-==> "PackageNuGet"
+==> "CopyNuGetPackage"
 
-RunTargetOrDefault "PackageNuGet"
+Target.runOrDefault "CopyNuGetPackage"

Numsense.UnitTests.CSharp/Numsense.UnitTests.CSharp.csproj

@@ -1,100 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5FEBD8A6-3ED8-4E4F-B484-DE4CB77B6034}</ProjectGuid>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Version>1.0.0</Version>
+    <Copyright>Copyright © Mark Seemann 2015</Copyright>
+    <Company />
+    <Authors />
+    <RepositoryUrl>https://github.com/ploeh/Numsense</RepositoryUrl>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Ploeh.Numsense.UnitTests</RootNamespace>
-    <AssemblyName>Ploeh.Numsense.UnitTests.CSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FsCheck, Version=2.2.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FsCheck.2.2.4\lib\net45\FsCheck.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FsCheck.Xunit, Version=2.2.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FsCheck.Xunit.2.2.4\lib\net45\FsCheck.Xunit.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Demo.cs" />
-    <Compile Include="NumeralConverterProperties.cs" />
-    <Compile Include="NumeralTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Numsense\Numsense.fsproj">
-      <Project>{72a79661-f252-4571-a857-268ce356e88a}</Project>
-      <Name>Numsense</Name>
-    </ProjectReference>
+    <PackageReference Include="FsCheck.Xunit" Version="2.14.2" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
+
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <ProjectReference Include="..\Numsense\Numsense.fsproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>