From 15e348c17b41bd03a77aff880fa57ea31f6e460d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20J=C3=B6rg?= Date: Thu, 15 Jan 2026 15:32:40 +0100 Subject: [PATCH] chore: Bump to net10 Also bumps gitlab ci to v4.5 --- default.nix | 4 +- global.json | 2 +- nix/packages/archivist.nix | 2 +- nix/sources.json | 4 +- shell.nix | 4 +- src/Archivist/.gitlab-ci.yml | 2 +- src/Archivist/src/Cli/Archivist.fsproj | 2 +- src/Archivist/src/Cli/packages.lock.json | 300 +----------------- src/Archivist/src/Client/Client.fsproj | 2 +- .../src/Dapperizer/Dapperizer.fsproj | 2 +- src/Atlantis/.gitlab-ci.yml | 2 +- src/Atlantis/Dockerfile | 2 +- src/Atlantis/src/Client/Atlas/Atlas.fsproj | 2 +- .../src/Client/Atlas/packages.lock.json | 2 +- .../src/Client/Catalog/Catalog.fsproj | 2 +- src/Atlantis/src/Client/Client.fsproj | 2 +- src/Atlantis/src/Client/Lib/Lib.fsproj | 2 +- .../src/Client/Lib/packages.lock.json | 2 +- .../src/Client/Mapster/Mapster.fsproj | 2 +- .../src/Client/Mapster/packages.lock.json | 2 +- src/Atlantis/src/Client/Notary/Notary.fsproj | 2 +- .../src/Client/Notary/packages.lock.json | 2 +- src/Atlantis/src/Client/packages.lock.json | 2 +- .../src/Server/Archmaester/Archmaester.fsproj | 2 +- src/Atlantis/src/Server/Common/Common.fsproj | 2 +- .../src/Server/Hipster/Hipster.fsproj | 2 +- .../src/Server/Petimeter/Petimeter.fsproj | 2 +- src/Atlantis/src/Server/Server.fsproj | 4 +- src/Atlantis/src/Server/Settings.fs | 2 +- src/Atlantis/src/Server/packages.lock.json | 127 ++------ src/Codex/.gitlab-ci.yml | 2 +- src/Codex/Dockerfile | 2 +- src/Codex/src/Client/Codex.Client.fsproj | 2 +- src/Codex/src/Client/packages.lock.json | 2 +- src/Codex/src/Server/Codex.Server.fsproj | 2 +- src/Codex/src/Server/packages.lock.json | 122 ++----- src/DataAgent/.gitlab-ci.yml | 2 +- .../src/DataAgent/Oceanbox.DataAgent.fsproj | 2 +- .../src/DataAgent/packages.lock.json | 252 +-------------- src/DataAgent/src/Entity/Entity.csproj | 2 +- src/DataAgent/src/Entity/packages.lock.json | 60 +--- src/Interfaces/.gitlab-ci.yml | 2 +- src/Interfaces/Api/Poseidon.Api.fsproj | 2 +- src/Interfaces/Api/packages.lock.json | 2 +- .../Archmaester/Archmaester.Api.fsproj | 2 +- src/Interfaces/Atlantis/Atlantis.Api.fsproj | 2 +- src/Interfaces/Hipster/Hipster.Api.fsproj | 2 +- src/Interfaces/Petimeter/Petimeter.Api.fsproj | 2 +- src/Interfaces/Sorcerer/Sorcerer.Api.fsproj | 2 +- src/ServerPack/.gitlab-ci.yml | 2 +- src/ServerPack/src/Oceanbox.ServerPack.fsproj | 2 +- src/ServerPack/src/packages.lock.json | 98 +----- src/Sorcerer/.gitlab-ci.yml | 2 +- src/Sorcerer/Dockerfile | 2 +- src/Sorcerer/src/Client/Client.fsproj | 2 +- src/Sorcerer/src/Server/Sorcerer.fsproj | 2 +- src/Sorcerer/src/Server/packages.lock.json | 136 ++------ 57 files changed, 151 insertions(+), 1052 deletions(-) diff --git a/default.nix b/default.nix index 112e1709..1bdbd40e 100644 --- a/default.nix +++ b/default.nix @@ -17,8 +17,8 @@ let in clean version; - dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0; - dotnet-runtime = pkgs.dotnetCorePackages.aspnetcore_9_0; + dotnet-sdk = pkgs.dotnetCorePackages.sdk_10_0; + dotnet-runtime = pkgs.dotnetCorePackages.aspnetcore_10_0; deps = nix-utils.output.lib.nuget.deps; # Usage: export NETRC="$(agenix -d netrc.age)" in `./nix/secrets` diff --git a/global.json b/global.json index 9a247ed2..f98e01d6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestMinor" } } \ No newline at end of file diff --git a/nix/packages/archivist.nix b/nix/packages/archivist.nix index 5212d13f..d687c77d 100644 --- a/nix/packages/archivist.nix +++ b/nix/packages/archivist.nix @@ -25,7 +25,7 @@ buildDotnetModule rec { ; name = "Archivist"; pname = name; - dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0; + dotnet-runtime = pkgs.dotnetCorePackages.runtime_10_0; dotnetRestoreFlags = "--force-evaluate"; nugetDeps = deps { inherit diff --git a/nix/sources.json b/nix/sources.json index 4d7b1af5..cb5e7fc7 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -28,8 +28,8 @@ "nixpkgs": { "type": "Channel", "name": "nixpkgs-unstable", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre920722.76eec3925eb9/nixexprs.tar.xz", - "hash": "sha256-IVq6jxkcTuudaj3c78xl2xG2fZSL9gS7JMPFUl3q7j4=" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre927565.13868c071cc7/nixexprs.tar.xz", + "hash": "sha256-wufp5c0nWh/87f9eK7xy1eZXms5zd4yl6S4SR+LfA08=" }, "pre-commit": { "type": "Git", diff --git a/shell.nix b/shell.nix index 530dc43d..40110de9 100644 --- a/shell.nix +++ b/shell.nix @@ -4,7 +4,7 @@ pre-commit ? import ./nix/pre-commit.nix, }: let - dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0; #(with pkgs.dotnetCorePackages; combinePackages [ sdk_9_0 sdk_10_0]); + dotnet-sdk = pkgs.dotnetCorePackages.sdk_10_0; agenix = pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { }; fable = pkgs.buildDotnetGlobalTool { pname = "fable"; @@ -78,4 +78,4 @@ pkgs.mkShellNoCC { ''; }; }; -} \ No newline at end of file +} diff --git a/src/Archivist/.gitlab-ci.yml b/src/Archivist/.gitlab-ci.yml index dc58a25f..774f3eda 100644 --- a/src/Archivist/.gitlab-ci.yml +++ b/src/Archivist/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetDeployment.gitlab-ci.yml inputs: project-name: archivist diff --git a/src/Archivist/src/Cli/Archivist.fsproj b/src/Archivist/src/Cli/Archivist.fsproj index 05eb1fe5..c381c654 100644 --- a/src/Archivist/src/Cli/Archivist.fsproj +++ b/src/Archivist/src/Cli/Archivist.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 true linux-x64 archivist diff --git a/src/Archivist/src/Cli/packages.lock.json b/src/Archivist/src/Cli/packages.lock.json index 15568be9..a1651deb 100644 --- a/src/Archivist/src/Cli/packages.lock.json +++ b/src/Archivist/src/Cli/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Fargo.CmdLine": { "type": "Direct", "requested": "[1.7.5, )", @@ -71,8 +71,7 @@ "Microsoft.Extensions.Configuration.Abstractions": "9.0.1", "Microsoft.Extensions.DependencyModel": "9.0.1", "Microsoft.Extensions.Logging": "9.0.1", - "Mono.TextTemplating": "3.0.0", - "System.Text.Json": "9.0.1" + "Mono.TextTemplating": "3.0.0" } }, "Microsoft.EntityFrameworkCore.Tools": { @@ -233,8 +232,7 @@ "resolved": "5.3.2", "contentHash": "LFtxXpQNor8az1ez3rN9oz2cqf/06i9yTrPyJ9R83qLEpFAU7Of0WL2hoSXzLHer4lh+6mO1NV4VQFiBzNRtjw==", "dependencies": { - "FSharp.Core": "4.3.2", - "System.Reflection.Emit.Lightweight": "4.3.0" + "FSharp.Core": "4.3.2" } }, "Google.Api.CommonProtos": { @@ -331,10 +329,7 @@ "resolved": "4.8.0", "contentHash": "/jR+e/9aT+BApoQJABlVCKnnggGQbvGh7BKq2/wI1LamxC+LbzhcLj4Vj7gXCofl1n4E521YfF9w0WcASGg/KA==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "System.Collections.Immutable": "7.0.0", - "System.Reflection.Metadata": "7.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.CodeAnalysis.Analyzers": "3.3.4" } }, "Microsoft.CodeAnalysis.CSharp": { @@ -364,9 +359,7 @@ "Humanizer.Core": "2.14.1", "Microsoft.Bcl.AsyncInterfaces": "7.0.0", "Microsoft.CodeAnalysis.Common": "[4.8.0]", - "System.Composition": "7.0.0", - "System.IO.Pipelines": "7.0.0", - "System.Threading.Channels": "7.0.0" + "System.Composition": "7.0.0" } }, "Microsoft.CodeAnalysis.Workspaces.MSBuild": { @@ -376,8 +369,7 @@ "dependencies": { "Microsoft.Build.Framework": "16.10.0", "Microsoft.CodeAnalysis.Common": "[4.8.0]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.8.0]", - "System.Text.Json": "7.0.3" + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.8.0]" } }, "Microsoft.EntityFrameworkCore.Abstractions": { @@ -534,16 +526,6 @@ "resolved": "17.11.4", "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA==" }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "Mono.TextTemplating": { "type": "Transitive", "resolved": "3.0.0", @@ -563,11 +545,7 @@ "ProjNET": { "type": "Transitive", "resolved": "2.0.0", - "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Numerics.Vectors": "4.5.0" - } + "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==" }, "Serilog.Sinks.File": { "type": "Transitive", @@ -591,11 +569,6 @@ "resolved": "6.0.0", "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA==" }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==" - }, "System.Composition": { "type": "Transitive", "resolved": "7.0.0", @@ -644,128 +617,6 @@ "System.Composition.Runtime": "7.0.0" } }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "jRn6JYnNPW6xgQazROBLSfpdoczRw694vO5kKvMcNnpXuolEixUyw6IBuBs2Y2mlSX/LdLvyyWmfXhaI3ND1Yg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==", - "dependencies": { - "System.Collections.Immutable": "7.0.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==" - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==" - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "entity": { "type": "Project", "dependencies": { @@ -911,10 +762,7 @@ "type": "CentralTransitive", "requested": "[2.5.0, )", "resolved": "2.5.0", - "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==", - "dependencies": { - "System.Memory": "4.5.4" - } + "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==" }, "Newtonsoft.Json": { "type": "CentralTransitive", @@ -1006,136 +854,6 @@ } } }, - "net9.0/linux-x64": { - "runtime.any.System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SDZ5AD1DtyRoxYtEcqQ3HDlcrorMYXZeCt7ZhG9US9I5Vva+gpIWDGMkcwa5XiKL0ceQKRZIX2x0XEjLX7PDzQ==" - }, - "runtime.any.System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "hLC3A3rI8jipR5d9k7+f0MgRCW6texsAp0MWkN/ci18FMtQ9KH7E2vDn/DH2LkxsszlpJpOn9qy6Z6/69rH6eQ==" - }, - "runtime.any.System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Nrm1p3armp6TTf2xuvaa+jGTTmncALWFq22CpmwRvhDf6dE9ZmH40EbOswD4GnFLrMRS0Ki6Kx5aUPmKK/hZBg==" - }, - "runtime.any.System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==", - "dependencies": { - "System.Private.Uri": "4.3.0" - } - }, - "runtime.any.System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" - }, - "runtime.any.System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OhBAVBQG5kFj1S+hCEQ3TUHBAEtZ3fbEMgZMRNdN8A0Pj4x+5nTELEqL59DU0TjKVE6II3dqKw4Dklb3szT65w==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.unix.System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ooWzobr5RAq34r9uan1r/WPXJYG1XWy9KanrxNvEnBzbFdQbMG7Y3bVi4QxR7xZMNLOxLLTAyXvnSkfj5boZSg==", - "dependencies": { - "runtime.native.System": "4.3.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.any.System.IO": "4.3.0" - } - }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.unix.System.Private.Uri": "4.3.0" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Reflection": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Reflection.Primitives": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.any.System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Text.Encoding": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Threading.Tasks": "4.3.0" - } - } - } + "net10.0/linux-x64": {} } } \ No newline at end of file diff --git a/src/Archivist/src/Client/Client.fsproj b/src/Archivist/src/Client/Client.fsproj index 170ba48a..28aaa2bc 100644 --- a/src/Archivist/src/Client/Client.fsproj +++ b/src/Archivist/src/Client/Client.fsproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 7.1.0 diff --git a/src/Archivist/src/Dapperizer/Dapperizer.fsproj b/src/Archivist/src/Dapperizer/Dapperizer.fsproj index d2f58f08..dcd58cc0 100644 --- a/src/Archivist/src/Dapperizer/Dapperizer.fsproj +++ b/src/Archivist/src/Dapperizer/Dapperizer.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 7.1.0 diff --git a/src/Atlantis/.gitlab-ci.yml b/src/Atlantis/.gitlab-ci.yml index be6c7b58..e76a31ab 100644 --- a/src/Atlantis/.gitlab-ci.yml +++ b/src/Atlantis/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetDeployment.gitlab-ci.yml inputs: project-name: atlantis diff --git a/src/Atlantis/Dockerfile b/src/Atlantis/Dockerfile index bca0e562..25de3620 100644 --- a/src/Atlantis/Dockerfile +++ b/src/Atlantis/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0.6 +FROM mcr.microsoft.com/dotnet/aspnet:10 RUN apt-get update \ && apt-get install -y gcc-multilib libnetcdf19 libnetcdf-dev diff --git a/src/Atlantis/src/Client/Atlas/Atlas.fsproj b/src/Atlantis/src/Client/Atlas/Atlas.fsproj index 309563b4..890930bc 100644 --- a/src/Atlantis/src/Client/Atlas/Atlas.fsproj +++ b/src/Atlantis/src/Client/Atlas/Atlas.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FABLE_COMPILER true 2.87.0 diff --git a/src/Atlantis/src/Client/Atlas/packages.lock.json b/src/Atlantis/src/Client/Atlas/packages.lock.json index a3ecc991..97d1d090 100644 --- a/src/Atlantis/src/Client/Atlas/packages.lock.json +++ b/src/Atlantis/src/Client/Atlas/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Fable.Browser.IndexedDB": { "type": "Direct", "requested": "[2.2.0, )", diff --git a/src/Atlantis/src/Client/Catalog/Catalog.fsproj b/src/Atlantis/src/Client/Catalog/Catalog.fsproj index 956fbb31..83ff66f8 100644 --- a/src/Atlantis/src/Client/Catalog/Catalog.fsproj +++ b/src/Atlantis/src/Client/Catalog/Catalog.fsproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 6.20.0 Archivist diff --git a/src/Atlantis/src/Client/Client.fsproj b/src/Atlantis/src/Client/Client.fsproj index fd65264d..c356fa26 100644 --- a/src/Atlantis/src/Client/Client.fsproj +++ b/src/Atlantis/src/Client/Client.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FABLE_COMPILER true 2.102.0 diff --git a/src/Atlantis/src/Client/Lib/Lib.fsproj b/src/Atlantis/src/Client/Lib/Lib.fsproj index c0c74cfc..e7b3306b 100644 --- a/src/Atlantis/src/Client/Lib/Lib.fsproj +++ b/src/Atlantis/src/Client/Lib/Lib.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FABLE_COMPILER true 2.87.0 diff --git a/src/Atlantis/src/Client/Lib/packages.lock.json b/src/Atlantis/src/Client/Lib/packages.lock.json index 36881261..8b0eb014 100644 --- a/src/Atlantis/src/Client/Lib/packages.lock.json +++ b/src/Atlantis/src/Client/Lib/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Fable.Browser.IndexedDB": { "type": "Direct", "requested": "[2.2.0, )", diff --git a/src/Atlantis/src/Client/Mapster/Mapster.fsproj b/src/Atlantis/src/Client/Mapster/Mapster.fsproj index de4ef058..cf67e783 100644 --- a/src/Atlantis/src/Client/Mapster/Mapster.fsproj +++ b/src/Atlantis/src/Client/Mapster/Mapster.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FABLE_COMPILER true 2.87.0 diff --git a/src/Atlantis/src/Client/Mapster/packages.lock.json b/src/Atlantis/src/Client/Mapster/packages.lock.json index dce7370f..beee41b8 100644 --- a/src/Atlantis/src/Client/Mapster/packages.lock.json +++ b/src/Atlantis/src/Client/Mapster/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Fable.Browser.IndexedDB": { "type": "Direct", "requested": "[2.2.0, )", diff --git a/src/Atlantis/src/Client/Notary/Notary.fsproj b/src/Atlantis/src/Client/Notary/Notary.fsproj index b3af1d6b..fb2fe4f0 100644 --- a/src/Atlantis/src/Client/Notary/Notary.fsproj +++ b/src/Atlantis/src/Client/Notary/Notary.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FABLE_COMPILER true 1.9.8 diff --git a/src/Atlantis/src/Client/Notary/packages.lock.json b/src/Atlantis/src/Client/Notary/packages.lock.json index 658190cc..95f3d3c5 100644 --- a/src/Atlantis/src/Client/Notary/packages.lock.json +++ b/src/Atlantis/src/Client/Notary/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Fable.Core": { "type": "Direct", "requested": "[4.4.0, )", diff --git a/src/Atlantis/src/Client/packages.lock.json b/src/Atlantis/src/Client/packages.lock.json index f1214445..e21eb07e 100644 --- a/src/Atlantis/src/Client/packages.lock.json +++ b/src/Atlantis/src/Client/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "FSharp.Core": { "type": "Direct", "requested": "[9.0.303, )", diff --git a/src/Atlantis/src/Server/Archmaester/Archmaester.fsproj b/src/Atlantis/src/Server/Archmaester/Archmaester.fsproj index 688fb886..3d7ab4a5 100644 --- a/src/Atlantis/src/Server/Archmaester/Archmaester.fsproj +++ b/src/Atlantis/src/Server/Archmaester/Archmaester.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 6.20.0 diff --git a/src/Atlantis/src/Server/Common/Common.fsproj b/src/Atlantis/src/Server/Common/Common.fsproj index 3cd72af6..e6645cae 100644 --- a/src/Atlantis/src/Server/Common/Common.fsproj +++ b/src/Atlantis/src/Server/Common/Common.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 diff --git a/src/Atlantis/src/Server/Hipster/Hipster.fsproj b/src/Atlantis/src/Server/Hipster/Hipster.fsproj index 68ac8a1b..f84e80d6 100644 --- a/src/Atlantis/src/Server/Hipster/Hipster.fsproj +++ b/src/Atlantis/src/Server/Hipster/Hipster.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 2.6.6 diff --git a/src/Atlantis/src/Server/Petimeter/Petimeter.fsproj b/src/Atlantis/src/Server/Petimeter/Petimeter.fsproj index 3776de51..66cf6c41 100644 --- a/src/Atlantis/src/Server/Petimeter/Petimeter.fsproj +++ b/src/Atlantis/src/Server/Petimeter/Petimeter.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 1.9.8 diff --git a/src/Atlantis/src/Server/Server.fsproj b/src/Atlantis/src/Server/Server.fsproj index b4d6a945..352eed79 100644 --- a/src/Atlantis/src/Server/Server.fsproj +++ b/src/Atlantis/src/Server/Server.fsproj @@ -2,7 +2,9 @@ Exe - net9.0 + net10.0 + preview + true true 2.102.0 Server diff --git a/src/Atlantis/src/Server/Settings.fs b/src/Atlantis/src/Server/Settings.fs index d5ae4b43..3bcce071 100644 --- a/src/Atlantis/src/Server/Settings.fs +++ b/src/Atlantis/src/Server/Settings.fs @@ -81,7 +81,7 @@ let configureEnv () : Async = | Some x when x = "1" || x = "true" -> Log.Information "[Settings] > Waiting for Dapr..." Threading.Thread.Sleep 2000 - do! Async.Sleep (TimeSpan.FromMilliseconds 2000) + do! Async.Sleep (TimeSpan.FromMilliseconds 2000.0) do! setupAzureEnv () Log.Information $"[Settings] > Azure Keyvault credentials in {appsettings.keyVault}" do! setupDbEnv () diff --git a/src/Atlantis/src/Server/packages.lock.json b/src/Atlantis/src/Server/packages.lock.json index 8420b9cf..fa91ec5f 100644 --- a/src/Atlantis/src/Server/packages.lock.json +++ b/src/Atlantis/src/Server/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Argu": { "type": "Direct", "requested": "[6.2.5, )", @@ -56,9 +56,7 @@ "dependencies": { "Azure.Core": "1.44.1", "Microsoft.Identity.Client": "4.67.2", - "Microsoft.Identity.Client.Extensions.Msal": "4.67.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" + "Microsoft.Identity.Client.Extensions.Msal": "4.67.2" } }, "Azure.Security.KeyVault.Secrets": { @@ -67,10 +65,7 @@ "resolved": "4.7.0", "contentHash": "uOPCojkm41V4dKTORyGzl3/f/lriKpxSQ43fWDn4StRJBVmbF1F/DNWJhwm207kCnqgE/W9+tskJSimIKHCZkw==", "dependencies": { - "Azure.Core": "1.44.1", - "System.Memory": "4.5.5", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.44.1" } }, "Dapr.Actors": { @@ -251,8 +246,7 @@ "resolved": "1.3.13", "contentHash": "znp8odpdkVGKVX0AvbhiXdmeMi0KJ+A4AyAQWSkfAEAe4Z4clRE+rVhrLnAGrFD1VEIUX2lsQ4o84ywpWZUSGw==", "dependencies": { - "FSharp.Core": "4.7.0", - "System.Text.Json": "6.0.0" + "FSharp.Core": "4.7.0" } }, "FSharpPlus": { @@ -273,8 +267,7 @@ "FSharp.Core": "6.0.0", "FSharp.SystemTextJson": "1.3.13", "Giraffe.ViewEngine": "1.4.0", - "Microsoft.IO.RecyclableMemoryStream": "3.0.1", - "System.Text.Json": "8.0.5" + "Microsoft.IO.RecyclableMemoryStream": "3.0.1" } }, "IdentityModel.AspNetCore": { @@ -489,12 +482,7 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "System.ClientModel": "1.1.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "6.0.0", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory.Data": "6.0.0" } }, "Azure.Security.KeyVault.Keys": { @@ -502,10 +490,7 @@ "resolved": "4.6.0", "contentHash": "1KbCIkXmLaj+kDDNm1Va5rNlzgcJ/fVtnsoVmzZPKa38jz6DXhPyojdvGaOX8AdupGJceg0X1vrsGvZKN79Qzw==", "dependencies": { - "Azure.Core": "1.37.0", - "System.Memory": "4.5.4", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.37.0" } }, "Azure.Storage.Blobs": { @@ -513,8 +498,7 @@ "resolved": "12.23.0", "contentHash": "wokJ5KX/iViQQ32xyCu69+Ter0aR4B9QQ+oR9NCpc/WPIanxnDErrmFfdmE7K8ZdccjHkvE/wEnqJxaF1+5wFg==", "dependencies": { - "Azure.Storage.Common": "12.22.0", - "System.Text.Json": "6.0.10" + "Azure.Storage.Common": "12.22.0" } }, "Azure.Storage.Common": { @@ -586,8 +570,7 @@ "Fable.Remoting.MsgPack": "1.24.0", "Fable.SignalR.Shared": "2.1.0", "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson": "9.0.0", - "Microsoft.AspNetCore.SignalR.StackExchangeRedis": "9.0.0", - "System.Text.Encodings.Web": "9.0.0" + "Microsoft.AspNetCore.SignalR.StackExchangeRedis": "9.0.0" } }, "Fable.SignalR.Shared": { @@ -683,8 +666,7 @@ "resolved": "5.3.2", "contentHash": "LFtxXpQNor8az1ez3rN9oz2cqf/06i9yTrPyJ9R83qLEpFAU7Of0WL2hoSXzLHer4lh+6mO1NV4VQFiBzNRtjw==", "dependencies": { - "FSharp.Core": "4.3.2", - "System.Reflection.Emit.Lightweight": "4.3.0" + "FSharp.Core": "4.3.2" } }, "Giraffe.ViewEngine": { @@ -836,8 +818,7 @@ "resolved": "2.2.0", "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.2.0", - "System.Text.Encodings.Web": "4.5.0" + "Microsoft.AspNetCore.Http.Features": "2.2.0" } }, "Microsoft.AspNetCore.Http.Features": { @@ -881,8 +862,7 @@ "resolved": "2.2.0", "contentHash": "9ErxAAKaDzxXASB/b5uLEkLgUWv1QbeVxyJYEHQwMaxXOeFFVkQxiq8RyfVcifLU7NR0QY0p3acqx4ZpYfhHDg==", "dependencies": { - "Microsoft.Net.Http.Headers": "2.2.0", - "System.Text.Encodings.Web": "4.5.0" + "Microsoft.Net.Http.Headers": "2.2.0" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -1089,8 +1069,7 @@ "resolved": "4.67.2", "contentHash": "37t0TfekfG6XM8kue/xNaA66Qjtti5Qe1xA41CK+bEd8VD76/oXJc+meFJHGzygIC485dCpKoamG/pDfb9Qd7Q==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "6.35.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { @@ -1158,8 +1137,7 @@ "resolved": "2.2.0", "contentHash": "iZNkjYqlo8sIOI0bQfpsSoMTmB/kyvmV2h225ihyZT33aTp48ZpF6qYnXxzSXmHt8DpBAwBTX+1s1UFLbYfZKg==", "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0", - "System.Buffers": "4.5.0" + "Microsoft.Extensions.Primitives": "2.2.0" } }, "Microsoft.NET.StringTools": { @@ -1188,10 +1166,7 @@ "OpenTelemetry.Api": { "type": "Transitive", "resolved": "1.10.0", - "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "9.0.0" - } + "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==" }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", @@ -1272,17 +1247,13 @@ "dependencies": { "Microsoft.Extensions.Options": "9.0.0", "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.10.0, 2.0.0)", - "StackExchange.Redis": "[2.6.122, 3.0.0)", - "System.Reflection.Emit.Lightweight": "4.7.0" + "StackExchange.Redis": "[2.6.122, 3.0.0)" } }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==" }, "Polly": { "type": "Transitive", @@ -1300,11 +1271,7 @@ "ProjNET": { "type": "Transitive", "resolved": "2.0.0", - "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Numerics.Vectors": "4.5.0" - } + "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==" }, "prometheus-net": { "type": "Transitive", @@ -1404,18 +1371,12 @@ "Pipelines.Sockets.Unofficial": "2.2.8" } }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" - }, "System.ClientModel": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "6.0.9" + "System.Memory.Data": "1.0.2" } }, "System.ComponentModel.Annotations": { @@ -1431,11 +1392,6 @@ "System.Security.Cryptography.ProtectedData": "4.4.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "9.0.9", - "contentHash": "8hy61dsFYYSDjT9iTAfygGMU3A0EAnG69x5FUXeKsCjMhBmtTBt4UMUEW3ipprFoorOW6Jw/7hDMjXtlrsOvVQ==" - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "8.0.1", @@ -1450,33 +1406,10 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" - }, "System.Memory.Data": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==", - "dependencies": { - "System.Text.Json": "6.0.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA==" + "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==" }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", @@ -1496,16 +1429,6 @@ "System.Security.Cryptography.Pkcs": "9.0.2" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "archmaester": { "type": "Project", "dependencies": { @@ -1545,7 +1468,7 @@ "Hipster.Api": "[1.0.1, )", "Oceanbox.DataAgent": "[7.3.0, )", "Oceanbox.DataAgent.Api": "[7.2.1, )", - "Oceanbox.ServerPack": "[1.38.3, )", + "Oceanbox.ServerPack": "[1.39.1, )", "Petimeter.Api": "[1.0.0, )" } }, @@ -1731,10 +1654,7 @@ "type": "CentralTransitive", "requested": "[2.5.0, )", "resolved": "2.5.0", - "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==", - "dependencies": { - "System.Memory": "4.5.4" - } + "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==" }, "Newtonsoft.Json": { "type": "CentralTransitive", @@ -1799,8 +1719,7 @@ "contentHash": "vlOKvmigJ3Sumoulp1HwCTFXgX4KuERVGIIw4ZqmhgUJnSiApDmY183ddzzHo2FIdIJ8vGwrMGx98v9cLAezFA==", "dependencies": { "Microsoft.Extensions.Http": "9.0.9", - "System.ComponentModel.Annotations": "5.0.0", - "System.Diagnostics.DiagnosticSource": "9.0.9" + "System.ComponentModel.Annotations": "5.0.0" } }, "ProjNet.FSharp": { diff --git a/src/Codex/.gitlab-ci.yml b/src/Codex/.gitlab-ci.yml index cd2bb091..02bbcfa3 100644 --- a/src/Codex/.gitlab-ci.yml +++ b/src/Codex/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetDeployment.gitlab-ci.yml inputs: project-name: codex diff --git a/src/Codex/Dockerfile b/src/Codex/Dockerfile index 6dbda917..fa17e4b9 100644 --- a/src/Codex/Dockerfile +++ b/src/Codex/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 WORKDIR /app COPY dist /app diff --git a/src/Codex/src/Client/Codex.Client.fsproj b/src/Codex/src/Client/Codex.Client.fsproj index 898caa46..9a423f89 100644 --- a/src/Codex/src/Client/Codex.Client.fsproj +++ b/src/Codex/src/Client/Codex.Client.fsproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 Oceanbox 0.0.1-beta.4 FABLE_COMPILER diff --git a/src/Codex/src/Client/packages.lock.json b/src/Codex/src/Client/packages.lock.json index c7f0c8d8..c1841f04 100644 --- a/src/Codex/src/Client/packages.lock.json +++ b/src/Codex/src/Client/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Fable.Core": { "type": "Direct", "requested": "[4.4.0, )", diff --git a/src/Codex/src/Server/Codex.Server.fsproj b/src/Codex/src/Server/Codex.Server.fsproj index 9906388b..d589eb7a 100644 --- a/src/Codex/src/Server/Codex.Server.fsproj +++ b/src/Codex/src/Server/Codex.Server.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 Codex.Server Oceanbox 0.0.1-beta.4 diff --git a/src/Codex/src/Server/packages.lock.json b/src/Codex/src/Server/packages.lock.json index 0e504914..a75ca358 100644 --- a/src/Codex/src/Server/packages.lock.json +++ b/src/Codex/src/Server/packages.lock.json @@ -1,17 +1,14 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Azure.Security.KeyVault.Secrets": { "type": "Direct", "requested": "[4.7.0, )", "resolved": "4.7.0", "contentHash": "uOPCojkm41V4dKTORyGzl3/f/lriKpxSQ43fWDn4StRJBVmbF1F/DNWJhwm207kCnqgE/W9+tskJSimIKHCZkw==", "dependencies": { - "Azure.Core": "1.44.1", - "System.Memory": "4.5.5", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.44.1" } }, "Fable.Remoting.Giraffe": { @@ -53,8 +50,7 @@ "FSharp.Core": "6.0.0", "FSharp.SystemTextJson": "1.3.13", "Giraffe.ViewEngine": "1.4.0", - "Microsoft.IO.RecyclableMemoryStream": "3.0.1", - "System.Text.Json": "8.0.5" + "Microsoft.IO.RecyclableMemoryStream": "3.0.1" } }, "Azure.Core": { @@ -64,12 +60,7 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "System.ClientModel": "1.1.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "6.0.0", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory.Data": "6.0.0" } }, "Azure.Security.KeyVault.Keys": { @@ -77,10 +68,7 @@ "resolved": "4.6.0", "contentHash": "1KbCIkXmLaj+kDDNm1Va5rNlzgcJ/fVtnsoVmzZPKa38jz6DXhPyojdvGaOX8AdupGJceg0X1vrsGvZKN79Qzw==", "dependencies": { - "Azure.Core": "1.37.0", - "System.Memory": "4.5.4", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.37.0" } }, "Azure.Storage.Blobs": { @@ -88,8 +76,7 @@ "resolved": "12.23.0", "contentHash": "wokJ5KX/iViQQ32xyCu69+Ter0aR4B9QQ+oR9NCpc/WPIanxnDErrmFfdmE7K8ZdccjHkvE/wEnqJxaF1+5wFg==", "dependencies": { - "Azure.Storage.Common": "12.22.0", - "System.Text.Json": "6.0.10" + "Azure.Storage.Common": "12.22.0" } }, "Azure.Storage.Common": { @@ -233,8 +220,7 @@ "resolved": "5.3.2", "contentHash": "LFtxXpQNor8az1ez3rN9oz2cqf/06i9yTrPyJ9R83qLEpFAU7Of0WL2hoSXzLHer4lh+6mO1NV4VQFiBzNRtjw==", "dependencies": { - "FSharp.Core": "4.3.2", - "System.Reflection.Emit.Lightweight": "4.3.0" + "FSharp.Core": "4.3.2" } }, "Giraffe.ViewEngine": { @@ -527,8 +513,7 @@ "resolved": "4.67.2", "contentHash": "37t0TfekfG6XM8kue/xNaA66Qjtti5Qe1xA41CK+bEd8VD76/oXJc+meFJHGzygIC485dCpKoamG/pDfb9Qd7Q==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "6.35.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { @@ -617,10 +602,7 @@ "OpenTelemetry.Api": { "type": "Transitive", "resolved": "1.10.0", - "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "9.0.0" - } + "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==" }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", @@ -701,26 +683,18 @@ "dependencies": { "Microsoft.Extensions.Options": "9.0.0", "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.10.0, 2.0.0)", - "StackExchange.Redis": "[2.6.122, 3.0.0)", - "System.Reflection.Emit.Lightweight": "4.7.0" + "StackExchange.Redis": "[2.6.122, 3.0.0)" } }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==" }, "ProjNET": { "type": "Transitive", "resolved": "2.0.0", - "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Numerics.Vectors": "4.5.0" - } + "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==" }, "Sentry": { "type": "Transitive", @@ -769,8 +743,7 @@ "resolved": "1.1.0", "contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "6.0.9" + "System.Memory.Data": "1.0.2" } }, "System.ComponentModel.Annotations": { @@ -778,11 +751,6 @@ "resolved": "5.0.0", "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "9.0.9", - "contentHash": "8hy61dsFYYSDjT9iTAfygGMU3A0EAnG69x5FUXeKsCjMhBmtTBt4UMUEW3ipprFoorOW6Jw/7hDMjXtlrsOvVQ==" - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "8.0.1", @@ -797,38 +765,10 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" - }, "System.Memory.Data": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==", - "dependencies": { - "System.Text.Json": "6.0.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==" }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", @@ -848,16 +788,6 @@ "System.Security.Cryptography.Pkcs": "9.0.2" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "entity": { "type": "Project", "dependencies": { @@ -953,9 +883,7 @@ "dependencies": { "Azure.Core": "1.44.1", "Microsoft.Identity.Client": "4.67.2", - "Microsoft.Identity.Client.Extensions.Msal": "4.67.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" + "Microsoft.Identity.Client.Extensions.Msal": "4.67.2" } }, "Dapper.FSharp": { @@ -1121,8 +1049,7 @@ "resolved": "1.3.13", "contentHash": "znp8odpdkVGKVX0AvbhiXdmeMi0KJ+A4AyAQWSkfAEAe4Z4clRE+rVhrLnAGrFD1VEIUX2lsQ4o84ywpWZUSGw==", "dependencies": { - "FSharp.Core": "4.7.0", - "System.Text.Json": "6.0.0" + "FSharp.Core": "4.7.0" } }, "FSharpPlus": { @@ -1211,10 +1138,7 @@ "type": "CentralTransitive", "requested": "[2.5.0, )", "resolved": "2.5.0", - "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==", - "dependencies": { - "System.Memory": "4.5.4" - } + "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==" }, "Newtonsoft.Json": { "type": "CentralTransitive", @@ -1300,8 +1224,7 @@ "contentHash": "vlOKvmigJ3Sumoulp1HwCTFXgX4KuERVGIIw4ZqmhgUJnSiApDmY183ddzzHo2FIdIJ8vGwrMGx98v9cLAezFA==", "dependencies": { "Microsoft.Extensions.Http": "9.0.9", - "System.ComponentModel.Annotations": "5.0.0", - "System.Diagnostics.DiagnosticSource": "9.0.9" + "System.ComponentModel.Annotations": "5.0.0" } }, "ProjNet.FSharp": { @@ -1372,15 +1295,6 @@ "Serilog": "4.0.0" } }, - "System.Text.Encodings.Web": { - "type": "CentralTransitive", - "requested": "[9.0.2, )", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "Thoth.Json.Net": { "type": "CentralTransitive", "requested": "[12.0.0, )", diff --git a/src/DataAgent/.gitlab-ci.yml b/src/DataAgent/.gitlab-ci.yml index bb369853..371f057f 100644 --- a/src/DataAgent/.gitlab-ci.yml +++ b/src/DataAgent/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetPackage.gitlab-ci.yml inputs: project-name: archmaester diff --git a/src/DataAgent/src/DataAgent/Oceanbox.DataAgent.fsproj b/src/DataAgent/src/DataAgent/Oceanbox.DataAgent.fsproj index 5894706b..1fd4cd35 100644 --- a/src/DataAgent/src/DataAgent/Oceanbox.DataAgent.fsproj +++ b/src/DataAgent/src/DataAgent/Oceanbox.DataAgent.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 linux-x64 true Oceanbox.DataAgent diff --git a/src/DataAgent/src/DataAgent/packages.lock.json b/src/DataAgent/src/DataAgent/packages.lock.json index cf2cd1b9..44b2faf9 100644 --- a/src/DataAgent/src/DataAgent/packages.lock.json +++ b/src/DataAgent/src/DataAgent/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Dapper.FSharp": { "type": "Direct", "requested": "[4.9.0, )", @@ -103,10 +103,7 @@ "type": "Direct", "requested": "[2.5.0, )", "resolved": "2.5.0", - "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==", - "dependencies": { - "System.Memory": "4.5.4" - } + "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==" }, "Npgsql.EntityFrameworkCore.PostgreSQL": { "type": "Direct", @@ -313,8 +310,7 @@ "resolved": "5.3.2", "contentHash": "LFtxXpQNor8az1ez3rN9oz2cqf/06i9yTrPyJ9R83qLEpFAU7Of0WL2hoSXzLHer4lh+6mO1NV4VQFiBzNRtjw==", "dependencies": { - "FSharp.Core": "4.3.2", - "System.Reflection.Emit.Lightweight": "4.3.0" + "FSharp.Core": "4.3.2" } }, "Google.Api.CommonProtos": { @@ -530,16 +526,6 @@ "resolved": "17.11.4", "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA==" }, - "Microsoft.NETCore.Platforms": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" - }, - "Microsoft.NETCore.Targets": { - "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==" - }, "NetTopologySuite.IO.PostGis": { "type": "Transitive", "resolved": "2.1.0", @@ -551,11 +537,7 @@ "ProjNET": { "type": "Transitive", "resolved": "2.0.0", - "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Numerics.Vectors": "4.5.0" - } + "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==" }, "Serilog.Sinks.File": { "type": "Transitive", @@ -574,100 +556,6 @@ "Serilog.Sinks.File": "6.0.0" } }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, "entity": { "type": "Project", "dependencies": { @@ -767,136 +655,6 @@ "contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA==" } }, - "net9.0/linux-x64": { - "runtime.any.System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "SDZ5AD1DtyRoxYtEcqQ3HDlcrorMYXZeCt7ZhG9US9I5Vva+gpIWDGMkcwa5XiKL0ceQKRZIX2x0XEjLX7PDzQ==" - }, - "runtime.any.System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "hLC3A3rI8jipR5d9k7+f0MgRCW6texsAp0MWkN/ci18FMtQ9KH7E2vDn/DH2LkxsszlpJpOn9qy6Z6/69rH6eQ==" - }, - "runtime.any.System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "Nrm1p3armp6TTf2xuvaa+jGTTmncALWFq22CpmwRvhDf6dE9ZmH40EbOswD4GnFLrMRS0Ki6Kx5aUPmKK/hZBg==" - }, - "runtime.any.System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "fRS7zJgaG9NkifaAxGGclDDoRn9HC7hXACl52Or06a/fxdzDajWb5wov3c6a+gVSlekRoexfjwQSK9sh5um5LQ==", - "dependencies": { - "System.Private.Uri": "4.3.0" - } - }, - "runtime.any.System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "+ihI5VaXFCMVPJNstG4O4eo1CfbrByLxRrQQTqOTp1ttK0kUKDqOdBSTaCB2IBk/QtjDrs6+x4xuezyMXdm0HQ==" - }, - "runtime.any.System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "OhBAVBQG5kFj1S+hCEQ3TUHBAEtZ3fbEMgZMRNdN8A0Pj4x+5nTELEqL59DU0TjKVE6II3dqKw4Dklb3szT65w==" - }, - "runtime.native.System": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.unix.System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ooWzobr5RAq34r9uan1r/WPXJYG1XWy9KanrxNvEnBzbFdQbMG7Y3bVi4QxR7xZMNLOxLLTAyXvnSkfj5boZSg==", - "dependencies": { - "runtime.native.System": "4.3.0" - } - }, - "System.IO": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.any.System.IO": "4.3.0" - } - }, - "System.Private.Uri": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.unix.System.Private.Uri": "4.3.0" - } - }, - "System.Reflection": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Reflection": "4.3.0" - } - }, - "System.Reflection.Primitives": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Reflection.Primitives": "4.3.0" - } - }, - "System.Runtime": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "runtime.any.System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Text.Encoding": "4.3.0" - } - }, - "System.Threading.Tasks": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "runtime.any.System.Threading.Tasks": "4.3.0" - } - } - } + "net10.0/linux-x64": {} } } \ No newline at end of file diff --git a/src/DataAgent/src/Entity/Entity.csproj b/src/DataAgent/src/Entity/Entity.csproj index 858230e5..54d4a512 100644 --- a/src/DataAgent/src/Entity/Entity.csproj +++ b/src/DataAgent/src/Entity/Entity.csproj @@ -1,7 +1,7 @@ Library - net9.0 + net10.0 enable true diff --git a/src/DataAgent/src/Entity/packages.lock.json b/src/DataAgent/src/Entity/packages.lock.json index 239aa5e7..544ea079 100644 --- a/src/DataAgent/src/Entity/packages.lock.json +++ b/src/DataAgent/src/Entity/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Microsoft.EntityFrameworkCore": { "type": "Direct", "requested": "[9.0.1, )", @@ -31,8 +31,7 @@ "Microsoft.Extensions.Configuration.Abstractions": "9.0.1", "Microsoft.Extensions.DependencyModel": "9.0.1", "Microsoft.Extensions.Logging": "9.0.1", - "Mono.TextTemplating": "3.0.0", - "System.Text.Json": "9.0.1" + "Mono.TextTemplating": "3.0.0" } }, "Microsoft.EntityFrameworkCore.Relational": { @@ -107,10 +106,7 @@ "resolved": "4.8.0", "contentHash": "/jR+e/9aT+BApoQJABlVCKnnggGQbvGh7BKq2/wI1LamxC+LbzhcLj4Vj7gXCofl1n4E521YfF9w0WcASGg/KA==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "System.Collections.Immutable": "7.0.0", - "System.Reflection.Metadata": "7.0.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.CodeAnalysis.Analyzers": "3.3.4" } }, "Microsoft.CodeAnalysis.CSharp": { @@ -140,9 +136,7 @@ "Humanizer.Core": "2.14.1", "Microsoft.Bcl.AsyncInterfaces": "7.0.0", "Microsoft.CodeAnalysis.Common": "[4.8.0]", - "System.Composition": "7.0.0", - "System.IO.Pipelines": "7.0.0", - "System.Threading.Channels": "7.0.0" + "System.Composition": "7.0.0" } }, "Microsoft.CodeAnalysis.Workspaces.MSBuild": { @@ -152,8 +146,7 @@ "dependencies": { "Microsoft.Build.Framework": "16.10.0", "Microsoft.CodeAnalysis.Common": "[4.8.0]", - "Microsoft.CodeAnalysis.Workspaces.Common": "[4.8.0]", - "System.Text.Json": "7.0.3" + "Microsoft.CodeAnalysis.Workspaces.Common": "[4.8.0]" } }, "Microsoft.EntityFrameworkCore.Abstractions": { @@ -265,11 +258,6 @@ "resolved": "6.0.0", "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA==" }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==" - }, "System.Composition": { "type": "Transitive", "resolved": "7.0.0", @@ -318,47 +306,11 @@ "System.Composition.Runtime": "7.0.0" } }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "jRn6JYnNPW6xgQazROBLSfpdoczRw694vO5kKvMcNnpXuolEixUyw6IBuBs2Y2mlSX/LdLvyyWmfXhaI3ND1Yg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" - }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==", - "dependencies": { - "System.Collections.Immutable": "7.0.0" - } - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==" - }, - "System.Threading.Channels": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "qmeeYNROMsONF6ndEZcIQ+VxR4Q/TX/7uIVLJqtwIWL7dDWeh0l1UIqgo4wYyjG//5lUNhwkLDSFl+pAWO6oiA==" - }, "NetTopologySuite": { "type": "CentralTransitive", "requested": "[2.5.0, )", "resolved": "2.5.0", - "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==", - "dependencies": { - "System.Memory": "4.5.4" - } + "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==" }, "Npgsql": { "type": "CentralTransitive", diff --git a/src/Interfaces/.gitlab-ci.yml b/src/Interfaces/.gitlab-ci.yml index 2a137815..85e8b346 100644 --- a/src/Interfaces/.gitlab-ci.yml +++ b/src/Interfaces/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetPackage.gitlab-ci.yml inputs: project-name: interfaces diff --git a/src/Interfaces/Api/Poseidon.Api.fsproj b/src/Interfaces/Api/Poseidon.Api.fsproj index 99580c4b..369e4430 100644 --- a/src/Interfaces/Api/Poseidon.Api.fsproj +++ b/src/Interfaces/Api/Poseidon.Api.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 true true Poseidon.Api diff --git a/src/Interfaces/Api/packages.lock.json b/src/Interfaces/Api/packages.lock.json index 11cbdd83..874ccbdd 100644 --- a/src/Interfaces/Api/packages.lock.json +++ b/src/Interfaces/Api/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Dapr.Common": { "type": "Transitive", "resolved": "1.16.0", diff --git a/src/Interfaces/Archmaester/Archmaester.Api.fsproj b/src/Interfaces/Archmaester/Archmaester.Api.fsproj index 681d7b11..f1a77bcb 100644 --- a/src/Interfaces/Archmaester/Archmaester.Api.fsproj +++ b/src/Interfaces/Archmaester/Archmaester.Api.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 true Oceanbox.DataAgent.Api diff --git a/src/Interfaces/Atlantis/Atlantis.Api.fsproj b/src/Interfaces/Atlantis/Atlantis.Api.fsproj index 93d98f65..6cb9a781 100644 --- a/src/Interfaces/Atlantis/Atlantis.Api.fsproj +++ b/src/Interfaces/Atlantis/Atlantis.Api.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 1.0.1 diff --git a/src/Interfaces/Hipster/Hipster.Api.fsproj b/src/Interfaces/Hipster/Hipster.Api.fsproj index bbeaa250..8c0a2cbc 100644 --- a/src/Interfaces/Hipster/Hipster.Api.fsproj +++ b/src/Interfaces/Hipster/Hipster.Api.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 1.0.1 diff --git a/src/Interfaces/Petimeter/Petimeter.Api.fsproj b/src/Interfaces/Petimeter/Petimeter.Api.fsproj index 87855c43..592049b6 100644 --- a/src/Interfaces/Petimeter/Petimeter.Api.fsproj +++ b/src/Interfaces/Petimeter/Petimeter.Api.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 diff --git a/src/Interfaces/Sorcerer/Sorcerer.Api.fsproj b/src/Interfaces/Sorcerer/Sorcerer.Api.fsproj index 1f3b4f40..9549c1f1 100644 --- a/src/Interfaces/Sorcerer/Sorcerer.Api.fsproj +++ b/src/Interfaces/Sorcerer/Sorcerer.Api.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 true Sorcerer.Api diff --git a/src/ServerPack/.gitlab-ci.yml b/src/ServerPack/.gitlab-ci.yml index 81c2f080..fdfbc20c 100644 --- a/src/ServerPack/.gitlab-ci.yml +++ b/src/ServerPack/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetPackage.gitlab-ci.yml inputs: project-name: serverpack diff --git a/src/ServerPack/src/Oceanbox.ServerPack.fsproj b/src/ServerPack/src/Oceanbox.ServerPack.fsproj index e87f3475..e371c6a3 100644 --- a/src/ServerPack/src/Oceanbox.ServerPack.fsproj +++ b/src/ServerPack/src/Oceanbox.ServerPack.fsproj @@ -2,7 +2,7 @@ Library - net9.0 + net10.0 Oceanbox.ServerPack 1.39.1 true diff --git a/src/ServerPack/src/packages.lock.json b/src/ServerPack/src/packages.lock.json index df1b6949..e3cb8995 100644 --- a/src/ServerPack/src/packages.lock.json +++ b/src/ServerPack/src/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Azure.Extensions.AspNetCore.DataProtection.Blobs": { "type": "Direct", "requested": "[1.5.0, )", @@ -34,9 +34,7 @@ "dependencies": { "Azure.Core": "1.44.1", "Microsoft.Identity.Client": "4.67.2", - "Microsoft.Identity.Client.Extensions.Msal": "4.67.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" + "Microsoft.Identity.Client.Extensions.Msal": "4.67.2" } }, "Dapr.Actors": { @@ -151,8 +149,7 @@ "resolved": "1.3.13", "contentHash": "znp8odpdkVGKVX0AvbhiXdmeMi0KJ+A4AyAQWSkfAEAe4Z4clRE+rVhrLnAGrFD1VEIUX2lsQ4o84ywpWZUSGw==", "dependencies": { - "FSharp.Core": "4.7.0", - "System.Text.Json": "6.0.0" + "FSharp.Core": "4.7.0" } }, "FSharpPlus": { @@ -209,8 +206,7 @@ "contentHash": "vlOKvmigJ3Sumoulp1HwCTFXgX4KuERVGIIw4ZqmhgUJnSiApDmY183ddzzHo2FIdIJ8vGwrMGx98v9cLAezFA==", "dependencies": { "Microsoft.Extensions.Http": "9.0.9", - "System.ComponentModel.Annotations": "5.0.0", - "System.Diagnostics.DiagnosticSource": "9.0.9" + "System.ComponentModel.Annotations": "5.0.0" } }, "Saturn": { @@ -278,12 +274,7 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "System.ClientModel": "1.1.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "6.0.0", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory.Data": "6.0.0" } }, "Azure.Security.KeyVault.Keys": { @@ -291,10 +282,7 @@ "resolved": "4.6.0", "contentHash": "1KbCIkXmLaj+kDDNm1Va5rNlzgcJ/fVtnsoVmzZPKa38jz6DXhPyojdvGaOX8AdupGJceg0X1vrsGvZKN79Qzw==", "dependencies": { - "Azure.Core": "1.37.0", - "System.Memory": "4.5.4", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.37.0" } }, "Azure.Storage.Blobs": { @@ -302,8 +290,7 @@ "resolved": "12.23.0", "contentHash": "wokJ5KX/iViQQ32xyCu69+Ter0aR4B9QQ+oR9NCpc/WPIanxnDErrmFfdmE7K8ZdccjHkvE/wEnqJxaF1+5wFg==", "dependencies": { - "Azure.Storage.Common": "12.22.0", - "System.Text.Json": "6.0.10" + "Azure.Storage.Common": "12.22.0" } }, "Azure.Storage.Common": { @@ -654,8 +641,7 @@ "resolved": "4.67.2", "contentHash": "37t0TfekfG6XM8kue/xNaA66Qjtti5Qe1xA41CK+bEd8VD76/oXJc+meFJHGzygIC485dCpKoamG/pDfb9Qd7Q==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "6.35.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { @@ -731,10 +717,7 @@ "OpenTelemetry.Api": { "type": "Transitive", "resolved": "1.10.0", - "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "9.0.0" - } + "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==" }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", @@ -815,17 +798,13 @@ "dependencies": { "Microsoft.Extensions.Options": "9.0.0", "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.10.0, 2.0.0)", - "StackExchange.Redis": "[2.6.122, 3.0.0)", - "System.Reflection.Emit.Lightweight": "4.7.0" + "StackExchange.Redis": "[2.6.122, 3.0.0)" } }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==" }, "Sentry": { "type": "Transitive", @@ -857,8 +836,7 @@ "resolved": "1.1.0", "contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "6.0.9" + "System.Memory.Data": "1.0.2" } }, "System.ComponentModel.Annotations": { @@ -866,11 +844,6 @@ "resolved": "5.0.0", "contentHash": "dMkqfy2el8A8/I76n2Hi1oBFEbG1SfxD2l5nhwXV3XjlnOmwxJlQbYpJH4W51odnU9sARCSAgv7S3CyAFMkpYg==" }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "9.0.9", - "contentHash": "8hy61dsFYYSDjT9iTAfygGMU3A0EAnG69x5FUXeKsCjMhBmtTBt4UMUEW3ipprFoorOW6Jw/7hDMjXtlrsOvVQ==" - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "8.0.1", @@ -885,33 +858,10 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" - }, "System.Memory.Data": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==", - "dependencies": { - "System.Text.Json": "6.0.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA==" + "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==" }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", @@ -931,19 +881,6 @@ "System.Security.Cryptography.Pkcs": "9.0.2" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.3", - "contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "Fable.Core": { "type": "CentralTransitive", "requested": "[4.4.0, )", @@ -962,8 +899,7 @@ "FSharp.Core": "6.0.0", "Giraffe.ViewEngine": "1.4.0", "Microsoft.IO.RecyclableMemoryStream": "3.0.0", - "Newtonsoft.Json": "13.0.3", - "System.Text.Json": "8.0.3" + "Newtonsoft.Json": "13.0.3" } }, "Newtonsoft.Json": { @@ -971,12 +907,6 @@ "requested": "[13.0.3, )", "resolved": "13.0.3", "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" - }, - "System.Text.Encodings.Web": { - "type": "CentralTransitive", - "requested": "[9.0.2, )", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/src/Sorcerer/.gitlab-ci.yml b/src/Sorcerer/.gitlab-ci.yml index cc9c9f5f..9444e76d 100644 --- a/src/Sorcerer/.gitlab-ci.yml +++ b/src/Sorcerer/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: include: - project: oceanbox/gitlab-ci - ref: v4.4 + ref: v4.5 file: DotnetDeployment.gitlab-ci.yml inputs: project-name: sorcerer diff --git a/src/Sorcerer/Dockerfile b/src/Sorcerer/Dockerfile index e5a3e365..d5ecda21 100644 --- a/src/Sorcerer/Dockerfile +++ b/src/Sorcerer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 RUN apt-get update \ && apt-get install -y libsqlite3-dev gcc-multilib libnetcdf19 libnetcdf-dev diff --git a/src/Sorcerer/src/Client/Client.fsproj b/src/Sorcerer/src/Client/Client.fsproj index 6616c1b8..ee340e4d 100644 --- a/src/Sorcerer/src/Client/Client.fsproj +++ b/src/Sorcerer/src/Client/Client.fsproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 FABLE_COMPILER true 4.18.0 diff --git a/src/Sorcerer/src/Server/Sorcerer.fsproj b/src/Sorcerer/src/Server/Sorcerer.fsproj index 59511ce4..c3161128 100644 --- a/src/Sorcerer/src/Server/Sorcerer.fsproj +++ b/src/Sorcerer/src/Server/Sorcerer.fsproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 true 4.18.0 diff --git a/src/Sorcerer/src/Server/packages.lock.json b/src/Sorcerer/src/Server/packages.lock.json index 56bdc710..f2dfaaf8 100644 --- a/src/Sorcerer/src/Server/packages.lock.json +++ b/src/Sorcerer/src/Server/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Argu": { "type": "Direct", "requested": "[6.2.5, )", @@ -44,9 +44,7 @@ "dependencies": { "Azure.Core": "1.44.1", "Microsoft.Identity.Client": "4.67.2", - "Microsoft.Identity.Client.Extensions.Msal": "4.67.2", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" + "Microsoft.Identity.Client.Extensions.Msal": "4.67.2" } }, "Azure.Security.KeyVault.Secrets": { @@ -55,10 +53,7 @@ "resolved": "4.7.0", "contentHash": "uOPCojkm41V4dKTORyGzl3/f/lriKpxSQ43fWDn4StRJBVmbF1F/DNWJhwm207kCnqgE/W9+tskJSimIKHCZkw==", "dependencies": { - "Azure.Core": "1.44.1", - "System.Memory": "4.5.5", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.44.1" } }, "Dapr.Actors": { @@ -218,8 +213,7 @@ "FSharp.Core": "6.0.0", "FSharp.SystemTextJson": "1.3.13", "Giraffe.ViewEngine": "1.4.0", - "Microsoft.IO.RecyclableMemoryStream": "3.0.1", - "System.Text.Json": "8.0.5" + "Microsoft.IO.RecyclableMemoryStream": "3.0.1" } }, "IdentityModel.AspNetCore": { @@ -425,12 +419,7 @@ "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "6.0.0", "System.ClientModel": "1.1.0", - "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "6.0.0", - "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "6.0.0", - "System.Text.Json": "6.0.10", - "System.Threading.Tasks.Extensions": "4.5.4" + "System.Memory.Data": "6.0.0" } }, "Azure.Security.KeyVault.Keys": { @@ -438,10 +427,7 @@ "resolved": "4.6.0", "contentHash": "1KbCIkXmLaj+kDDNm1Va5rNlzgcJ/fVtnsoVmzZPKa38jz6DXhPyojdvGaOX8AdupGJceg0X1vrsGvZKN79Qzw==", "dependencies": { - "Azure.Core": "1.37.0", - "System.Memory": "4.5.4", - "System.Text.Json": "4.7.2", - "System.Threading.Tasks.Extensions": "4.5.4" + "Azure.Core": "1.37.0" } }, "Azure.Storage.Blobs": { @@ -449,8 +435,7 @@ "resolved": "12.23.0", "contentHash": "wokJ5KX/iViQQ32xyCu69+Ter0aR4B9QQ+oR9NCpc/WPIanxnDErrmFfdmE7K8ZdccjHkvE/wEnqJxaF1+5wFg==", "dependencies": { - "Azure.Storage.Common": "12.22.0", - "System.Text.Json": "6.0.10" + "Azure.Storage.Common": "12.22.0" } }, "Azure.Storage.Common": { @@ -594,8 +579,7 @@ "resolved": "5.3.2", "contentHash": "LFtxXpQNor8az1ez3rN9oz2cqf/06i9yTrPyJ9R83qLEpFAU7Of0WL2hoSXzLHer4lh+6mO1NV4VQFiBzNRtjw==", "dependencies": { - "FSharp.Core": "4.3.2", - "System.Reflection.Emit.Lightweight": "4.3.0" + "FSharp.Core": "4.3.2" } }, "Giraffe.ViewEngine": { @@ -716,8 +700,7 @@ "resolved": "2.2.0", "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.2.0", - "System.Text.Encodings.Web": "4.5.0" + "Microsoft.AspNetCore.Http.Features": "2.2.0" } }, "Microsoft.AspNetCore.Http.Features": { @@ -733,8 +716,7 @@ "resolved": "2.2.0", "contentHash": "9ErxAAKaDzxXASB/b5uLEkLgUWv1QbeVxyJYEHQwMaxXOeFFVkQxiq8RyfVcifLU7NR0QY0p3acqx4ZpYfhHDg==", "dependencies": { - "Microsoft.Net.Http.Headers": "2.2.0", - "System.Text.Encodings.Web": "4.5.0" + "Microsoft.Net.Http.Headers": "2.2.0" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -936,8 +918,7 @@ "resolved": "4.67.2", "contentHash": "37t0TfekfG6XM8kue/xNaA66Qjtti5Qe1xA41CK+bEd8VD76/oXJc+meFJHGzygIC485dCpKoamG/pDfb9Qd7Q==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "6.35.0", - "System.Diagnostics.DiagnosticSource": "6.0.1" + "Microsoft.IdentityModel.Abstractions": "6.35.0" } }, "Microsoft.Identity.Client.Extensions.Msal": { @@ -1005,8 +986,7 @@ "resolved": "2.2.0", "contentHash": "iZNkjYqlo8sIOI0bQfpsSoMTmB/kyvmV2h225ihyZT33aTp48ZpF6qYnXxzSXmHt8DpBAwBTX+1s1UFLbYfZKg==", "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0", - "System.Buffers": "4.5.0" + "Microsoft.Extensions.Primitives": "2.2.0" } }, "Microsoft.NET.StringTools": { @@ -1035,10 +1015,7 @@ "OpenTelemetry.Api": { "type": "Transitive", "resolved": "1.10.0", - "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "9.0.0" - } + "contentHash": "HcmxppwGFna1oY8cLX6hZ/nU1dw07UutfOVCltrbVE3RNYwRD7qFdQRtQQAoKZnbXE9yW4QMdtohcLClNFOk8w==" }, "OpenTelemetry.Api.ProviderBuilderExtensions": { "type": "Transitive", @@ -1119,26 +1096,18 @@ "dependencies": { "Microsoft.Extensions.Options": "9.0.0", "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.10.0, 2.0.0)", - "StackExchange.Redis": "[2.6.122, 3.0.0)", - "System.Reflection.Emit.Lightweight": "4.7.0" + "StackExchange.Redis": "[2.6.122, 3.0.0)" } }, "Pipelines.Sockets.Unofficial": { "type": "Transitive", "resolved": "2.2.8", - "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==", - "dependencies": { - "System.IO.Pipelines": "5.0.1" - } + "contentHash": "zG2FApP5zxSx6OcdJQLbZDk2AVlN2BNQD6MorwIfV6gVj0RRxWPEp2LXAxqDGZqeNV1Zp0BNPcNaey/GXmTdvQ==" }, "ProjNET": { "type": "Transitive", "resolved": "2.0.0", - "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Numerics.Vectors": "4.5.0" - } + "contentHash": "iMJG8qpGJ8SjFrB044O8wgo0raAWCdG1Bvly0mmVcjzsrexDHhC+dUct6Wb1YwQtupMBjSTWq7Fn00YeNErprA==" }, "prometheus-net": { "type": "Transitive", @@ -1238,18 +1207,12 @@ "Pipelines.Sockets.Unofficial": "2.2.8" } }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" - }, "System.ClientModel": { "type": "Transitive", "resolved": "1.1.0", "contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==", "dependencies": { - "System.Memory.Data": "1.0.2", - "System.Text.Json": "6.0.9" + "System.Memory.Data": "1.0.2" } }, "System.ComponentModel.Annotations": { @@ -1265,11 +1228,6 @@ "System.Security.Cryptography.ProtectedData": "4.4.0" } }, - "System.Diagnostics.DiagnosticSource": { - "type": "Transitive", - "resolved": "9.0.9", - "contentHash": "8hy61dsFYYSDjT9iTAfygGMU3A0EAnG69x5FUXeKsCjMhBmtTBt4UMUEW3ipprFoorOW6Jw/7hDMjXtlrsOvVQ==" - }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", "resolved": "8.0.1", @@ -1284,38 +1242,10 @@ "resolved": "6.0.0", "contentHash": "Rfm2jYCaUeGysFEZjDe7j1R4x6Z6BzumS/vUT5a1AA/AWJuGX71PoGB0RmpyX3VmrGqVnAwtfMn39OHR8Y/5+g==" }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "qEePWsaq9LoEEIqhbGe6D5J8c9IqQOUuTzzV6wn1POlfdLkJliZY3OlB0j0f17uMWlqZYjH7txj+2YbyrIA8Yg==" - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" - }, "System.Memory.Data": { "type": "Transitive", "resolved": "6.0.0", - "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==", - "dependencies": { - "System.Text.Json": "6.0.0" - } - }, - "System.Numerics.Vectors": { - "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.7.0", - "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==" }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", @@ -1335,16 +1265,6 @@ "System.Security.Cryptography.Pkcs": "9.0.2" } }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" - }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "entity": { "type": "Project", "dependencies": { @@ -1461,8 +1381,7 @@ "resolved": "1.3.13", "contentHash": "znp8odpdkVGKVX0AvbhiXdmeMi0KJ+A4AyAQWSkfAEAe4Z4clRE+rVhrLnAGrFD1VEIUX2lsQ4o84ywpWZUSGw==", "dependencies": { - "FSharp.Core": "4.7.0", - "System.Text.Json": "6.0.0" + "FSharp.Core": "4.7.0" } }, "Microsoft.AspNetCore.Authentication.JwtBearer": { @@ -1502,10 +1421,7 @@ "type": "CentralTransitive", "requested": "[2.5.0, )", "resolved": "2.5.0", - "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==", - "dependencies": { - "System.Memory": "4.5.4" - } + "contentHash": "5/+2O2ADomEdUn09mlSigACdqvAf0m/pVPGtIPEPQWnyrVykYY0NlfXLIdkMgi41kvH9kNrPqYaFBTZtHYH7Xw==" }, "Npgsql": { "type": "CentralTransitive", @@ -1564,8 +1480,7 @@ "contentHash": "vlOKvmigJ3Sumoulp1HwCTFXgX4KuERVGIIw4ZqmhgUJnSiApDmY183ddzzHo2FIdIJ8vGwrMGx98v9cLAezFA==", "dependencies": { "Microsoft.Extensions.Http": "9.0.9", - "System.ComponentModel.Annotations": "5.0.0", - "System.Diagnostics.DiagnosticSource": "9.0.9" + "System.ComponentModel.Annotations": "5.0.0" } }, "ProjNet.FSharp": { @@ -1588,15 +1503,6 @@ "dependencies": { "Serilog": "4.0.0" } - }, - "System.Text.Encodings.Web": { - "type": "CentralTransitive", - "requested": "[9.0.2, )", - "resolved": "6.0.0", - "contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } } } }