From b72d1e07f6aa81955f1cc9e9541a1082709b8b97 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Sun, 12 Apr 2026 11:23:14 +0200 Subject: [PATCH 1/4] bump net9.0 -> net10.0 --- .github/workflows/main.yml | 16 ++++++++-------- Directory.Build.props | 2 +- global.json | 2 +- sample/APES.MAUI.Sample.csproj | 8 ++++---- sample/run.sh | 2 +- src/APES.MAUI.csproj | 22 +++++++++++----------- tests/ui/android/AppiumSetup.cs | 2 +- tests/ui/android/UITests.Android.csproj | 2 +- tests/ui/android/test.sh | 4 ++-- tests/ui/ios/AppiumSetup.cs | 2 +- tests/ui/ios/UITests.iOS.csproj | 2 +- tests/ui/shared/UITests.Shared.csproj | 2 +- tests/ui/windows/AppiumSetup.cs | 2 +- tests/ui/windows/UITests.Windows.csproj | 2 +- tests/unit/unit.csproj | 6 +++--- 15 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7095a1a..d8ec0a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,15 +40,15 @@ jobs: name: packages path: ${{ env.RESULT_DIR }} - name: Build Android APK - run: dotnet publish sample -c Release -f net9.0-android -p:RunAOTCompilation=true -p:AndroidPackageFormat=apk + run: dotnet publish sample -c Release -f net10.0-android -p:RunAOTCompilation=true -p:AndroidPackageFormat=apk - name: Upload Android APK artifact uses: actions/upload-artifact@v4 with: name: android-apk - path: sample/bin/Release/net9.0-android/publish + path: sample/bin/Release/net10.0-android/publish - name: Build Android Test Runner - run: dotnet publish tests/ui/android/UITests.Android.csproj -c Release -f net9.0 -o android-test-runner + run: dotnet publish tests/ui/android/UITests.Android.csproj -c Release -f net10.0 -o android-test-runner - name: Upload Android Test Runner artifact uses: actions/upload-artifact@v4 @@ -57,14 +57,14 @@ jobs: path: android-test-runner - name: Build Windows sample run: - dotnet publish sample -f net9.0-windows10.0.19041.0 -r win-x64 -p:WindowsPackageType=None -p:UseMonoRuntime=false -o windows-app + dotnet publish sample -f net10.0-windows10.0.19041.0 -r win-x64 -p:WindowsPackageType=None -p:UseMonoRuntime=false -o windows-app - name: Upload Windows sample artifact uses: actions/upload-artifact@v4 with: name: windows-app path: windows-app - name: Build Windows test runner - run: dotnet publish tests/ui/windows -c Release -f net9.0 -o windows-test-runner + run: dotnet publish tests/ui/windows -c Release -f net10.0 -o windows-test-runner - name: Upload Windows test runner artifact uses: actions/upload-artifact@v4 with: @@ -99,10 +99,10 @@ jobs: dotnet workload restore - name: Build iOS for Simulator - run: dotnet build sample -c Release -f net9.0-ios -p:RuntimeIdentifier=iossimulator-arm64 -p:PublishAot=false + run: dotnet build sample -c Release -f net10.0-ios -p:RuntimeIdentifier=iossimulator-arm64 -p:PublishAot=false - name: Build iOS Test Runner - run: dotnet publish tests/ui/ios/UITests.iOS.csproj -c Release -f net9.0 -o ios-test-runner + run: dotnet publish tests/ui/ios/UITests.iOS.csproj -c Release -f net10.0 -o ios-test-runner - name: Upload iOS Test Runner artifact uses: actions/upload-artifact@v4 @@ -113,7 +113,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: ios-app - path: sample/bin/Release/net9.0-ios/iossimulator-arm64/* + path: sample/bin/Release/net10.0-ios/iossimulator-arm64/* run_ios_tests: runs-on: macos-15 diff --git a/Directory.Build.props b/Directory.Build.props index 3616741..48ddbd9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ true - 9.0.80 + 10.0.50 diff --git a/global.json b/global.json index ceecdf7..f84b4db 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.201", "rollForward": "latestMinor" }, "msbuild-sdks": { diff --git a/sample/APES.MAUI.Sample.csproj b/sample/APES.MAUI.Sample.csproj index bc7f01c..f83d811 100644 --- a/sample/APES.MAUI.Sample.csproj +++ b/sample/APES.MAUI.Sample.csproj @@ -1,9 +1,9 @@ - net9.0-android - $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net10.0-android + $(TargetFrameworks);net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 Exe APES.MAUI.Sample true @@ -37,7 +37,7 @@ win10-x64 __WINDOWS__ - + true full false diff --git a/sample/run.sh b/sample/run.sh index 145e50a..e144c84 100755 --- a/sample/run.sh +++ b/sample/run.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -TFM="net9.0-android" +TFM="net10.0-android" CONFIG="Debug" PKG="com.apes.maui.sample" # <-- change me LOG="maui-logcat.log" diff --git a/src/APES.MAUI.csproj b/src/APES.MAUI.csproj index 9bd280a..380ebcb 100644 --- a/src/APES.MAUI.csproj +++ b/src/APES.MAUI.csproj @@ -1,13 +1,13 @@ - net9.0;net9.0-android - $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net10.0;net10.0-android + $(TargetFrameworks);net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 14.2 14.0 21.0 - 29.0 + 29.0 10.0.19041.0 10.0.17763.0 APES.MAUI @@ -57,11 +57,11 @@ true true - + $(DefineConstants);MAUI true - + $(DefineConstants);__WINDOWS__ @@ -73,7 +73,7 @@ - + @@ -86,18 +86,18 @@ - + - + - + - + diff --git a/tests/ui/android/AppiumSetup.cs b/tests/ui/android/AppiumSetup.cs index 7ea22f8..36bb8f6 100644 --- a/tests/ui/android/AppiumSetup.cs +++ b/tests/ui/android/AppiumSetup.cs @@ -23,7 +23,7 @@ public class AppiumSetup "sample", "bin", "Release", - "net9.0-android", + "net10.0-android", "publish", $"{AndroidApplication}-Signed.apk")); private static AppiumDriver? driver; diff --git a/tests/ui/android/UITests.Android.csproj b/tests/ui/android/UITests.Android.csproj index 3c8d01a..41ee717 100644 --- a/tests/ui/android/UITests.Android.csproj +++ b/tests/ui/android/UITests.Android.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable true diff --git a/tests/ui/android/test.sh b/tests/ui/android/test.sh index ec6fbd9..a750e14 100755 --- a/tests/ui/android/test.sh +++ b/tests/ui/android/test.sh @@ -1,8 +1,8 @@ #!/bin/sh set -e -dotnet publish ../../../sample -f:net9.0-android -c Release \ +dotnet publish ../../../sample -f:net10.0-android -c Release \ -p:RunAOTCompilation=true \ -p:AndroidPackageFormat=apk -adb install ../../../sample/bin/Release/net9.0-android/publish/com.apes.maui.sample-Signed.apk +adb install ../../../sample/bin/Release/net10.0-android/publish/com.apes.maui.sample-Signed.apk dotnet test diff --git a/tests/ui/ios/AppiumSetup.cs b/tests/ui/ios/AppiumSetup.cs index 1d8e129..4964d79 100644 --- a/tests/ui/ios/AppiumSetup.cs +++ b/tests/ui/ios/AppiumSetup.cs @@ -21,7 +21,7 @@ public class AppiumSetup "sample", "bin", "Release", - "net9.0-ios", + "net10.0-ios", "iossimulator-x64", $"{iosApplication}.app")); private static AppiumDriver? driver; diff --git a/tests/ui/ios/UITests.iOS.csproj b/tests/ui/ios/UITests.iOS.csproj index 3c8d01a..41ee717 100644 --- a/tests/ui/ios/UITests.iOS.csproj +++ b/tests/ui/ios/UITests.iOS.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable true diff --git a/tests/ui/shared/UITests.Shared.csproj b/tests/ui/shared/UITests.Shared.csproj index f87559d..4fb44b0 100644 --- a/tests/ui/shared/UITests.Shared.csproj +++ b/tests/ui/shared/UITests.Shared.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable false diff --git a/tests/ui/windows/AppiumSetup.cs b/tests/ui/windows/AppiumSetup.cs index e5b1b22..f28d98c 100644 --- a/tests/ui/windows/AppiumSetup.cs +++ b/tests/ui/windows/AppiumSetup.cs @@ -26,7 +26,7 @@ public class AppiumSetup "sample", "bin", "Release", - "net9.0-windows10.0.19041.0", + "net10.0-windows10.0.19041.0", "win-x64", "publish", $"{windowsApplication}.exe")); diff --git a/tests/ui/windows/UITests.Windows.csproj b/tests/ui/windows/UITests.Windows.csproj index e3db802..9714e40 100644 --- a/tests/ui/windows/UITests.Windows.csproj +++ b/tests/ui/windows/UITests.Windows.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable true diff --git a/tests/unit/unit.csproj b/tests/unit/unit.csproj index 5345320..12891c8 100644 --- a/tests/unit/unit.csproj +++ b/tests/unit/unit.csproj @@ -1,12 +1,12 @@ - net9.0 + net10.0 false APES.MAUI.Tests - + $(DefineConstants);MAUI @@ -19,7 +19,7 @@ Always - + From 7f11b680c25669632134deda4916525b2a7ed026 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Sun, 12 Apr 2026 11:53:37 +0200 Subject: [PATCH 2/4] use windows-2025-vs2026 runner --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8ec0a4..dd2f8d4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ env: RESULT_DIR: result jobs: build: - runs-on: windows-latest + runs-on: windows-2025-vs2026 steps: - uses: actions/checkout@v4 with: From c3cf0ba04096ea89b19561c1dfe2de41a8252210 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Sun, 12 Apr 2026 11:56:24 +0200 Subject: [PATCH 3/4] win10-x64 -> win-x64 --- sample/APES.MAUI.Sample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/APES.MAUI.Sample.csproj b/sample/APES.MAUI.Sample.csproj index f83d811..af9eca2 100644 --- a/sample/APES.MAUI.Sample.csproj +++ b/sample/APES.MAUI.Sample.csproj @@ -34,7 +34,7 @@ WinExe - win10-x64 + win-x64 __WINDOWS__ From ea80890fa57a46c7e167ffb3dfa63ed2268f1ed4 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Sun, 12 Apr 2026 12:22:52 +0200 Subject: [PATCH 4/4] bump windows sdk to 1.8.251106002 --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c344bef..efa892f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,7 +3,7 @@ - + @@ -13,4 +13,4 @@ - \ No newline at end of file +