From f94f63b5f262cef8dcd7b13b3c89b8b5d484ad5b Mon Sep 17 00:00:00 2001 From: Tim Forkmann Date: Wed, 13 Nov 2024 06:51:24 -0500 Subject: [PATCH] Upgrade project to .NET 9.0 and update dependencies --- .config/dotnet-tools.json | 6 +- .paket/Paket.Restore.targets | 9 +- Build.fsproj | 2 +- global.json | 2 +- paket.dependencies | 8 +- paket.lock | 326 +++++++++--------- .../AzureTackle.Shared.fsproj | 2 +- src/AzureTackle/AzureTackle.fsproj | 2 +- src/docs/Docs.fsproj | 2 +- .../AzureTackle.Tests/AzureTackleTests.fsproj | 2 +- 10 files changed, 182 insertions(+), 179 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 695e855..0ff666f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -10,14 +10,14 @@ "rollForward": false }, "fable": { - "version": "4.17.0", + "version": "4.23.0", "commands": [ "fable" ], "rollForward": false }, "paket": { - "version": "8.0.3", + "version": "9.0.0", "commands": [ "paket" ], @@ -38,4 +38,4 @@ "rollForward": false } } -} \ No newline at end of file +} diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index c66062b..712cd77 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -235,14 +235,15 @@ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7]) $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8]) - - %(PaketReferencesFileLinesInfo.PackageVersion) + + %(PaketReferencesFileLinesInfo.PackageVersion) All runtime $(ExcludeAssets);contentFiles @@ -252,6 +253,10 @@ true + + + %(PaketReferencesFileLinesInfo.PackageVersion) + diff --git a/Build.fsproj b/Build.fsproj index fd98d89..5f29585 100644 --- a/Build.fsproj +++ b/Build.fsproj @@ -1,7 +1,7 @@ Exe - net8.0 + net9.0 diff --git a/global.json b/global.json index 3c3254c..58416ce 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.403", + "version": "9.0.100", "rollForward": "latestMinor" } } diff --git a/paket.dependencies b/paket.dependencies index 6cfb778..a4294c6 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source https://api.nuget.org/v3/index.json -framework: net8.0 +framework: net9.0 storage: none nuget Fake.Core.Target @@ -13,21 +13,21 @@ nuget Farmer group AzureTackle storage: none source https://api.nuget.org/v3/index.json - framework: net8.0 + framework: net9.0 nuget FSharp.Core nuget Azure.Data.Tables group Test storage: none source https://api.nuget.org/v3/index.json - framework: net8.0 + framework: net9.0 nuget Expecto nuget Azure.Data.Tables nuget Microsoft.Extensions.Configuration.Json group Docs source https://api.nuget.org/v3/index.json - framework: net8.0 + framework: net9.0 nuget Feliz.Router nuget Zanaptak.TypedCssClasses nuget Fable.SimpleHttp diff --git a/paket.lock b/paket.lock index 6700352..60c4fa6 100644 --- a/paket.lock +++ b/paket.lock @@ -1,108 +1,108 @@ STORAGE: NONE -RESTRICTION: == net8.0 +RESTRICTION: == net9.0 NUGET remote: https://api.nuget.org/v3/index.json BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Fake.Core.CommandLineParsing (6.0) + Fake.Core.CommandLineParsing (6.1.3) FParsec (>= 1.1.1) - FSharp.Core (>= 6.0.3) - Fake.Core.Context (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.Environment (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.FakeVar (6.0) - Fake.Core.Context (>= 6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.Process (6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.FakeVar (>= 6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Trace (>= 6.0) - Fake.IO.FileSystem (>= 6.0) - FSharp.Core (>= 6.0.3) - System.Collections.Immutable (>= 6.0) - Fake.Core.ReleaseNotes (6.0) - Fake.Core.SemVer (>= 6.0) - Fake.Core.String (>= 6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.SemVer (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.String (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.Target (6.0) - Fake.Core.CommandLineParsing (>= 6.0) - Fake.Core.Context (>= 6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.FakeVar (>= 6.0) - Fake.Core.Process (>= 6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Trace (>= 6.0) + FSharp.Core (>= 8.0.301) + Fake.Core.Context (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Environment (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.FakeVar (6.1.3) + Fake.Core.Context (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Process (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + System.Collections.Immutable (>= 8.0) + Fake.Core.ReleaseNotes (6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.SemVer (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.String (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Target (6.1.3) + Fake.Core.CommandLineParsing (>= 6.1.3) + Fake.Core.Context (>= 6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) FSharp.Control.Reactive (>= 5.0.2) - FSharp.Core (>= 6.0.3) - Fake.Core.Tasks (6.0) - Fake.Core.Trace (>= 6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.Trace (6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.FakeVar (>= 6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.UserInput (6.0) - FSharp.Core (>= 6.0.3) - Fake.Core.Xml (6.0) - Fake.Core.String (>= 6.0) - FSharp.Core (>= 6.0.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Tasks (6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Trace (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.FakeVar (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.UserInput (6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Core.Xml (6.1.3) + Fake.Core.String (>= 6.1.3) + FSharp.Core (>= 8.0.301) FAKE.Dotnet (2.0) - Fake.DotNet.Cli (6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.Process (>= 6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Trace (>= 6.0) - Fake.DotNet.MSBuild (>= 6.0) - Fake.DotNet.NuGet (>= 6.0) - Fake.IO.FileSystem (>= 6.0) - FSharp.Core (>= 6.0.3) + Fake.DotNet.Cli (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.DotNet.MSBuild (>= 6.1.3) + Fake.DotNet.NuGet (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) Mono.Posix.NETStandard (>= 1.0) - Newtonsoft.Json (>= 13.0.1) - Fake.DotNet.MSBuild (6.0) + Newtonsoft.Json (>= 13.0.3) + Fake.DotNet.MSBuild (6.1.3) BlackFox.VsWhere (>= 1.1) - Fake.Core.Environment (>= 6.0) - Fake.Core.Process (>= 6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Trace (>= 6.0) - Fake.IO.FileSystem (>= 6.0) - FSharp.Core (>= 6.0.3) - MSBuild.StructuredLogger (>= 2.1.545) - Fake.DotNet.NuGet (6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.Process (>= 6.0) - Fake.Core.SemVer (>= 6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Tasks (>= 6.0) - Fake.Core.Trace (>= 6.0) - Fake.Core.Xml (>= 6.0) - Fake.IO.FileSystem (>= 6.0) - Fake.Net.Http (>= 6.0) - FSharp.Core (>= 6.0.3) - Newtonsoft.Json (>= 13.0.1) - NuGet.Protocol (>= 6.0) - Fake.IO.FileSystem (6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Trace (>= 6.0) - FSharp.Core (>= 6.0.3) - Fake.Net.Http (6.0) - Fake.Core.Trace (>= 6.0) - FSharp.Core (>= 6.0.3) - Fake.Tools.Git (6.0) - Fake.Core.Environment (>= 6.0) - Fake.Core.Process (>= 6.0) - Fake.Core.SemVer (>= 6.0) - Fake.Core.String (>= 6.0) - Fake.Core.Trace (>= 6.0) - Fake.IO.FileSystem (>= 6.0) - FSharp.Core (>= 6.0.3) - Farmer (1.8.11) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + MSBuild.StructuredLogger (>= 2.1.815) + Fake.DotNet.NuGet (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Tasks (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.Core.Xml (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + Fake.Net.Http (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Newtonsoft.Json (>= 13.0.3) + NuGet.Protocol (>= 6.10.1) + Fake.IO.FileSystem (6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Net.Http (6.1.3) + Fake.Core.Trace (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Fake.Tools.Git (6.1.3) + Fake.Core.Environment (>= 6.1.3) + Fake.Core.Process (>= 6.1.3) + Fake.Core.SemVer (>= 6.1.3) + Fake.Core.String (>= 6.1.3) + Fake.Core.Trace (>= 6.1.3) + Fake.IO.FileSystem (>= 6.1.3) + FSharp.Core (>= 8.0.301) + Farmer (1.9.5) FSharp.Core (>= 5.0) System.Text.Json (>= 5.0) FParsec (1.1.1) @@ -110,7 +110,7 @@ NUGET FSharp.Control.Reactive (5.0.5) FSharp.Core (>= 4.7.2) System.Reactive (>= 5.0 < 6.0) - FSharp.Core (8.0.300) + FSharp.Core (9.0.100) Microsoft.Build.Framework (17.10.4) Microsoft.Build.Utilities.Core (17.10.4) Microsoft.Build.Framework (>= 17.10.4) @@ -126,26 +126,27 @@ NUGET Microsoft.Build.Framework (>= 17.5) Microsoft.Build.Utilities.Core (>= 17.5) Newtonsoft.Json (13.0.3) - NuGet.Common (6.10) - NuGet.Frameworks (>= 6.10) - NuGet.Configuration (6.10) - NuGet.Common (>= 6.10) + NuGet.Common (6.12.1) + NuGet.Frameworks (>= 6.12.1) + NuGet.Configuration (6.12.1) + NuGet.Common (>= 6.12.1) System.Security.Cryptography.ProtectedData (>= 4.4) - NuGet.Frameworks (6.10) - NuGet.Packaging (6.10) + NuGet.Frameworks (6.12.1) + NuGet.Packaging (6.12.1) Newtonsoft.Json (>= 13.0.3) - NuGet.Configuration (>= 6.10) - NuGet.Versioning (>= 6.10) + NuGet.Configuration (>= 6.12.1) + NuGet.Versioning (>= 6.12.1) + System.Formats.Asn1 (>= 8.0.1) System.Security.Cryptography.Pkcs (>= 6.0.4) - NuGet.Protocol (6.10) - NuGet.Packaging (>= 6.10) - NuGet.Versioning (6.10) + NuGet.Protocol (6.12.1) + NuGet.Packaging (>= 6.12.1) + NuGet.Versioning (6.12.1) System.Collections.Immutable (8.0) System.Configuration.ConfigurationManager (8.0) System.Diagnostics.EventLog (>= 8.0) System.Security.Cryptography.ProtectedData (>= 8.0) System.Diagnostics.EventLog (8.0) - System.Formats.Asn1 (8.0) + System.Formats.Asn1 (9.0) System.Reactive (5.0) System.Security.AccessControl (6.0.1) System.Security.Cryptography.Pkcs (8.0) @@ -158,28 +159,26 @@ NUGET GROUP AzureTackle STORAGE: NONE -RESTRICTION: == net8.0 +RESTRICTION: == net9.0 NUGET remote: https://api.nuget.org/v3/index.json - Azure.Core (1.40) - Microsoft.Bcl.AsyncInterfaces (>= 1.1.1) - System.ClientModel (>= 1.0) + Azure.Core (1.44.1) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) + System.ClientModel (>= 1.1) System.Diagnostics.DiagnosticSource (>= 6.0.1) - System.Memory.Data (>= 1.0.2) + System.Memory.Data (>= 6.0) System.Numerics.Vectors (>= 4.5) - System.Text.Encodings.Web (>= 4.7.2) - System.Text.Json (>= 4.7.2) + System.Text.Encodings.Web (>= 6.0) + System.Text.Json (>= 6.0.10) System.Threading.Tasks.Extensions (>= 4.5.4) - Azure.Data.Tables (12.8.3) - Azure.Core (>= 1.37) - System.Text.Json (>= 4.7.2) - FSharp.Control.TaskSeq (0.4) - FSharp.Core (>= 6.0.1) - FSharp.Core (8.0.300) + Azure.Data.Tables (12.9.1) + Azure.Core (>= 1.43) + System.Text.Json (>= 6.0.9) + FSharp.Core (9.0.100) Microsoft.Bcl.AsyncInterfaces (8.0) - System.ClientModel (1.0) - System.Memory.Data (>= 1.0.2) - System.Text.Json (>= 4.7.2) + System.ClientModel (1.2.1) + System.Memory.Data (>= 6.0) + System.Text.Json (>= 6.0.10) System.Diagnostics.DiagnosticSource (8.0.1) System.Memory.Data (8.0) System.Text.Json (>= 8.0) @@ -190,7 +189,7 @@ NUGET System.Threading.Tasks.Extensions (4.5.4) GROUP Docs -RESTRICTION: == net8.0 +RESTRICTION: == net9.0 NUGET remote: https://api.nuget.org/v3/index.json Fable.AST (4.5) @@ -223,8 +222,8 @@ NUGET Fable.Elmish (4.2) Fable.Core (>= 3.7.1) FSharp.Core (>= 4.7.2) - Fable.Elmish.Debugger (4.0) - Fable.Elmish (>= 4.0) + Fable.Elmish.Debugger (4.1) + Fable.Elmish (>= 4.2) FSharp.Core (>= 6.0.7) Thoth.Json (>= 6.0) Fable.Elmish.HMR (7.0) @@ -288,55 +287,54 @@ NUGET GROUP Test STORAGE: NONE -RESTRICTION: == net8.0 +RESTRICTION: == net9.0 NUGET remote: https://api.nuget.org/v3/index.json - Azure.Core (1.40) - Microsoft.Bcl.AsyncInterfaces (>= 1.1.1) - System.ClientModel (>= 1.0) + Azure.Core (1.44.1) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) + System.ClientModel (>= 1.1) System.Diagnostics.DiagnosticSource (>= 6.0.1) - System.Memory.Data (>= 1.0.2) + System.Memory.Data (>= 6.0) System.Numerics.Vectors (>= 4.5) - System.Text.Encodings.Web (>= 4.7.2) - System.Text.Json (>= 4.7.2) + System.Text.Encodings.Web (>= 6.0) + System.Text.Json (>= 6.0.10) System.Threading.Tasks.Extensions (>= 4.5.4) - Azure.Data.Tables (12.8.3) - Azure.Core (>= 1.37) - System.Text.Json (>= 4.7.2) + Azure.Data.Tables (12.9.1) + Azure.Core (>= 1.43) + System.Text.Json (>= 6.0.9) Expecto (10.2.1) FSharp.Core (>= 7.0.200) Mono.Cecil (>= 0.11.4 < 1.0) FSharp.Core (8.0.300) Microsoft.Bcl.AsyncInterfaces (8.0) - Microsoft.Extensions.Configuration (8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration.FileExtensions (8.0) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.FileProviders.Physical (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.Configuration.Json (8.0) - Microsoft.Extensions.Configuration (>= 8.0) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0) - Microsoft.Extensions.Configuration.FileExtensions (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - System.Text.Json (>= 8.0) - Microsoft.Extensions.FileProviders.Abstractions (8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.FileProviders.Physical (8.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0) - Microsoft.Extensions.FileSystemGlobbing (>= 8.0) - Microsoft.Extensions.Primitives (>= 8.0) - Microsoft.Extensions.FileSystemGlobbing (8.0) - Microsoft.Extensions.Primitives (8.0) + Microsoft.Extensions.Configuration (9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration.FileExtensions (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Physical (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.Configuration.Json (9.0) + Microsoft.Extensions.Configuration (>= 9.0) + Microsoft.Extensions.Configuration.Abstractions (>= 9.0) + Microsoft.Extensions.Configuration.FileExtensions (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.FileProviders.Abstractions (9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.FileProviders.Physical (9.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 9.0) + Microsoft.Extensions.FileSystemGlobbing (>= 9.0) + Microsoft.Extensions.Primitives (>= 9.0) + Microsoft.Extensions.FileSystemGlobbing (9.0) + Microsoft.Extensions.Primitives (9.0) Mono.Cecil (0.11.5) - System.ClientModel (1.0) - System.Memory.Data (>= 1.0.2) - System.Text.Json (>= 4.7.2) + System.ClientModel (1.2.1) + System.Memory.Data (>= 6.0) + System.Text.Json (>= 6.0.10) System.Diagnostics.DiagnosticSource (8.0.1) System.Memory.Data (8.0) System.Text.Json (>= 8.0) diff --git a/src/AzureTackle.Shared/AzureTackle.Shared.fsproj b/src/AzureTackle.Shared/AzureTackle.Shared.fsproj index f249817..6cb17d5 100644 --- a/src/AzureTackle.Shared/AzureTackle.Shared.fsproj +++ b/src/AzureTackle.Shared/AzureTackle.Shared.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/src/AzureTackle/AzureTackle.fsproj b/src/AzureTackle/AzureTackle.fsproj index 4ff7906..4c66302 100644 --- a/src/AzureTackle/AzureTackle.fsproj +++ b/src/AzureTackle/AzureTackle.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/src/docs/Docs.fsproj b/src/docs/Docs.fsproj index ccd8d00..5917cfa 100755 --- a/src/docs/Docs.fsproj +++ b/src/docs/Docs.fsproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 diff --git a/tests/AzureTackle.Tests/AzureTackleTests.fsproj b/tests/AzureTackle.Tests/AzureTackleTests.fsproj index 96417fa..b382b5b 100644 --- a/tests/AzureTackle.Tests/AzureTackleTests.fsproj +++ b/tests/AzureTackle.Tests/AzureTackleTests.fsproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0