From eb1a170ee029abf893fb79ef7ecd2c45bfa62292 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Thu, 29 Jan 2026 20:55:23 +0100 Subject: [PATCH 1/5] GHA: update to .NET 10 SDK * requires removal of .NET 8 targets ... error NETSDK1202: The workload 'net8.0-android' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/maui-support-policy for more information about the support policy. --- .github/workflows/dotnet.yml | 8 ++++---- Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b9ba3a6..19b1b10 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Set up JDK 11 uses: actions/setup-java@v4 with: @@ -51,11 +51,11 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Setup XCode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: latest-stable + xcode-version: '26.0.1' - name: Install .NET MAUI run: | dotnet nuget locals all --clear @@ -77,7 +77,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Install workloads run: dotnet workload install android wasm-tools maui-android - name: Install Android tools diff --git a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj index bfcf9da..24467f6 100644 --- a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj +++ b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj @@ -1,9 +1,9 @@ - net8.0;net8.0-android34.0;net9.0;net9.0-android - $(TargetFrameworks);net8.0-ios;net8.0-maccatalyst;net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0 + net9.0;net9.0-android + $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net9.0-windows10.0.19041.0 true From 63603521fa68ddb1273bf0571eecc4543173b660 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Fri, 30 Jan 2026 20:31:16 +0100 Subject: [PATCH 2/5] add net10.0 targets --- Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj index 24467f6..748a847 100644 --- a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj +++ b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj @@ -1,11 +1,11 @@ - net9.0;net9.0-android - $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst - $(TargetFrameworks);net9.0-windows10.0.19041.0 + net9.0;net9.0-android;net10.0;net10.0-android + $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0 - + true true enable From b63c652fd525464011bcd50a624f8fa1f9147997 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Fri, 30 Jan 2026 20:48:34 +0100 Subject: [PATCH 3/5] OxyplotMauiSample: update to net10.0 * and upate XCode in GHA --- .github/workflows/dotnet.yml | 2 +- Source/OxyplotMauiSample/OxyplotMauiSample.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 19b1b10..93fc736 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -55,7 +55,7 @@ jobs: - name: Setup XCode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '26.0.1' + xcode-version: '26.2' - name: Install .NET MAUI run: | dotnet nuget locals all --clear diff --git a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj index 1399708..c3649bb 100644 --- a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj +++ b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj @@ -1,11 +1,11 @@  - 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 OxyplotMauiSample true From 35d791bfa0ff356b56fd32a5aec0b1071063ce9e Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Fri, 30 Jan 2026 21:22:22 +0100 Subject: [PATCH 4/5] GHA: build sample app in Debug mode * in order to speed up this step of the build jobs, which is taking particularly long (especially on MacOS) --- .github/workflows/dotnet.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 93fc736..47598da 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -33,9 +33,9 @@ jobs: & dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json & dotnet workload install android ios maccatalyst tvos macos maui wasm-tools maui-maccatalyst --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json - name: Build library (with nuget package) - run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj /p:Configuration=Release /t:restore,build,pack /p:PackageOutputPath=./nuget /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false + run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj -c Release -t:restore,build,pack -p:PackageOutputPath=./nuget -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false - name: Build sample - run: dotnet build ./Source/OxyplotMauiSample/OxyplotMauiSample.csproj /p:Configuration=Release /t:restore,build /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false + run: dotnet build ./Source/OxyplotMauiSample/OxyplotMauiSample.csproj -c Debug -t:restore,build -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false - name: Upload packages uses: actions/upload-artifact@v4 with: @@ -64,9 +64,9 @@ jobs: - name: Install Android tools run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-34" "build-tools;34.0.0" "platform-tools" - name: Build library (with nuget package) - run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj /p:Configuration=Release /t:restore,build,pack /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false + run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj -c Release -t:restore,build,pack -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false - name: Build sample - run: dotnet build ./Source/OxyplotMauiSample/OxyplotMauiSample.csproj /p:Configuration=Release /t:restore,build /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false + run: dotnet build ./Source/OxyplotMauiSample/OxyplotMauiSample.csproj -c Debug -t:restore,build -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false linuxBuild: runs-on: ubuntu-latest @@ -83,6 +83,6 @@ jobs: - name: Install Android tools run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" - name: Build library (with nuget package) - run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj /p:Configuration=Release /t:restore,build,pack /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false + run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj -c Release -t:restore,build,pack -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false - name: Build sample - run: dotnet build ./Source/OxyplotMauiSample/OxyplotMauiSample.csproj /p:Configuration=Release /t:restore,build /p:Version=$(git describe) /p:ContinuousIntegrationBuild=true /p:DeterministicSourcePaths=false + run: dotnet build ./Source/OxyplotMauiSample/OxyplotMauiSample.csproj -c Debug -t:restore,build -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false From b82cba0297384c61deb5063f2a1e3992c588ca53 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Fri, 30 Jan 2026 21:38:56 +0100 Subject: [PATCH 5/5] GHA: simplify workload installation --- .github/workflows/dotnet.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 47598da..568b6bb 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -28,10 +28,7 @@ jobs: java-version: '11' - name: Install .NET MAUI shell: pwsh - run: | - & dotnet nuget locals all --clear - & dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json - & dotnet workload install android ios maccatalyst tvos macos maui wasm-tools maui-maccatalyst --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json + run: dotnet workload install maui - name: Build library (with nuget package) run: dotnet build ./Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj -c Release -t:restore,build,pack -p:PackageOutputPath=./nuget -p:Version=$(git describe) -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=false - name: Build sample @@ -57,10 +54,7 @@ jobs: with: xcode-version: '26.2' - name: Install .NET MAUI - run: | - dotnet nuget locals all --clear - dotnet workload install maui --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json - dotnet workload install android ios maccatalyst tvos macos maui wasm-tools maui-maccatalyst --source https://aka.ms/dotnet6/nuget/index.json --source https://api.nuget.org/v3/index.json + run: dotnet workload install maui - name: Install Android tools run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-34" "build-tools;34.0.0" "platform-tools" - name: Build library (with nuget package) @@ -79,7 +73,7 @@ jobs: with: dotnet-version: 10.0.x - name: Install workloads - run: dotnet workload install android wasm-tools maui-android + run: dotnet workload install maui-android - name: Install Android tools run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" - name: Build library (with nuget package)