From 2ba5a11cc34de86edf691bd00b49bbfecea06f21 Mon Sep 17 00:00:00 2001 From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com> Date: Tue, 17 Dec 2024 00:36:57 +0000 Subject: [PATCH] Bump sdk (#114) --- .github/dependabot.yml | 24 +-- .github/workflows/dotnet.yaml | 17 +- .../Gitea.Declarative.Lib.fsproj | 8 +- .../Gitea.Declarative.Test.fsproj | 3 +- Gitea.Declarative/Gitea.Declarative.fsproj | 2 +- flake.lock | 6 +- flake.nix | 6 +- nix/deps.nix | 192 ++++++------------ 8 files changed, 101 insertions(+), 157 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fd5f7e9..6cd016a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,12 +1,12 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index 6879f04..ca7baf1 100644 --- a/.github/workflows/dotnet.yaml +++ b/.github/workflows/dotnet.yaml @@ -27,16 +27,17 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 # so that NerdBank.GitVersioning has access to history - - name: Setup .NET - uses: actions/setup-dotnet@v4 + - name: Install Nix + uses: cachix/install-nix-action@v30 with: - dotnet-version: 7.0.x + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - name: Restore dependencies - run: dotnet restore + run: nix develop --command dotnet restore - name: Build - run: dotnet build --no-restore --configuration ${{matrix.config}} + run: nix develop --command dotnet build --no-restore --configuration ${{matrix.config}} - name: Test - run: dotnet test --no-build --verbosity normal --configuration ${{matrix.config}} + run: nix develop --command dotnet test --no-build --verbosity normal --configuration ${{matrix.config}} build-nix: runs-on: ubuntu-latest @@ -107,10 +108,10 @@ jobs: run: 'nix develop --command markdown-link-check {,**/}*.md' all-required-checks-complete: - if: ${{ always() }} needs: [check-dotnet-format, check-nix-format, build, build-nix, linkcheck, check-flake] + if: ${{ always() }} runs-on: ubuntu-latest steps: - - uses: Smaug123/all-required-checks-complete-action@05b40a8c47ef0b175ea326e9abb09802cb67b44e + - uses: G-Research/common-actions/check-required-lite@2b7dc49cb14f3344fbe6019c14a31165e258c059 with: needs-context: ${{ toJSON(needs) }} diff --git a/Gitea.Declarative.Lib/Gitea.Declarative.Lib.fsproj b/Gitea.Declarative.Lib/Gitea.Declarative.Lib.fsproj index 829e80c..748e75f 100644 --- a/Gitea.Declarative.Lib/Gitea.Declarative.Lib.fsproj +++ b/Gitea.Declarative.Lib/Gitea.Declarative.Lib.fsproj @@ -14,8 +14,7 @@ git MIT gitea - - 3.1.1 + 4.0.9 @@ -52,8 +51,11 @@ - + + + + diff --git a/Gitea.Declarative.Test/Gitea.Declarative.Test.fsproj b/Gitea.Declarative.Test/Gitea.Declarative.Test.fsproj index 4ae0fee..109c419 100644 --- a/Gitea.Declarative.Test/Gitea.Declarative.Test.fsproj +++ b/Gitea.Declarative.Test/Gitea.Declarative.Test.fsproj @@ -1,8 +1,9 @@ - net8.0 + net9.0 false + false diff --git a/Gitea.Declarative/Gitea.Declarative.fsproj b/Gitea.Declarative/Gitea.Declarative.fsproj index 3a9991c..79bee98 100644 --- a/Gitea.Declarative/Gitea.Declarative.fsproj +++ b/Gitea.Declarative/Gitea.Declarative.fsproj @@ -1,7 +1,7 @@ Exe - net8.0 + net9.0 true Gitea.Declarative Patrick Stevens diff --git a/flake.lock b/flake.lock index 988f085..27e124c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733935885, - "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=", + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5890dc1..4fc5734 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,8 @@ projectFile = "./Gitea.Declarative/Gitea.Declarative.fsproj"; testProjectFile = "./Gitea.Declarative.Test/Gitea.Declarative.Test.fsproj"; pname = "gitea-repo-config"; - dotnet-sdk = pkgs.dotnet-sdk_8; - dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0; + dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0; + dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0; version = "0.1"; dotnetTool = toolName: toolVersion: hash: pkgs.stdenvNoCC.mkDerivation rec { @@ -29,7 +29,7 @@ pname = name; version = version; hash = hash; - installPhase = ''mkdir -p $out/bin && cp -r tools/net6.0/any/* $out/bin''; + installPhase = ''mkdir -p $out/bin && cp -r tools/*/any/* $out/bin''; }; installPhase = '' runHook preInstall diff --git a/nix/deps.nix b/nix/deps.nix index 09ff7eb..134b8de 100644 --- a/nix/deps.nix +++ b/nix/deps.nix @@ -26,6 +26,41 @@ version = "2.16.6"; hash = "sha256-1hR2SaJTkqBzU3D955MvLNVzkQHkx0Z/QzOXZfzk2Zw="; }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.2.3"; + hash = "sha256-yMGMrMUY+4Lwnh9JIbD2/3FBGIFcSK7leGURWaSQsLQ="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.3.2"; + hash = "sha256-UuzjOUvDAWxQuwI9mMJ5Jd9mwtfYSK7KUhW8wNbbZak="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.3.4"; + hash = "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.5.0"; + hash = "sha256-7+B+8rsm/dMKvNBty8z5qB+kOxMwUzExy0F04xM88sk="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.7.0"; + hash = "sha256-7aa4bga9XWLkq7J5KXv8Bilf1KGum77lSUqp+ooYIUg="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "4.7.2"; + hash = "sha256-1eDe16w8+syA35AtrSiViMHQYgwBqmdViS4yCa4AMZ8="; + }) + (fetchNuGet { + pname = "FSharp.Core"; + version = "5.0.2"; + hash = "sha256-YOoosLEiszPsOOaNAkWhFGU04JJKDOFVoA/ggrZMN10="; + }) (fetchNuGet { pname = "FSharp.Core"; version = "6.0.1"; @@ -33,8 +68,8 @@ }) (fetchNuGet { pname = "FSharp.Core"; - version = "8.0.403"; - hash = "sha256-3XSQp7JUOU5T6gvSQXNfBF4t4gaX4J4xushH+cfM9mE="; + version = "9.0.100"; + hash = "sha256-V1q3CjbRvWZqxpi6cXD/R0F7pyXGGtH83M5Z/ITDrp8="; }) (fetchNuGet { pname = "FSharp.SystemTextJson"; @@ -201,11 +236,6 @@ version = "6.0.36"; hash = "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs="; }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; - }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; @@ -216,11 +246,6 @@ version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; }) - (fetchNuGet { - pname = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; - }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; @@ -296,6 +321,11 @@ version = "10.9.0"; hash = "sha256-7RPZmR8k9zKKMjnIx0Ci2TvQ9iYfN1moxHXQfTp7O5Q="; }) + (fetchNuGet { + pname = "NUnit"; + version = "4.0.1"; + hash = "sha256-jd1CD5nHVXkpvBNpVDJcJyfTggCHLyDBySVSvtrA8Uk="; + }) (fetchNuGet { pname = "NUnit"; version = "4.1.0"; @@ -311,11 +341,6 @@ version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) - (fetchNuGet { - pname = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; - }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; @@ -386,31 +411,16 @@ version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) - (fetchNuGet { - pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; - }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; }) - (fetchNuGet { - pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; - }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; }) - (fetchNuGet { - pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; - }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; @@ -441,21 +451,11 @@ version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; }) - (fetchNuGet { - pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; - }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; }) - (fetchNuGet { - pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; - }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; @@ -466,51 +466,26 @@ version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) - (fetchNuGet { - pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; - }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; }) - (fetchNuGet { - pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; - }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; }) - (fetchNuGet { - pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; - }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; }) - (fetchNuGet { - pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; - }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; }) - (fetchNuGet { - pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; - }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; @@ -596,11 +571,6 @@ version = "7.0.0"; hash = "sha256-9Wk8cHSkjKtqkN6xW7KnXoQVtF/VNbKeBq79WqDesMs="; }) - (fetchNuGet { - pname = "System.Diagnostics.Tools"; - version = "4.0.1"; - hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; - }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; @@ -646,21 +616,11 @@ version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { - pname = "System.IO.FileSystem"; - version = "4.0.1"; - hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; - }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) - (fetchNuGet { - pname = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; - }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; @@ -716,6 +676,11 @@ version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { + pname = "System.Private.Uri"; + version = "4.3.2"; + hash = "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="; + }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; @@ -726,31 +691,16 @@ version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { - pname = "System.Reflection.Emit"; - version = "4.0.1"; - hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; - }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) - (fetchNuGet { - pname = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; - }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { - pname = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; - }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; @@ -771,21 +721,11 @@ version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) - (fetchNuGet { - pname = "System.Reflection.Primitives"; - version = "4.0.1"; - hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; - }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { - pname = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; - }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; @@ -831,21 +771,11 @@ version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { - pname = "System.Runtime.Handles"; - version = "4.0.1"; - hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; - }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { - pname = "System.Runtime.InteropServices"; - version = "4.1.0"; - hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; - }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; @@ -931,6 +861,11 @@ version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "6.0.0"; + hash = "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="; + }) (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; @@ -966,11 +901,6 @@ version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { - pname = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; - }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; @@ -981,14 +911,24 @@ version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) + (fetchNuGet { + pname = "TypeEquality"; + version = "0.3.0"; + hash = "sha256-V50xAOzzyUJrY+MYPRxtnqW5MVeATXCes89wPprv1r4="; + }) (fetchNuGet { pname = "WoofWare.Myriad.Plugins"; - version = "3.1.1"; - hash = "sha256-kAQCi6zyFxPfDOIXn3dKg4M9wJYCpW7/Z8Ic7+yuFNg="; + version = "4.0.9"; + hash = "sha256-VWpStkuvdFZWsEs/tC0mjChneFgxWw+1YETH+3aCoz4="; }) (fetchNuGet { pname = "WoofWare.Myriad.Plugins.Attributes"; - version = "3.6.2"; - hash = "sha256-Z8j9it7dC9i/SuKo133KZywBkzHL7JtAWFojA1jLpAc="; + version = "3.6.6"; + hash = "sha256-68T5JQNp4V0DDad0I3snVh8BCe7rz11mLyvm60hxwaA="; + }) + (fetchNuGet { + pname = "WoofWare.Whippet.Fantomas"; + version = "0.3.1"; + hash = "sha256-i5oiqcrxzM90Ocuq5MIu2Ha5lV0aYu5nCvuwmFqp6NA="; }) ]