From d6912c2d11937cb29683e2a0d1508b7ccfa34827 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sat, 18 Nov 2023 22:01:48 +0100 Subject: [PATCH 1/7] OxyplotMauiSample: update to .NET 8 --- Source/OxyplotMauiSample/OxyplotMauiSample.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj index 7090ada..f4f4a80 100644 --- a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj +++ b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj @@ -1,8 +1,8 @@  - net7.0-android33.0;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + net8.0-android34.0;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 Exe From e49c44b3b77ccd16a1645708b8315a87eb2e81f2 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sat, 18 Nov 2023 22:30:41 +0100 Subject: [PATCH 2/7] GHA: use XCode 15.1 on Mac * should fix these errors/warnings: error MT0180: This version of Microsoft.iOS requires the iOS 17.2 SDK (shipped with Xcode 15.1). Either upgrade Xcode to get the required header files or set the managed linker behaviour to Link Framework SDKs Only in your project's iOS Build Options > Linker Behavior (to try to avoid the new APIs). [/Users/runner/work/oxyplot-maui/oxyplot-maui/Source/OxyplotMauiSample/OxyplotMauiSample.csproj::TargetFramework=net8.0-ios] warning MT0079: The recommended Xcode version for Microsoft.MacCatalyst 17.2.8078 is Xcode 15.1 or later. The current Xcode version (found in /Applications/Xcode_15.0.1.app/Contents/Developer) is 15.0.1. [/Users/runner/work/oxyplot-maui/oxyplot-maui/Source/OxyplotMauiSample/OxyplotMauiSample.csproj::TargetFramework=net8.0-maccatalyst] --- .github/workflows/dotnet.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f8d4826..098a8b8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -52,6 +52,10 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + - name: Setup XCode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '15.1' - name: Install .NET MAUI run: | dotnet nuget locals all --clear From 6e6a0bf741fdee1be36467bd619db041239b74ef Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sat, 13 Jul 2024 14:35:25 +0200 Subject: [PATCH 3/7] GHA: fix some deprecation warnings by updating actions The following actions uses Node.js version which is deprecated and will be forced to run on node20: actions/checkout@v3, nuget/setup-nuget@v1, actions/setup-dotnet@v3, actions/setup-java@v3, actions/upload-artifact@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ The following artifacts were uploaded using a version of actions/upload-artifact that is scheduled for deprecation: "nupkg". Please update your workflow to use v4 of the artifact actions. Learn more: https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ --- .github/workflows/dotnet.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 098a8b8..6b9a700 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -13,16 +13,16 @@ jobs: winBuild: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: nuget/setup-nuget@v1 + - uses: nuget/setup-nuget@v2 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: 8.0.x - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' @@ -37,7 +37,7 @@ jobs: - 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 - name: Upload packages - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: nupkg path: ./Source/*/nuget/*.nupkg @@ -45,11 +45,11 @@ jobs: macBuild: runs-on: macos-13 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: 8.0.x - name: Setup XCode From 393ea3c760fcb23a488b47459f822eac1be928f1 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Fri, 24 Nov 2023 22:49:31 +0100 Subject: [PATCH 4/7] fix some more warnings Starting with .NET 8, setting true does not automatically include NuGet package references in your project. Update your project by including this item: . You can skip this warning by setting true in your project file. --- Source/OxyplotMauiSample/OxyplotMauiSample.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj index f4f4a80..9d33d53 100644 --- a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj +++ b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj @@ -58,6 +58,7 @@ + From d1236f5d2a2694064ceb18833714875e8b4f3103 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sun, 14 Jul 2024 07:54:51 +0200 Subject: [PATCH 5/7] remove net7.0 targets * .NET 7 is out of support --- Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj index 3458107..918ea8c 100644 --- a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj +++ b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj @@ -1,8 +1,8 @@ - net7.0;net7.0-android33.0;net7.0-ios;net7.0-maccatalyst;net8.0;net8.0-android34.0;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0 + net8.0;net8.0-android34.0;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true From 414fe958c1f0cfa44e8c7b5befad72d5b953e860 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sun, 14 Jul 2024 08:21:18 +0200 Subject: [PATCH 6/7] update Microsoft.Maui.Controls to 8.0.70 --- Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj | 9 ++++++--- Source/OxyplotMauiSample/OxyplotMauiSample.csproj | 8 +++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj index 918ea8c..87acca6 100644 --- a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj +++ b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj @@ -29,6 +29,9 @@ https://github.com/oxyplot/oxyplot-maui + + false + @@ -36,12 +39,12 @@ - + - - + + diff --git a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj index 9d33d53..3277468 100644 --- a/Source/OxyplotMauiSample/OxyplotMauiSample.csproj +++ b/Source/OxyplotMauiSample/OxyplotMauiSample.csproj @@ -30,6 +30,12 @@ 6.5 + + false + + + false + @@ -58,7 +64,7 @@ - + From d05de0e7f3603df24d97be4ae2158392a9c8e303 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sun, 14 Jul 2024 08:34:14 +0200 Subject: [PATCH 7/7] update SkiaSharp to 2.88.8 --- Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj index 87acca6..68b56d0 100644 --- a/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj +++ b/Source/OxyPlot.Maui.Skia/OxyPlot.Maui.Skia.csproj @@ -34,8 +34,8 @@ - - + +