diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 0df24f94..aed3c3fd 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -5,6 +5,11 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + $(MSBuildVersion) + 15.0.0 + false + true true $(MSBuildThisFileDirectory) @@ -73,37 +78,47 @@ + + + - + true $(NoWarn);NU1603;NU1604;NU1605;NU1608 + false + true - - - /usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }' - /usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }' + + + + + + + $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) + + + + + + + $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) + $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) + + + + + %(PaketRestoreCachedKeyValue.Value) + %(PaketRestoreCachedKeyValue.Value) - - - - - - - - - - - - - - $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) - $([System.IO.File]::ReadAllText('$(PaketLockFilePath)')) + + true - false + false true @@ -116,7 +131,10 @@ + + + @@ -126,7 +144,7 @@ - + $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached @@ -163,6 +181,7 @@ + @@ -224,8 +243,6 @@ false - $(MSBuildVersion) - 15.8.0 @@ -252,10 +269,12 @@ - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/> + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/> - + + + diff --git a/Fable.Remoting.DotnetClient/Fable.Remoting.DotnetClient.fsproj b/Fable.Remoting.DotnetClient/Fable.Remoting.DotnetClient.fsproj index 5ec4f423..13abda34 100644 --- a/Fable.Remoting.DotnetClient/Fable.Remoting.DotnetClient.fsproj +++ b/Fable.Remoting.DotnetClient/Fable.Remoting.DotnetClient.fsproj @@ -8,7 +8,7 @@ fsharp;fable;remoting;rpc;webserver;json Zaid Ajaj 2.6.0 - net45; net461; netstandard2.0 + net45; net461; netstandard2.0; netcoreapp3.0 true diff --git a/Fable.Remoting.DotnetClient/Http.fs b/Fable.Remoting.DotnetClient/Http.fs index b841937d..2e3e059c 100644 --- a/Fable.Remoting.DotnetClient/Http.fs +++ b/Fable.Remoting.DotnetClient/Http.fs @@ -2,9 +2,6 @@ namespace Fable.Remoting.DotnetClient open System.Net.Http open System.Text -open Newtonsoft.Json.Linq -open Fable.Remoting.Json -open Newtonsoft.Json [] module Http = @@ -34,10 +31,10 @@ module Http = if response.IsSuccessStatusCode then return responseText elif response.StatusCode = System.Net.HttpStatusCode.InternalServerError - then return raise (new ProxyRequestException(response, sprintf "Internal server error (500) while making request to %s" url, responseText)) + then return raise ( ProxyRequestException(response, sprintf "Internal server error (500) while making request to %s" url, responseText)) elif response.StatusCode = System.Net.HttpStatusCode.Unauthorized - then return raise (new ProxyRequestException(response, sprintf "Unauthorized error from the server (401) while making request to %s" url, responseText)) + then return raise ( ProxyRequestException(response, sprintf "Unauthorized error from the server (401) while making request to %s" url, responseText)) elif response.StatusCode = System.Net.HttpStatusCode.Forbidden - then return raise (new ProxyRequestException(response, sprintf "Forbidden error from the server (403) while making request to %s" url, responseText)) - else return raise (new ProxyRequestException(response, sprintf "Http error from server occured while making request to %s" url, responseText)) + then return raise ( ProxyRequestException(response, sprintf "Forbidden error from the server (403) while making request to %s" url, responseText)) + else return raise ( ProxyRequestException(response, sprintf "Http error from server occured while making request to %s" url, responseText)) } \ No newline at end of file diff --git a/Fable.Remoting.DotnetClient/Patterns.fs b/Fable.Remoting.DotnetClient/Patterns.fs index ea409126..4bdad9b3 100644 --- a/Fable.Remoting.DotnetClient/Patterns.fs +++ b/Fable.Remoting.DotnetClient/Patterns.fs @@ -1,9 +1,7 @@ namespace Fable.Remoting.DotnetClient open Quotations.Patterns -open Quotations.DerivedPatterns open FSharp.Reflection -open System.ComponentModel module Patterns = let (| AsyncField |_|) = function diff --git a/Fable.Remoting.Giraffe.Tests/Fable.Remoting.Giraffe.Tests.fsproj b/Fable.Remoting.Giraffe.Tests/Fable.Remoting.Giraffe.Tests.fsproj index e2d3334f..5d095eb7 100644 --- a/Fable.Remoting.Giraffe.Tests/Fable.Remoting.Giraffe.Tests.fsproj +++ b/Fable.Remoting.Giraffe.Tests/Fable.Remoting.Giraffe.Tests.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp3.0 diff --git a/Fable.Remoting.Giraffe/Fable.Remoting.Giraffe.fsproj b/Fable.Remoting.Giraffe/Fable.Remoting.Giraffe.fsproj index 0ad8e1cf..b0dc7e0e 100644 --- a/Fable.Remoting.Giraffe/Fable.Remoting.Giraffe.fsproj +++ b/Fable.Remoting.Giraffe/Fable.Remoting.Giraffe.fsproj @@ -9,7 +9,7 @@ fsharp;fable;remoting;rpc;webserver;giraffe Zaid Ajaj;Diego Esmerio 3.8.0 - netstandard2.0 + netstandard2.0;netcoreapp3.0 true diff --git a/Fable.Remoting.Server.Tests/Fable.Remoting.Server.Tests.fsproj b/Fable.Remoting.Server.Tests/Fable.Remoting.Server.Tests.fsproj index b7c2a5d0..9cddbe93 100644 --- a/Fable.Remoting.Server.Tests/Fable.Remoting.Server.Tests.fsproj +++ b/Fable.Remoting.Server.Tests/Fable.Remoting.Server.Tests.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp3.0 diff --git a/Fable.Remoting.Server/Fable.Remoting.Server.fsproj b/Fable.Remoting.Server/Fable.Remoting.Server.fsproj index 759dfeac..a569a6d8 100644 --- a/Fable.Remoting.Server/Fable.Remoting.Server.fsproj +++ b/Fable.Remoting.Server/Fable.Remoting.Server.fsproj @@ -10,7 +10,7 @@ Zaid Ajaj;Diego Esmerio 4.8.0 true - netstandard2.0;net461 + netstandard2.0;net461;netcoreapp3.0 latest diff --git a/Fable.Remoting.Suave.Tests/Fable.Remoting.Suave.Tests.fsproj b/Fable.Remoting.Suave.Tests/Fable.Remoting.Suave.Tests.fsproj index fdae7540..e53cc38e 100644 --- a/Fable.Remoting.Suave.Tests/Fable.Remoting.Suave.Tests.fsproj +++ b/Fable.Remoting.Suave.Tests/Fable.Remoting.Suave.Tests.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + netcoreapp3.0 diff --git a/Fable.Remoting.Suave/Fable.Remoting.Suave.fsproj b/Fable.Remoting.Suave/Fable.Remoting.Suave.fsproj index 6e107bf4..13f3b876 100644 --- a/Fable.Remoting.Suave/Fable.Remoting.Suave.fsproj +++ b/Fable.Remoting.Suave/Fable.Remoting.Suave.fsproj @@ -10,7 +10,7 @@ Zaid Ajaj;Diego Esmerio 3.9.0 true - netstandard2.0;net461 + netstandard2.0;net461;netcoreapp3.0 latest