From 97bc3407932128f6b55f64dde156d1cae59b7385 Mon Sep 17 00:00:00 2001 From: Eugene Tolmachev Date: Mon, 12 Jul 2021 17:45:23 -0400 Subject: [PATCH] Dependencies upgrade for net5.0 --- .config/dotnet-tools.json | 2 +- AAD.Giraffe/AAD.Giraffe.fsproj | 6 +- AAD.Suave/AAD.Suave.fsproj | 6 +- AAD.Test/AAD.Test.fsproj | 4 +- AAD.Test/TestsCommon.fs | 2 +- AAD.fs.tasks/AAD.fs.tasks.fsproj | 4 +- AAD.fs/AAD.fs.fsproj | 4 +- AAD.tasks.Test/AAD.tasks.Test.fsproj | 5 +- AAD.tasks.Test/TestsCommon.fs | 2 +- RELEASE_NOTES.md | 4 ++ build.fsx.lock | 85 +++++++++------------------- 11 files changed, 49 insertions(+), 75 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 283c613..4f61a56 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fake-cli": { - "version": "5.20.3", + "version": "5.20.4", "commands": [ "fake" ] diff --git a/AAD.Giraffe/AAD.Giraffe.fsproj b/AAD.Giraffe/AAD.Giraffe.fsproj index 6144343..fcb1fb5 100644 --- a/AAD.Giraffe/AAD.Giraffe.fsproj +++ b/AAD.Giraffe/AAD.Giraffe.fsproj @@ -1,6 +1,6 @@  - netstandard2.0 + net5.0 true @@ -12,8 +12,8 @@ - - + + diff --git a/AAD.Suave/AAD.Suave.fsproj b/AAD.Suave/AAD.Suave.fsproj index 7f22bda..d4b08e1 100644 --- a/AAD.Suave/AAD.Suave.fsproj +++ b/AAD.Suave/AAD.Suave.fsproj @@ -1,6 +1,6 @@  - netstandard2.0 + net5.0 true @@ -12,8 +12,8 @@ - + - + \ No newline at end of file diff --git a/AAD.Test/AAD.Test.fsproj b/AAD.Test/AAD.Test.fsproj index 9f13bc0..7877992 100644 --- a/AAD.Test/AAD.Test.fsproj +++ b/AAD.Test/AAD.Test.fsproj @@ -21,7 +21,7 @@ - + @@ -38,6 +38,6 @@ - + diff --git a/AAD.Test/TestsCommon.fs b/AAD.Test/TestsCommon.fs index 24c1809..c532e4b 100644 --- a/AAD.Test/TestsCommon.fs +++ b/AAD.Test/TestsCommon.fs @@ -36,7 +36,7 @@ let oidcConfig = module Http = open System.Net - let waitFor method period url = + let waitFor method (period:int) url = async { use client = new HttpClient() let rec poll sleep = diff --git a/AAD.fs.tasks/AAD.fs.tasks.fsproj b/AAD.fs.tasks/AAD.fs.tasks.fsproj index d468303..d7eef88 100644 --- a/AAD.fs.tasks/AAD.fs.tasks.fsproj +++ b/AAD.fs.tasks/AAD.fs.tasks.fsproj @@ -1,6 +1,6 @@ - netstandard2.0 + net5.0 true TASKS @@ -12,7 +12,7 @@ - + diff --git a/AAD.fs/AAD.fs.fsproj b/AAD.fs/AAD.fs.fsproj index c6caff1..9c8bc27 100644 --- a/AAD.fs/AAD.fs.fsproj +++ b/AAD.fs/AAD.fs.fsproj @@ -1,6 +1,6 @@ - netstandard2.0 + net5.0 true @@ -11,7 +11,7 @@ - + diff --git a/AAD.tasks.Test/AAD.tasks.Test.fsproj b/AAD.tasks.Test/AAD.tasks.Test.fsproj index 033b876..1abc3d5 100644 --- a/AAD.tasks.Test/AAD.tasks.Test.fsproj +++ b/AAD.tasks.Test/AAD.tasks.Test.fsproj @@ -20,14 +20,13 @@ - all runtime; build; native; contentfiles; analyzers - + @@ -36,6 +35,6 @@ - + diff --git a/AAD.tasks.Test/TestsCommon.fs b/AAD.tasks.Test/TestsCommon.fs index 4c8fe5d..7559cd2 100644 --- a/AAD.tasks.Test/TestsCommon.fs +++ b/AAD.tasks.Test/TestsCommon.fs @@ -39,7 +39,7 @@ module Http = open System.Net open FSharp.Control.Tasks.V2.ContextInsensitive - let waitFor method period url = + let waitFor method (period:int) url = task { use client = new HttpClient() let rec poll sleep = diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9b7da4b..70d45fa 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +### 3.0.0 + +* Breaking: dependencies bump and net5.0 target + ### 2.0.0 * Breaking API change: load OIDC configuration on demand and refresh every 24h diff --git a/build.fsx.lock b/build.fsx.lock index 306fe3f..ab97805 100644 --- a/build.fsx.lock +++ b/build.fsx.lock @@ -104,29 +104,33 @@ NUGET FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0) FSharp.Core (4.7.2) - Microsoft.Build (16.9) - Microsoft.Build.Framework (16.9) + Microsoft.Build (16.10) + Microsoft.Build.Framework (16.10) System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (16.9) - Microsoft.Build.Framework (>= 16.9) - Microsoft.Build.Utilities.Core (>= 16.9) + Microsoft.Build.Tasks.Core (16.10) + Microsoft.Build.Framework (>= 16.10) + Microsoft.Build.Utilities.Core (>= 16.10) + Microsoft.NET.StringTools (>= 1.0) Microsoft.Win32.Registry (>= 4.3) System.CodeDom (>= 4.4) System.Collections.Immutable (>= 5.0) System.Reflection.Metadata (>= 1.6) - System.Reflection.TypeExtensions (>= 4.1) System.Resources.Extensions (>= 4.6) - System.Runtime.InteropServices (>= 4.3) System.Security.Cryptography.Pkcs (>= 4.7) System.Security.Cryptography.Xml (>= 4.7) System.Security.Permissions (>= 4.7) System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Utilities.Core (16.9) - Microsoft.Build.Framework (>= 16.9) + Microsoft.Build.Utilities.Core (16.10) + Microsoft.Build.Framework (>= 16.10) + Microsoft.NET.StringTools (>= 1.0) Microsoft.Win32.Registry (>= 4.3) System.Collections.Immutable (>= 5.0) + System.Configuration.ConfigurationManager (>= 4.7) System.Security.Permissions (>= 4.7) System.Text.Encoding.CodePages (>= 4.0.1) + Microsoft.NET.StringTools (1.0) + System.Memory (>= 4.5.4) + System.Runtime.CompilerServices.Unsafe (>= 5.0) Microsoft.NETCore.Platforms (5.0.2) Microsoft.NETCore.Targets (5.0) Microsoft.Win32.Registry (5.0) @@ -135,40 +139,37 @@ NUGET System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (>= 5.0) Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.404) + MSBuild.StructuredLogger (2.1.507) Microsoft.Build (>= 16.4) Microsoft.Build.Framework (>= 16.4) Microsoft.Build.Tasks.Core (>= 16.4) Microsoft.Build.Utilities.Core (>= 16.4) Newtonsoft.Json (13.0.1) - NuGet.Common (5.9.1) - NuGet.Frameworks (>= 5.9.1) - NuGet.Configuration (5.9.1) - NuGet.Common (>= 5.9.1) + NuGet.Common (5.10) + NuGet.Frameworks (>= 5.10) + NuGet.Configuration (5.10) + NuGet.Common (>= 5.10) System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (5.9.1) - NuGet.Packaging (5.9.1) + NuGet.Frameworks (5.10) + NuGet.Packaging (5.10) Newtonsoft.Json (>= 9.0.1) - NuGet.Configuration (>= 5.9.1) - NuGet.Versioning (>= 5.9.1) + NuGet.Configuration (>= 5.10) + NuGet.Versioning (>= 5.10) System.Security.Cryptography.Cng (>= 5.0) System.Security.Cryptography.Pkcs (>= 5.0) - NuGet.Protocol (5.9.1) - NuGet.Packaging (>= 5.9.1) - NuGet.Versioning (5.9.1) + NuGet.Protocol (5.10) + NuGet.Packaging (>= 5.10) + NuGet.Versioning (5.10) System.Buffers (4.5.1) System.CodeDom (5.0) System.Collections.Immutable (5.0) System.Memory (>= 4.5.4) + System.Configuration.ConfigurationManager (5.0) + System.Security.Cryptography.ProtectedData (>= 5.0) + System.Security.Permissions (>= 5.0) System.Formats.Asn1 (5.0) System.Buffers (>= 4.5.1) System.Memory (>= 4.5.4) - System.IO (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) System.Memory (4.5.4) System.Buffers (>= 4.5.1) System.Numerics.Vectors (>= 4.4) @@ -177,36 +178,14 @@ NUGET System.Reactive (5.0) System.Runtime.InteropServices.WindowsRuntime (>= 4.3) System.Threading.Tasks.Extensions (>= 4.5.4) - System.Reflection (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) System.Reflection.Metadata (5.0) System.Collections.Immutable (>= 5.0) - System.Reflection.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Reflection.TypeExtensions (4.7) System.Resources.Extensions (5.0) System.Memory (>= 4.5.4) System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) System.Runtime.CompilerServices.Unsafe (5.0) - System.Runtime.Handles (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Runtime.InteropServices (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) System.Runtime.InteropServices.WindowsRuntime (4.3) System.Runtime (>= 4.3) System.Security.AccessControl (5.0) @@ -226,16 +205,8 @@ NUGET System.Security.Permissions (5.0) System.Security.AccessControl (>= 5.0) System.Security.Principal.Windows (5.0) - System.Text.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Text.Encoding.CodePages (5.0) System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Threading.Tasks (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Threading.Tasks.Dataflow (5.0) System.Threading.Tasks.Extensions (4.5.4) System.Runtime.CompilerServices.Unsafe (>= 4.5.3)