From 52230847b4b0a7b7d97f91e52a0d47266bb818a6 Mon Sep 17 00:00:00 2001
From: Tomasz Cielecki <249719+Cheesebaron@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:54:36 +0100
Subject: [PATCH 1/3] Update build pipeline for .NET 9
---
.github/workflows/build.yml | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4792d9..56b94e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,27 +2,39 @@ name: CI
on: [push]
+env:
+ JAVA_DISTRIBUTION: 'microsoft'
+ JAVA_VERSION: 17
+ NET_VERSION: 9.0.200
+
jobs:
build:
runs-on: windows-latest
steps:
- - uses: actions/checkout@v1
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ fetch-tags: true
- - name: Setup Java JDK
- uses: actions/setup-java@v4
+ - name: Install .NET ${{ env.NET_VERSION }}
+ uses: actions/setup-dotnet@v4
with:
- distribution: 'microsoft'
- java-version: '17'
+ dotnet-version: ${{ env.NET_VERSION }}
- - name: Setup .NET 8
- uses: actions/setup-dotnet@v1
+ - name: Set up JDK
+ uses: actions/setup-java@v4
with:
- dotnet-version: 8.0.x
+ distribution: ${{ env.JAVA_DISTRIBUTION }}
+ java-version: ${{ env.JAVA_VERSION }}
+
+ - name: Restore .NET tools
+ run: dotnet tool restore
- name: Install workload
- run: dotnet workload install android
+ run: dotnet workload install android --version ${{ env.NET_VERSION }}
- name: Restore dotnet tools
run: dotnet tool restore
From 5b328e0a10cac5eeaa15d73fe884b4a8d6889b81 Mon Sep 17 00:00:00 2001
From: Tomasz Cielecki <249719+Cheesebaron@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:54:36 +0100
Subject: [PATCH 2/3] Update cake
---
.config/dotnet-tools.json | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index da200cd..b6554f3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,10 +3,11 @@
"isRoot": true,
"tools": {
"cake.tool": {
- "version": "4.0.0",
+ "version": "5.0.0",
"commands": [
"dotnet-cake"
- ]
+ ],
+ "rollForward": false
}
}
}
\ No newline at end of file
From c3cf0cf1f4d5d57a3ac7a5e069e8003bb6ff0831 Mon Sep 17 00:00:00 2001
From: Tomasz Cielecki <249719+Cheesebaron@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:54:36 +0100
Subject: [PATCH 3/3] Add .NET 9.0 TFM remove .NET 7.0
---
AndHUD/AndHUD.csproj | 4 ++--
Sample/Sample.csproj | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/AndHUD/AndHUD.csproj b/AndHUD/AndHUD.csproj
index 4f8856c..a58481a 100644
--- a/AndHUD/AndHUD.csproj
+++ b/AndHUD/AndHUD.csproj
@@ -1,6 +1,6 @@
- net7.0-android;net8.0-android
+ net8.0-android;net9.0-android
AndHUD
AndroidHUD
AndHUD
@@ -19,4 +19,4 @@
-
\ No newline at end of file
+
diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
index 32d540c..c25f976 100644
--- a/Sample/Sample.csproj
+++ b/Sample/Sample.csproj
@@ -1,6 +1,6 @@
- net8.0-android
+ net9.0-android
Exe
22
enable
@@ -20,4 +20,4 @@
-
\ No newline at end of file
+