From d390cdd051e0144da4949df1ffe4f479ea561979 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@microsoft.com>
Date: Wed, 20 Mar 2019 22:34:16 +0000
Subject: [PATCH 1/5] update TPSDK and paket targets

---
 .paket/Paket.Restore.targets | 117 +++++++++++++++++++++++++-----
 paket.lock                   | 133 +++++++++++++++--------------------
 2 files changed, 154 insertions(+), 96 deletions(-)

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index 7c6107011..52f41c608 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -17,23 +17,43 @@
     <PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
     <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
     <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
-    <!-- Paket command -->
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
 
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
+    <!-- PaketBootStrapper  -->
+    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
+    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
+    <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
+
+    <!-- Paket -->
+
+    <!-- windows, root => tool => proj style => bootstrapper => global -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(_PaketBootStrapperExeDir)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">paket.exe</PaketExePath>
+
+    <!-- no windows, try native paket as default,  root => tool => proj style => mono paket => bootstrpper => global -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket') ">$(PaketRootPath)paket</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket') ">$(PaketToolsPath)paket</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket</PaketExePath>
+
+    <!-- no windows, try mono paket -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
+
+    <!-- no windows, try bootstrapper -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(PaketBootStrapperExeDir)paket.exe</PaketExePath>
+
+    <!-- no windows, try global native paket -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' ">paket</PaketExePath>
 
     <!-- Paket command -->
     <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
     <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
-    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
-    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(PaketCommand)' == '' ">"$(PaketExePath)"</PaketCommand>
+
 
-    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
-    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
     <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
 
@@ -42,6 +62,9 @@
     <!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md -->
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+
+    <!-- Disable Paket restore under NCrunch build -->
+    <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
   </PropertyGroup>
 
   <Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
@@ -82,7 +105,11 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
+	<!-- 
+		This value should match the version in the props generated by paket 
+		If they differ, this means we need to do a restore in order to ensure correct dependencies
+	-->
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
 
@@ -151,16 +178,19 @@
 
     <ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " >
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
+        <Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
         <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
-        <CopyLocal>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <CopyLocal Condition="'$(Splits)' == '6'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
         <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
-        <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
+        <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
     </ItemGroup>
 
@@ -192,19 +222,27 @@
   <Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
     <PropertyGroup>
       <ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec>
+      <DetectedMSBuildVersion>$(MSBuildVersion)</DetectedMSBuildVersion>
+      <DetectedMSBuildVersion Condition="$(MSBuildVersion) == ''">15.8.0</DetectedMSBuildVersion>
     </PropertyGroup>
   </Target>
 
   <Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
     <ItemGroup>
       <_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
+      <MSBuildMajorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[0])" />
+      <MSBuildMinorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[1])" />
     </ItemGroup>
 
     <PropertyGroup>
       <PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
       <ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
-      <UseNewPack>false</UseNewPack>
-      <UseNewPack Condition=" '$(NuGetToolVersion)' != '4.0.0' ">true</UseNewPack>
+      <UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
+      <UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' > '15' OR ('@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8') ">true</UseMSBuild15_9_Pack>
+      <UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
+      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) ">true</UseMSBuild15_8_Pack>
+      <UseNuGet4_Pack>false</UseNuGet4_Pack>
+      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) ">true</UseNuGet4_Pack>
       <AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</AdjustedNuspecOutputPath>
       <AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(BaseIntermediateOutputPath)</AdjustedNuspecOutputPath>
     </PropertyGroup>
@@ -219,9 +257,52 @@
       <Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
     </ConvertToAbsolutePath>
 
-
     <!-- Call Pack -->
-    <PackTask Condition="$(UseNewPack)"
+    <PackTask Condition="$(UseMSBuild15_9_Pack)"
+              PackItem="$(PackProjectInputFile)"
+              PackageFiles="@(_PackageFiles)"
+              PackageFilesToExclude="@(_PackageFilesToExclude)"
+              PackageVersion="$(PackageVersion)"
+              PackageId="$(PackageId)"
+              Title="$(Title)"
+              Authors="$(Authors)"
+              Description="$(Description)"
+              Copyright="$(Copyright)"
+              RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
+              LicenseUrl="$(PackageLicenseUrl)"
+              ProjectUrl="$(PackageProjectUrl)"
+              IconUrl="$(PackageIconUrl)"
+              ReleaseNotes="$(PackageReleaseNotes)"
+              Tags="$(PackageTags)"
+              DevelopmentDependency="$(DevelopmentDependency)"
+              BuildOutputInPackage="@(_BuildOutputInPackage)"
+              TargetPathsToSymbols="@(_TargetPathsToSymbols)"
+              SymbolPackageFormat="symbols.nupkg"
+              TargetFrameworks="@(_TargetFrameworks)"
+              AssemblyName="$(AssemblyName)"
+              PackageOutputPath="$(PackageOutputAbsolutePath)"
+              IncludeSymbols="$(IncludeSymbols)"
+              IncludeSource="$(IncludeSource)"
+              PackageTypes="$(PackageType)"
+              IsTool="$(IsTool)"
+              RepositoryUrl="$(RepositoryUrl)"
+              RepositoryType="$(RepositoryType)"
+              SourceFiles="@(_SourceFiles->Distinct())"
+              NoPackageAnalysis="$(NoPackageAnalysis)"
+              MinClientVersion="$(MinClientVersion)"
+              Serviceable="$(Serviceable)"
+              FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
+              ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
+              NuspecOutputPath="$(AdjustedNuspecOutputPath)"
+              IncludeBuildOutput="$(IncludeBuildOutput)"
+              BuildOutputFolder="$(BuildOutputTargetFolder)"
+              ContentTargetFolders="$(ContentTargetFolders)"
+              RestoreOutputPath="$(RestoreOutputAbsolutePath)"
+              NuspecFile="$(NuspecFileAbsolutePath)"
+              NuspecBasePath="$(NuspecBasePath)"
+              NuspecProperties="$(NuspecProperties)"/>
+
+    <PackTask Condition="$(UseMSBuild15_8_Pack)"
               PackItem="$(PackProjectInputFile)"
               PackageFiles="@(_PackageFiles)"
               PackageFilesToExclude="@(_PackageFilesToExclude)"
@@ -264,7 +345,7 @@
               NuspecBasePath="$(NuspecBasePath)"
               NuspecProperties="$(NuspecProperties)"/>
 
-    <PackTask Condition="! $(UseNewPack)"
+    <PackTask Condition="$(UseNuGet4_Pack)"
               PackItem="$(PackProjectInputFile)"
               PackageFiles="@(_PackageFiles)"
               PackageFilesToExclude="@(_PackageFilesToExclude)"
diff --git a/paket.lock b/paket.lock
index cd36c0f3b..d14de6371 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,24 +1,24 @@
 RESTRICTION: >= net45
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    FAKE (5.3)
-    Microsoft.NETCore.App (2.1.5)
-    Microsoft.NETCore.Platforms (2.1.1) - restriction: >= net461
+    FAKE (5.8.4)
+    Microsoft.NETCore.App (2.2.3)
+    Microsoft.NETCore.Platforms (2.2) - restriction: >= net461
     NETStandard.Library (2.0.3) - restriction: >= net461
       Microsoft.NETCore.Platforms (>= 1.1)
     NetStandard.Library.NetFramework (2.0.0-preview2-25405-01)
       Microsoft.NETCore.Platforms (>= 2.0.0-preview2-25405-01) - restriction: >= net461
       NETStandard.Library (>= 2.0.0-preview2-25401-01) - restriction: >= net461
-    Nuget.CommandLine (4.7.1)
+    Nuget.CommandLine (4.9.4)
     Octokit (0.32)
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (16fa0088b1cce2f04a126e2febeddd2b8b6e6048)
+    modules/Octokit/Octokit.fsx (22668d1c0dbb43626c4d2abdc13e9614e8c9d04d)
       Octokit (>= 0.20)
   remote: fsprojects/FSharp.TypeProviders.SDK
-    src/ProvidedTypes.fs (330cce283de79ea39a5d4897c48662aa42d61e9d)
-    src/ProvidedTypes.fsi (330cce283de79ea39a5d4897c48662aa42d61e9d)
-    src/ProvidedTypesTesting.fs (330cce283de79ea39a5d4897c48662aa42d61e9d)
+    src/ProvidedTypes.fs (8cc9f9f8ca9b934e1f9d37743bc792dccc91675c)
+    src/ProvidedTypes.fsi (8cc9f9f8ca9b934e1f9d37743bc792dccc91675c)
+    src/ProvidedTypesTesting.fs (8cc9f9f8ca9b934e1f9d37743bc792dccc91675c)
 GROUP fs31
 RESTRICTION: || (== net461) (== netcoreapp2.0)
 NUGET
@@ -59,7 +59,7 @@ NUGET
       System.Threading.Thread (>= 4.0) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       System.Threading.ThreadPool (>= 4.0.10) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       System.Threading.Timer (>= 4.0.1) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
-    Microsoft.NETCore.Platforms (2.1.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp2.0)
+    Microsoft.NETCore.Platforms (2.2) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp2.0)
     Microsoft.NETCore.Targets (2.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
     runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
     runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
@@ -201,8 +201,8 @@ NUGET
       System.Reflection.Extensions (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.Net.Http (4.3.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+    System.Net.Http (4.3.4) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       runtime.native.System (>= 4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       runtime.native.System.Net.Http (>= 4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
@@ -295,13 +295,13 @@ NUGET
       System.Globalization (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Reflection (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.Runtime (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.Runtime.Extensions (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-      System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+    System.Runtime (4.3.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+      Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+    System.Runtime.Extensions (4.3.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+      Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+      System.Runtime (>= 4.3.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
     System.Runtime.Handles (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
@@ -362,8 +362,8 @@ NUGET
       System.Runtime.InteropServices (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
       System.Security.Cryptography.Primitives (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
       System.Text.Encoding (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
-    System.Security.Cryptography.OpenSsl (4.5) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
-      Microsoft.NETCore.Platforms (>= 2.0) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp2.0)
+    System.Security.Cryptography.OpenSsl (4.5.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 2.1.2) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp2.0)
     System.Security.Cryptography.Primitives (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard1.6)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
       System.Globalization (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
@@ -435,51 +435,28 @@ REDIRECTS: ON
 RESTRICTION: || (== net461) (== netcoreapp2.0)
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    FsCheck (2.12)
-      FSharp.Core (>= 4.0.0.1) - restriction: || (== net461) (&& (== netcoreapp2.0) (>= net452)) (&& (== netcoreapp2.0) (< netstandard1.6)) (&& (== netcoreapp2.0) (< portable-net45+win8+wp8))
-      FSharp.Core (>= 4.2.3) - restriction: || (&& (== net461) (< net452) (>= netstandard1.6)) (== netcoreapp2.0)
-      NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net461) (< net452) (>= netstandard1.6)) (== netcoreapp2.0)
-      System.ValueTuple (>= 4.5) - restriction: || (&& (== net461) (< net452) (>= netstandard1.6)) (== netcoreapp2.0)
+    FsCheck (2.13)
+      FSharp.Core (>= 4.2.3)
     FSharp.Charting (2.1)
       FSharp.Core (>= 4.0.0.1)
-    FSharp.Compiler.Service (22.0.3)
+    FSharp.Compiler.Service (25.0.1)
       FSharp.Core (>= 4.1.18)
-      Microsoft.DiaSymReader (>= 1.1)
-      Microsoft.DiaSymReader.PortablePdb (>= 1.2)
-      System.Collections.Immutable (>= 1.3.1)
+      System.Collections.Immutable (>= 1.5)
       System.Diagnostics.Process (>= 4.1) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Diagnostics.TraceSource (>= 4.0) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Reflection.Emit (>= 4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
-      System.Reflection.Metadata (>= 1.4.2)
+      System.Reflection.Metadata (>= 1.6)
       System.Reflection.TypeExtensions (>= 4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Runtime.Loader (>= 4.0) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Security.Cryptography.Algorithms (>= 4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.ValueTuple (>= 4.4) - restriction: || (== net461) (&& (== netcoreapp2.0) (>= net45))
-    FSharp.Core (4.5.2)
-    FsUnit (3.1)
+    FSharp.Core (4.6.2)
+    FsUnit (3.4)
       FSharp.Core (>= 4.2.3)
-      NETStandard.Library (>= 2.0.1) - restriction: || (&& (== net461) (< net46) (>= netstandard2.0)) (== netcoreapp2.0)
-      NUnit (>= 3.9 < 4.0)
-    Microsoft.AspNet.Razor (3.2.6)
-    Microsoft.DiaSymReader (1.3)
-      NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net461) (< net20)) (== netcoreapp2.0)
-    Microsoft.DiaSymReader.PortablePdb (1.5)
-      Microsoft.DiaSymReader (>= 1.3)
-      System.Collections (>= 4.3)
-      System.Collections.Immutable (>= 1.5)
-      System.Diagnostics.Debug (>= 4.3)
-      System.Globalization (>= 4.3)
-      System.IO (>= 4.3)
-      System.Linq (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Reflection.Metadata (>= 1.6)
-      System.Reflection.Primitives (>= 4.3)
-      System.Runtime (>= 4.3)
-      System.Runtime.Extensions (>= 4.3)
-      System.Runtime.InteropServices (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading (>= 4.3)
-    Microsoft.NETCore.Platforms (2.1.1) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net461) (< net46) (>= netstandard2.0)) (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (< netstandard1.0) (>= netstandard2.0)) (&& (== net461) (< netstandard1.3) (>= netstandard2.0)) (&& (== net461) (>= netstandard2.0) (< portable-net45+win8+wpa81)) (&& (== net461) (>= netstandard2.0) (>= uap10.0)) (&& (== net461) (>= netstandard2.0) (>= uap10.1)) (&& (== net461) (>= netstandard2.0) (>= wp8)) (== netcoreapp2.0)
+      NETStandard.Library (>= 2.0.3) - restriction: || (&& (== net461) (< net46) (>= netstandard2.0)) (== netcoreapp2.0)
+      NUnit (>= 3.11 < 4.0)
+    Microsoft.AspNet.Razor (3.2.7)
+    Microsoft.NETCore.Platforms (2.2) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net461) (< net46) (>= netstandard2.0)) (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (< netstandard1.0) (>= netstandard2.0)) (&& (== net461) (< netstandard1.3) (>= netstandard2.0)) (&& (== net461) (>= netstandard2.0) (< portable-net45+win8+wpa81)) (&& (== net461) (>= netstandard2.0) (>= uap10.0)) (&& (== net461) (>= netstandard2.0) (>= wp8)) (== netcoreapp2.0)
     Microsoft.NETCore.Targets (2.1) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
     Microsoft.Win32.Primitives (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
@@ -500,7 +477,7 @@ NUGET
     NUnit.Extension.NUnitProjectLoader (3.6)
     NUnit.Extension.NUnitV2Driver (3.7)
     NUnit.Extension.NUnitV2ResultWriter (3.6)
-    NUnit.Extension.TeamCityEventListener (1.0.4)
+    NUnit.Extension.TeamCityEventListener (1.0.6)
     NUnit.Extension.VSProjectLoader (3.8)
     NUnit.Runners (3.9)
       NUnit.ConsoleRunner (>= 3.9)
@@ -546,7 +523,7 @@ NUGET
     runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
     runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
     runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
-    System.Collections (4.3)
+    System.Collections (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
@@ -562,7 +539,7 @@ NUGET
       System.Threading (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
     System.Collections.Immutable (1.5)
-    System.Diagnostics.Debug (4.3)
+    System.Diagnostics.Debug (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
@@ -602,11 +579,11 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.Globalization (4.3)
+    System.Globalization (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.IO (4.3)
+    System.IO (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
@@ -623,15 +600,15 @@ NUGET
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
     System.IO.FileSystem.Primitives (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
-    System.Linq (4.3)
+    System.Linq (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Collections (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       System.Resources.ResourceManager (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45) (>= netstandard1.6)) (== netcoreapp2.0)
-    System.Memory (4.5.1) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (>= netstandard2.0) (>= uap10.1)) (== netcoreapp2.0)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5)
-    System.Reflection (4.3)
+    System.Memory (4.5.2) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (>= netstandard2.0) (>= uap10.1)) (== netcoreapp2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.2)
+    System.Reflection (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.IO (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
@@ -649,7 +626,7 @@ NUGET
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (< net45)) (== netcoreapp2.0)
     System.Reflection.Metadata (1.6)
       System.Collections.Immutable (>= 1.5)
-    System.Reflection.Primitives (4.3)
+    System.Reflection.Primitives (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
@@ -660,19 +637,19 @@ NUGET
       System.Globalization (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Reflection (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.Runtime (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+    System.Runtime (4.3.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+      Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
     System.Runtime.CompilerServices.Unsafe (4.5.2) - restriction: || (&& (== net461) (>= monoandroid) (>= netstandard2.0)) (&& (== net461) (>= monotouch) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (< netstandard1.1) (>= netstandard2.0)) (&& (== net461) (>= netstandard2.0) (>= uap10.1)) (&& (== net461) (>= netstandard2.0) (>= wpa81)) (&& (== net461) (>= netstandard2.0) (>= xamarinmac)) (&& (== net461) (>= netstandard2.0) (>= xamarintvos)) (&& (== net461) (>= netstandard2.0) (>= xamarinwatchos)) (&& (== net461) (>= xamarinios)) (== netcoreapp2.0)
-    System.Runtime.Extensions (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-      Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-      System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+    System.Runtime.Extensions (4.3.1) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
+      Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+      Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
+      System.Runtime (>= 4.3.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
     System.Runtime.Handles (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
-    System.Runtime.InteropServices (4.3)
+    System.Runtime.InteropServices (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (&& (== net461) (>= netcoreapp1.1)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (&& (== net461) (>= netcoreapp1.1)) (== netcoreapp2.0)
       System.Reflection (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (&& (== net461) (>= netcoreapp1.1)) (== netcoreapp2.0)
@@ -729,7 +706,7 @@ NUGET
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
     System.Security.Principal.Windows (4.5.1) - restriction: || (&& (== net461) (>= monoandroid) (>= netstandard2.0)) (&& (== net461) (>= monotouch) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (>= netstandard2.0) (>= xamarinmac)) (&& (== net461) (>= netstandard2.0) (>= xamarintvos)) (&& (== net461) (>= netstandard2.0) (>= xamarinwatchos)) (&& (== net461) (>= xamarinios)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 2.0) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== netcoreapp2.0)
-    System.Text.Encoding (4.3)
+    System.Text.Encoding (4.3) - restriction: || (&& (== net461) (>= dnxcore50) (>= netstandard2.0)) (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
@@ -738,7 +715,7 @@ NUGET
       Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Text.Encoding (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
-    System.Threading (4.3)
+    System.Threading (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
       System.Runtime (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
       System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net461) (>= dnxcore50)) (&& (== net461) (< net45)) (== netcoreapp2.0)
     System.Threading.Tasks (4.3) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (== netcoreapp2.0)
@@ -752,7 +729,7 @@ NUGET
       System.Runtime.Handles (>= 4.3) - restriction: || (&& (== net461) (< net46)) (== netcoreapp2.0)
     System.ValueTuple (4.5)
   remote: https://ci.appveyor.com/nuget/fsharp-formatting
-    FSharp.Formatting (3.0.0-beta12)
-      FSharp.Compiler.Service (>= 22.0.3 < 23.0)
-      Microsoft.AspNet.Razor (>= 3.2.4 < 4.0)
-      System.ValueTuple (>= 4.4 < 5.0)
+    FSharp.Formatting (3.0.0-beta13)
+      FSharp.Compiler.Service (>= 25.0.1 < 26.0)
+      Microsoft.AspNet.Razor (>= 3.2.6 < 4.0)
+      System.ValueTuple (>= 4.5 < 5.0)

From ab19beade3f8b41917c0e49956dbfa03a8fb04d1 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@microsoft.com>
Date: Wed, 20 Mar 2019 23:35:42 +0000
Subject: [PATCH 2/5] remove use of msbuild toolchain

---
 .travis.yml        | 21 ---------------------
 appveyor.yml       |  5 -----
 build.fsx          | 23 -----------------------
 paket.dependencies |  2 +-
 paket.lock         |  2 +-
 5 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc893756a..ac4fea966 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,27 +12,6 @@ matrix:
     - mono: 5.8.0
       env: USE_DOTNET_CLI=1
       os: osx
-    - mono: 5.8.0
-      env: USE_MSBUILD=1
-      os: linux
-    - mono: 5.8.0
-      env: USE_MSBUILD=1
-      os: osx
-    - mono: 5.10.0
-      env: USE_MSBUILD=1
-      os: linux
-    - mono: 5.10.0
-      env: USE_MSBUILD=1
-      os: osx
-    - mono: latest
-      env: USE_MSBUILD=1
-      os: linux
-    - mono: latest
-      env: USE_MSBUILD=1
-      os: osx
-    - mono: weekly
-      env: USE_MSBUILD=1
-      os: linux
   allow_failures:
     - mono: latest
     - mono: weekly
diff --git a/appveyor.yml b/appveyor.yml
index 4c580d9ba..1134162a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,11 +12,6 @@ build_script:
 matrix:
   fast_finish: true
 
-environment:
-    matrix:
-      - USE_MSBUILD: 1
-      - USE_DOTNET: 1
-  
 test: off
 
 artifacts:
diff --git a/build.fsx b/build.fsx
index 243913e9c..dac1f0758 100644
--- a/build.fsx
+++ b/build.fsx
@@ -47,7 +47,6 @@ let installed =
 
 printfn "Desired .NET SDK version = %s" desiredSdkVersion
 printfn "DotNetCli.isInstalled() = %b" installed
-let useMsBuildToolchain = Environment.environVar "USE_MSBUILD" <> null
 
 let installDesiredVersion () =
   DotNet.install (fun v -> { v with Version = DotNet.Version desiredSdkVersion }) (DotNet.Options.Create ())
@@ -150,15 +149,6 @@ let logResults label lines =
   |> Trace.tracefn "%s:\n\t%s" label
 
 Target.create "Build" <| fun _ ->
- if useMsBuildToolchain then
-    buildProjs |> Seq.iter (fun proj ->
-        DotNet.restore ( fun o -> { o with Common = setSdkPathAndVerbose o.Common }) proj)
-
-    buildProjs |> Seq.iter (fun proj ->
-        let projName = System.IO.Path.GetFileNameWithoutExtension proj
-        MSBuild.runRelease (fun opts -> { opts with Properties = ["SourceLinkCreate", "true"] }) null "Build" [projName]
-        |> logResults (sprintf "%s-Output:" projName))
- else
     // Both flavours of FSharp.Data.DesignTime.dll (net45 and netstandard2.0) must be built _before_ building FSharp.Data
     buildProjs |> Seq.iter (fun proj ->
       DotNet.build (fun opts -> { opts with Common = { opts.Common with DotNetCliPath = getSdkPath ()
@@ -168,23 +158,10 @@ Target.create "Build" <| fun _ ->
 
 Target.create "BuildTests" <| fun _ ->
   for testProj in testProjs do
-    if useMsBuildToolchain then
-        DotNet.restore ( fun o -> { o with Common = setSdkPathAndVerbose o.Common }) testProj
-        MSBuild.runRelease id null "Build" [testProj]
-        |> logResults "BuildTests.DesignTime-Output"
-    else
         DotNet.build (fun o -> { o with Common = setSdkPathAndVerbose o.Common
                                         Configuration = DotNet.BuildConfiguration.Release }) testProj
 
 Target.create "RunTests" <| fun _ ->
- if useMsBuildToolchain then
-       for testName in testNames do
-           !! (sprintf "tests/*/bin/Release/net461/%s.dll" testName)
-           |> NUnit3.run (fun p ->
-               { p with
-                   TimeOut = TimeSpan.FromMinutes 20.
-                   TraceLevel = NUnit3.NUnit3TraceLevel.Info })
- else
     for testProj in testProjs do
         DotNet.test (fun p -> { p with Configuration = DotNet.BuildConfiguration.Release
                                        Common = setSdkPathAndVerbose p.Common }) testProj
diff --git a/paket.dependencies b/paket.dependencies
index a923af537..9b855e819 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,7 +1,7 @@
 framework: >=net45
 source https://api.nuget.org/v3/index.json
 
-nuget FAKE prerelease
+nuget FAKE 5.3
 nuget Nuget.CommandLine
 
 github fsharp/FAKE modules/Octokit/Octokit.fsx
diff --git a/paket.lock b/paket.lock
index d14de6371..b5158dc34 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,7 +1,7 @@
 RESTRICTION: >= net45
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    FAKE (5.8.4)
+    FAKE (5.3)
     Microsoft.NETCore.App (2.2.3)
     Microsoft.NETCore.Platforms (2.2) - restriction: >= net461
     NETStandard.Library (2.0.3) - restriction: >= net461

From fc041894d0633b9f056000106e59cf7bcceed303 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@microsoft.com>
Date: Wed, 20 Mar 2019 23:45:00 +0000
Subject: [PATCH 3/5] update release notes

---
 RELEASE_NOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3687795b1..74e7da585 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 3.0.1 - March 03 2019
+* Fix for excessive memory usage (incorprating latest TPSDK)
+
 #### 3.0.0 - October 14 2018
 * Add GetSchema method in XML type provider.
 

From ef86374cfb40df0152b2b52f1030c28d4ea658f2 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@microsoft.com>
Date: Wed, 20 Mar 2019 23:46:28 +0000
Subject: [PATCH 4/5] update files

---
 src/AssemblyInfo.DesignTime.fs | 8 ++++----
 src/AssemblyInfo.fs            | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/AssemblyInfo.DesignTime.fs b/src/AssemblyInfo.DesignTime.fs
index 8d23b46d9..0fc81adc3 100644
--- a/src/AssemblyInfo.DesignTime.fs
+++ b/src/AssemblyInfo.DesignTime.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.DesignTime")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("3.0.0.0")>]
-[<assembly: AssemblyFileVersionAttribute("3.0.0.0")>]
+[<assembly: AssemblyVersionAttribute("3.0.1.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.0.1.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.DesignTime"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "3.0.0.0"
-    let [<Literal>] AssemblyFileVersion = "3.0.0.0"
+    let [<Literal>] AssemblyVersion = "3.0.1.0"
+    let [<Literal>] AssemblyFileVersion = "3.0.1.0"
diff --git a/src/AssemblyInfo.fs b/src/AssemblyInfo.fs
index f96ee1ee5..369532e1c 100644
--- a/src/AssemblyInfo.fs
+++ b/src/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("3.0.0.0")>]
-[<assembly: AssemblyFileVersionAttribute("3.0.0.0")>]
+[<assembly: AssemblyVersionAttribute("3.0.1.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.0.1.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "3.0.0.0"
-    let [<Literal>] AssemblyFileVersion = "3.0.0.0"
+    let [<Literal>] AssemblyVersion = "3.0.1.0"
+    let [<Literal>] AssemblyFileVersion = "3.0.1.0"

From 811fb0ac35abcb35954dcb07eb5a98bfa683c163 Mon Sep 17 00:00:00 2001
From: Don Syme <dsyme@microsoft.com>
Date: Wed, 20 Mar 2019 23:55:07 +0000
Subject: [PATCH 5/5] help travis by finding path for installed sdk

---
 build.fsx   | 10 ++++++----
 global.json |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.fsx b/build.fsx
index dac1f0758..10fe1afd1 100644
--- a/build.fsx
+++ b/build.fsx
@@ -48,8 +48,8 @@ let installed =
 printfn "Desired .NET SDK version = %s" desiredSdkVersion
 printfn "DotNetCli.isInstalled() = %b" installed
 
-let installDesiredVersion () =
-  DotNet.install (fun v -> { v with Version = DotNet.Version desiredSdkVersion }) (DotNet.Options.Create ())
+let getPathForSdkVersion (sdkVersion) =
+  DotNet.install (fun v -> { v with Version = DotNet.Version sdkVersion }) (DotNet.Options.Create ())
   |> fun o -> o.DotNetCliPath
 
 if installed then
@@ -64,10 +64,12 @@ if installed then
                 printfn "*** You have .NET SDK version '%s' installed, we expect at least version '%s'" installedSdkVersion desiredSdkVersion
         | _ ->
             printfn "*** The .NET SDK version '%s' will be installed (despite the fact that version '%s' is already installed) because we want precisely that version in CI" desiredSdkVersion installedSdkVersion
-            sdkPath <- Some (installDesiredVersion ())
+            sdkPath <- Some (getPathForSdkVersion desiredSdkVersion)
+    else
+        sdkPath <- Some (getPathForSdkVersion installedSdkVersion)
 else
     printfn "*** The .NET SDK version '%s' will be installed (no other version was found by FAKE helpers)" desiredSdkVersion
-    sdkPath <- Some (installDesiredVersion ())
+    sdkPath <- Some (getPathForSdkVersion desiredSdkVersion)
 
 // Read release notes & version info from RELEASE_NOTES.md
 let release = ReleaseNotes.load "RELEASE_NOTES.md"
diff --git a/global.json b/global.json
index 7d2682495..3211e9d7d 100644
--- a/global.json
+++ b/global.json
@@ -1 +1 @@
-{ "sdk": { "version": "2.1.401"} }
\ No newline at end of file
+{ "sdk": { "version": "2.1.403"} }
\ No newline at end of file