Merge pull request #96 from Lemon73-Computing/lemon73/bump-dependencies

bump dependencies
jsuarezruiz · Dec 4, 2024 · 0c1dbde · 0c1dbde
2 parents e410833 + 9c2cf4c
commit 0c1dbde
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-gtk.yml b/.github/workflows/build-gtk.yml
@@ -4,24 +4,26 @@ on: [push, pull_request]
 jobs:
   build_and_test:
     name: Build & Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       GtkSharpVersion: 3.24.24.117-develop
       GtkSharpManifestVersion: 8.0.200
       DotnetVersion: 8.0.200
     steps:
       - name: Checkout MAUI repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Setup .NET SDK ${{ env.DotnetVersion }}
-        uses: actions/setup-dotnet@v1.7.2
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DotnetVersion }}
+
       - name: Install gtk workload
         run: |
             # For some reason automatic workload manifest detection doesn't work (see https://github.com/GtkSharp/GtkSharp/issues/355#issuecomment-1446262239), so download and uzip mainfest file manually
             dotnet nuget add source --name nuget.org "https://api.nuget.org/v3/index.json"
             wget https://www.nuget.org/api/v2/package/gtksharp.net.sdk.gtk.manifest-${{ env.GtkSharpManifestVersion }}/$GtkSharpVersion -O gtksharp.net.sdk.gtk.manifest-${{ env.GtkSharpManifestVersion }}.nupkg            
-            DOTNET_DIR=/home/runner/.dotnet
+            DOTNET_DIR=/usr/share/dotnet
             WORKLOAD_MANIFEST_DIR=$DOTNET_DIR/sdk-manifests/${{ env.DotnetVersion }}/gtksharp.net.sdk.gtk
             mkdir -p $WORKLOAD_MANIFEST_DIR
             unzip -j gtksharp.net.sdk.gtk.manifest-${{ env.GtkSharpManifestVersion }}.nupkg "data/*" -d $WORKLOAD_MANIFEST_DIR/
@@ -37,14 +39,13 @@ jobs:
 
   dotnet-format:
     needs: build_and_test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Run dotnet format
         run: |
           # remark: doesnt work, alwasy fails:
           # dotnet format whitespace ./src --folder --exclude Templates/src
           git diff --exit-code
-
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -6,7 +6,7 @@
     <MicrosoftDotnetSdkInternalPackageVersion>8.0.100</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>8.0.0</MicrosoftNETCoreAppRefPackageVersion>
-    <SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
+    <SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
     <SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
     <!-- Microsoft/Extensions -->