Skip to content

Commit 0c1dbde

Browse files
authored
Merge pull request #96 from Lemon73-Computing/lemon73/bump-dependencies
bump dependencies
2 parents e410833 + 9c2cf4c commit 0c1dbde

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/build-gtk.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,26 @@ on: [push, pull_request]
44
jobs:
55
build_and_test:
66
name: Build & Test
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-24.04
88
env:
99
GtkSharpVersion: 3.24.24.117-develop
1010
GtkSharpManifestVersion: 8.0.200
1111
DotnetVersion: 8.0.200
1212
steps:
1313
- name: Checkout MAUI repo
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
15+
1516
- name: Setup .NET SDK ${{ env.DotnetVersion }}
16-
uses: actions/setup-dotnet@v1.7.2
17+
uses: actions/setup-dotnet@v4
1718
with:
1819
dotnet-version: ${{ env.DotnetVersion }}
20+
1921
- name: Install gtk workload
2022
run: |
2123
# 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
2224
dotnet nuget add source --name nuget.org "https://api.nuget.org/v3/index.json"
2325
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
24-
DOTNET_DIR=/home/runner/.dotnet
26+
DOTNET_DIR=/usr/share/dotnet
2527
WORKLOAD_MANIFEST_DIR=$DOTNET_DIR/sdk-manifests/${{ env.DotnetVersion }}/gtksharp.net.sdk.gtk
2628
mkdir -p $WORKLOAD_MANIFEST_DIR
2729
unzip -j gtksharp.net.sdk.gtk.manifest-${{ env.GtkSharpManifestVersion }}.nupkg "data/*" -d $WORKLOAD_MANIFEST_DIR/
@@ -37,14 +39,13 @@ jobs:
3739
3840
dotnet-format:
3941
needs: build_and_test
40-
runs-on: ubuntu-22.04
42+
runs-on: ubuntu-24.04
4143
steps:
4244
- name: Checkout repo
43-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
4446

4547
- name: Run dotnet format
4648
run: |
4749
# remark: doesnt work, alwasy fails:
4850
# dotnet format whitespace ./src --folder --exclude Templates/src
4951
git diff --exit-code
50-

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100</MicrosoftDotnetSdkInternalPackageVersion>
77
<!-- dotnet/runtime -->
88
<MicrosoftNETCoreAppRefPackageVersion>8.0.0</MicrosoftNETCoreAppRefPackageVersion>
9-
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
9+
<SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
1010
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
1111
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
1212
<!-- Microsoft/Extensions -->

0 commit comments

Comments
 (0)