From 6cadb6d84eafdbed81aa3368f2d281df47626784 Mon Sep 17 00:00:00 2001 From: Tomasz Heimowski Date: Tue, 12 Apr 2016 11:13:37 +0200 Subject: [PATCH] results of running 'paket remove nuget NuGet.CommandLine group Build' --- examples/Example/Example.fsproj | 2 +- examples/WebSocket/WebSocket.fsproj | 2 +- paket-files/examples/haf/YoLo/YoLo.fs | 34 +++- paket-files/examples/haf/YoLo/paket.version | 2 +- paket.dependencies | 3 +- paket.lock | 201 ++++++++++---------- src/Suave.Testing/Suave.Testing.fsproj | 11 -- src/Suave/Suave.fsproj | 2 +- 8 files changed, 138 insertions(+), 119 deletions(-) diff --git a/examples/Example/Example.fsproj b/examples/Example/Example.fsproj index 3d30aac4..a5f05d61 100644 --- a/examples/Example/Example.fsproj +++ b/examples/Example/Example.fsproj @@ -52,7 +52,7 @@ True - paket-files\YoLo.fs + paket-files/YoLo.fs diff --git a/examples/WebSocket/WebSocket.fsproj b/examples/WebSocket/WebSocket.fsproj index 2e0adf11..c703d18f 100644 --- a/examples/WebSocket/WebSocket.fsproj +++ b/examples/WebSocket/WebSocket.fsproj @@ -42,7 +42,7 @@ True - paket-files\YoLo.fs + paket-files/YoLo.fs diff --git a/paket-files/examples/haf/YoLo/YoLo.fs b/paket-files/examples/haf/YoLo/YoLo.fs index 1a16f6e2..18f2c595 100644 --- a/paket-files/examples/haf/YoLo/YoLo.fs +++ b/paket-files/examples/haf/YoLo/YoLo.fs @@ -1,5 +1,5 @@ [] -module internal Suave.Utils.YoLo +module internal YoLo #nowarn "64" @@ -68,7 +68,7 @@ module Choice = let injectSnd f = function | Choice1Of2 x -> Choice1Of2 x - | Choice2Of2 x -> f x; Choice1Of2 x + | Choice2Of2 x -> f x; Choice2Of2 x module Operators = @@ -192,11 +192,19 @@ module String = /// Also, invariant culture let equals (a : string) (b : string) = +#if DNXCORE50 + (CultureInfo.InvariantCulture.CompareInfo.GetStringComparer(CompareOptions.None)).Equals(a, b) +#else a.Equals(b, StringComparison.InvariantCulture) +#endif /// Also, invariant culture let equalsCaseInsensitve (a : string) (b : string) = +#if DNXCORE50 + (CultureInfo.InvariantCulture.CompareInfo.GetStringComparer(CompareOptions.IgnoreCase)).Equals(a, b) +#else a.Equals(b, StringComparison.InvariantCultureIgnoreCase) +#endif /// Compare ordinally with ignore case. let equalsOrdinalCI (str1 : string) (str2 : string) = @@ -258,20 +266,32 @@ module Bytes = sha.ComputeHash ms let sha1 = +#if DNXCORE50 + hash (SHA1.Create()) +#else hash (new SHA1Managed()) +#endif let sha256 = +#if DNXCORE50 + hash (SHA256.Create()) +#else hash (new SHA256Managed()) +#endif let sha512 = +#if DNXCORE50 + hash (SHA512.Create()) +#else hash (new SHA512Managed()) +#endif let toHex (bs : byte[]) = BitConverter.ToString bs |> String.replace "-" "" |> String.toLowerInvariant - let fromHex (digestString : string) = + let ofHex (digestString : string) = Enumerable.Range(0, digestString.Length) .Where(fun x -> x % 2 = 0) .Select(fun x -> Convert.ToByte(digestString.Substring(x, 2), 16)) @@ -591,13 +611,21 @@ module App = /// Gets the calling assembly's informational version number as a string let getVersion () = +#if DNXCORE50 + (typeof.GetTypeInfo().Assembly) +#else Assembly.GetCallingAssembly() +#endif .GetCustomAttribute() .InformationalVersion /// Get the assembly resource let resource name = +#if DNXCORE50 + let assembly = typeof.GetTypeInfo().Assembly +#else let assembly = Assembly.GetExecutingAssembly () +#endif use stream = assembly.GetManifestResourceStream name if stream = null then assembly.GetManifestResourceNames() diff --git a/paket-files/examples/haf/YoLo/paket.version b/paket-files/examples/haf/YoLo/paket.version index 656f313a..0884ec7c 100644 --- a/paket-files/examples/haf/YoLo/paket.version +++ b/paket-files/examples/haf/YoLo/paket.version @@ -1 +1 @@ -0d120146e4c558b1b7cb1763161dcf33e31de22b +12b17ed0840b1a915ef7efa4db341d9a6477117a diff --git a/paket.dependencies b/paket.dependencies index d7b6f497..0df20042 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -10,7 +10,6 @@ github haf/YoLo YoLo.fs group Build source https://nuget.org/api/v2 - nuget NuGet.CommandLine group Tests framework: NET45 @@ -39,4 +38,4 @@ group Docs source https://nuget.org/api/v2 nuget FSharp.Core ~> 4 nuget FsLibTool - nuget Argu + nuget Argu \ No newline at end of file diff --git a/paket.lock b/paket.lock index 5b52c90b..4b3a8231 100644 --- a/paket.lock +++ b/paket.lock @@ -1,27 +1,24 @@ FRAMEWORK: NET45 NUGET - remote: https://nuget.org/api/v2 + remote: https://www.nuget.org/api/v2 specs: - DotLiquid (1.8.0) + DotLiquid (1.8) FSharp.Core (3.1.2.5) Microsoft.AspNet.Razor (3.2.3) openssl.redist (1.0.1.25) RazorEngine (3.7.5) - Microsoft.AspNet.Razor (>= 3.0.0) + Microsoft.AspNet.Razor (>= 3.0) GITHUB remote: haf/YoLo specs: YoLo.fs (0d120146e4c558b1b7cb1763161dcf33e31de22b) GROUP Build -NUGET - remote: https://nuget.org/api/v2 - specs: - NuGet.CommandLine (3.3.0) + GROUP Docs FRAMEWORK: NET45 NUGET - remote: https://nuget.org/api/v2 + remote: https://www.nuget.org/api/v2 specs: Argu (1.1.3) FSharp.Core (4.0.0.1) @@ -34,91 +31,97 @@ NUGET GROUP Examples FRAMEWORK: NET45 NUGET - remote: https://nuget.org/api/v2 + remote: https://www.nuget.org/api/v2 specs: - Aether (8.0.2) - Arachne.Core (3.0.0-b078) - FParsec (>= 1.0.0 < 2.0.0) - Arachne.Http (3.0.0-b078) - Arachne.Core (>= 3.0.0-b078) - Arachne.Language (>= 3.0.0-b078) - Arachne.Uri (>= 3.0.0-b078) - FParsec (>= 1.0.0 < 2.0.0) - Arachne.Http.Cors (3.0.0-b078) - Arachne.Core (>= 3.0.0-b078) - Arachne.Http (>= 3.0.0-b078) - Arachne.Uri (>= 3.0.0-b078) - FParsec (>= 1.0.0 < 2.0.0) - Arachne.Language (3.0.0-b078) - Arachne.Core (>= 3.0.0-b078) - FParsec (>= 1.0.0 < 2.0.0) - Arachne.Uri (3.0.0-b078) - Arachne.Core (>= 3.0.0-b078) - FParsec (>= 1.0.0 < 2.0.0) - Arachne.Uri.Template (3.0.0-b078) - Arachne.Core (>= 3.0.0-b078) - Arachne.Uri (>= 3.0.0-b078) - FParsec (>= 1.0.0 < 2.0.0) + Aether (8.1.2) + Arachne.Core (3.0) + FParsec (>= 1.0 < 2.0) + Arachne.Http (3.0) + Arachne.Core (>= 3.0) + Arachne.Language (>= 3.0) + Arachne.Uri (>= 3.0) + FParsec (>= 1.0 < 2.0) + Arachne.Http.Cors (3.0) + Arachne.Core (>= 3.0) + Arachne.Http (>= 3.0) + Arachne.Language (>= 3.0) + Arachne.Uri (>= 3.0) + FParsec (>= 1.0 < 2.0) + Arachne.Language (3.0) + Arachne.Core (>= 3.0) + FParsec (>= 1.0 < 2.0) + Arachne.Uri (3.0) + Arachne.Core (>= 3.0) + FParsec (>= 1.0 < 2.0) + Arachne.Uri.Template (3.0) + Arachne.Core (>= 3.0) + Arachne.Uri (>= 3.0) + FParsec (>= 1.0 < 2.0) FParsec (1.0.2) - Freya (3.0.0-b264) - Freya.Core (>= 3.0.0-b264) - Freya.Lenses.Http (>= 3.0.0-b264) - Freya.Lenses.Http.Cors (>= 3.0.0-b264) - Freya.Machine (>= 3.0.0-b264) - Freya.Machine.Extensions.Http (>= 3.0.0-b264) - Freya.Machine.Extensions.Http.Cors (>= 3.0.0-b264) - Freya.Machine.Router (>= 3.0.0-b264) - Freya.Recorder (>= 3.0.0-b264) - Freya.Router (>= 3.0.0-b264) - Freya.Core (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Freya.Lenses.Http (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Arachne.Http (>= 3.0.0-b078) - Freya.Core (>= 3.0.0-b264) - Freya.Lenses.Http.Cors (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Arachne.Http.Cors (>= 3.0.0-b078) - Freya.Core (>= 3.0.0-b264) - Freya.Lenses.Http (>= 3.0.0-b264) - Freya.Machine (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Freya.Core (>= 3.0.0-b264) - Freya.Recorder (>= 3.0.0-b264) - Hekate (>= 2.0.1 < 3.0.0) - Freya.Machine.Extensions.Http (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Arachne.Http (>= 3.0.0-b078) - Freya.Core (>= 3.0.0-b264) - Freya.Lenses.Http (>= 3.0.0-b264) - Freya.Machine (>= 3.0.0-b264) - Freya.Machine.Extensions.Http.Cors (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Arachne.Http.Cors (>= 3.0.0-b078) - Freya.Core (>= 3.0.0-b264) - Freya.Lenses.Http (>= 3.0.0-b264) - Freya.Lenses.Http.Cors (>= 3.0.0-b264) - Freya.Machine (>= 3.0.0-b264) - Freya.Machine.Extensions.Http (>= 3.0.0-b264) - Freya.Machine.Router (3.0.0-b264) - Arachne.Http (>= 3.0.0-b078) - Arachne.Uri.Template (>= 3.0.0-b078) - Freya.Core (>= 3.0.0-b264) - Freya.Router (>= 3.0.0-b264) - Freya.Recorder (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Freya.Core (>= 3.0.0-b264) - Freya.Router (3.0.0-b264) - Aether (>= 8.0.2 < 9.0.0) - Arachne.Http (>= 3.0.0-b078) - Arachne.Uri.Template (>= 3.0.0-b078) - Freya.Core (>= 3.0.0-b264) - Freya.Lenses.Http (>= 3.0.0-b264) - Freya.Recorder (>= 3.0.0-b264) - Hekate (>= 2.0.1 < 3.0.0) + Freya (3.0.0-b300) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http (>= 3.0.0-b300) + Freya.Lenses.Http.Cors (>= 3.0.0-b300) + Freya.Machine (>= 3.0.0-b300) + Freya.Machine.Extensions.Http (>= 3.0.0-b300) + Freya.Machine.Extensions.Http.Cors (>= 3.0.0-b300) + Freya.Machine.Router (>= 3.0.0-b300) + Freya.Recorder (>= 3.0.0-b300) + Freya.Router (>= 3.0.0-b300) + Freya.Core (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Freya.Lenses.Http (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Arachne.Http (>= 3.0) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http.Cors (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Arachne.Http.Cors (>= 3.0) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http (>= 3.0.0-b300) + Freya.Machine (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Freya.Core (>= 3.0.0-b300) + Freya.Recorder (>= 3.0.0-b300) + Hekate (>= 3.0 < 4.0) + Freya.Machine.Extensions.Http (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Arachne.Http (>= 3.0) + Arachne.Language (>= 3.0) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http (>= 3.0.0-b300) + Freya.Machine (>= 3.0.0-b300) + Freya.Recorder (>= 3.0.0-b300) + Freya.Machine.Extensions.Http.Cors (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Arachne.Http.Cors (>= 3.0) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http (>= 3.0.0-b300) + Freya.Lenses.Http.Cors (>= 3.0.0-b300) + Freya.Machine (>= 3.0.0-b300) + Freya.Machine.Extensions.Http (>= 3.0.0-b300) + Freya.Recorder (>= 3.0.0-b300) + Freya.Machine.Router (3.0.0-b300) + Arachne.Http (>= 3.0) + Arachne.Uri.Template (>= 3.0) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http (>= 3.0.0-b300) + Freya.Recorder (>= 3.0.0-b300) + Freya.Router (>= 3.0.0-b300) + Freya.Recorder (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Freya.Core (>= 3.0.0-b300) + Freya.Router (3.0.0-b300) + Aether (>= 8.1 < 9.0) + Arachne.Http (>= 3.0) + Arachne.Uri.Template (>= 3.0) + Freya.Core (>= 3.0.0-b300) + Freya.Lenses.Http (>= 3.0.0-b300) + Freya.Recorder (>= 3.0.0-b300) + Hekate (>= 3.0 < 4.0) FSharp.Core (4.0.0.1) - Hekate (2.0.1) - Aether (>= 8.0.2 < 9.0.0) + Hekate (3.2) + Aether (>= 8.0.2 < 9.0) Microsoft.Owin (3.0.1) Owin (>= 1.0) Microsoft.Owin.Hosting (3.0.1) @@ -130,32 +133,32 @@ NUGET Owin (>= 1.0) Owin (1.0) Topshelf (3.3.1) - Topshelf.FSharp (2.1.0) - Topshelf (>= 3.2.0) + Topshelf.FSharp (2.1) + Topshelf (>= 3.2) GITHUB remote: haf/YoLo specs: - YoLo.fs (0d120146e4c558b1b7cb1763161dcf33e31de22b) + YoLo.fs (12b17ed0840b1a915ef7efa4db341d9a6477117a) GROUP Tests FRAMEWORK: NET45 NUGET - remote: https://nuget.org/api/v2 + remote: https://www.nuget.org/api/v2 specs: - FsCheck (2.1.0) + FsCheck (2.1) FSharp.Core (>= 3.1.2.5) FSharp.Charting (0.90.13) FSharp.Core (3.1.2.5) Fuchu (1.0.2) FSharp.Core (>= 3.1.2.1) Fuchu.FsCheck (1.0.1) - FsCheck (>= 2.1.0) + FsCheck (>= 2.1) FSharp.Core (>= 3.1.2.5) - Fuchu (>= 1.0.1.0) + Fuchu (>= 1.0.1) Fuchu.PerfUtil (1.0.2) FSharp.Core (>= 3.1.2.1) - Fuchu (>= 1.0.2.0) + Fuchu (>= 1.0.2) PerfUtil (>= 0.1.8) - Http.fs-prerelease (2.4.0) + Http.fs-prerelease (2.4) FSharp.Core (>= 3.1.2.1) PerfUtil (0.1.8) WebSocketSharp (1.0.3-rc9) diff --git a/src/Suave.Testing/Suave.Testing.fsproj b/src/Suave.Testing/Suave.Testing.fsproj index 69b91a7e..93c4e95c 100644 --- a/src/Suave.Testing/Suave.Testing.fsproj +++ b/src/Suave.Testing/Suave.Testing.fsproj @@ -102,17 +102,6 @@ - - - - - ..\..\packages\tests\FSharp.Core\lib\net40\FSharp.Core.dll - True - True - - - - diff --git a/src/Suave/Suave.fsproj b/src/Suave/Suave.fsproj index e29f764d..c154fc8d 100644 --- a/src/Suave/Suave.fsproj +++ b/src/Suave/Suave.fsproj @@ -81,7 +81,7 @@ True - Utils\YoLo.fs + Utils/YoLo.fs