From bae4ad78d3fe76dded89ac5d8497df31cc949c5c Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Fri, 8 May 2026 15:45:54 +0100 Subject: [PATCH 1/3] Upgrade projects to .NET 10 --- .github/workflows/main.yml | 13 +++++++------ Directory.Build.props | 5 +++++ .../Platforms/Android/AndroidManifest.xml | 4 ++-- .../VirtualListViewSample.csproj | 12 ++++++------ .../Platforms/Android/RvViewContainer.cs | 6 +++--- .../Android/VirtualListViewHandler.android.cs | 4 ++-- VirtualListView/VirtualListView.csproj | 6 +++--- 7 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 Directory.Build.props diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index adfde41..85828b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,12 +15,12 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: Setup MAUI shell: pwsh @@ -38,7 +38,7 @@ jobs: if ($env:GITHUB_EVENT_NAME -eq "release") { $VERSION = $env:GITHUB_REF.Substring($env:GITHUB_REF.LastIndexOf('/') + 1) } - echo "::set-output name=pkgverci::$VERSION" + echo "pkgverci=$VERSION" >> $env:GITHUB_OUTPUT echo "PACKAGE VERSION: $VERSION" New-Item -ItemType Directory -Force -Path .\artifacts @@ -48,7 +48,7 @@ jobs: nuget sign .\artifacts\*.nupkg -CertificatePath $pfxPath -Timestamper http://timestamp.entrust.net/TSS/RFC3161sha2TS - name: Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: NuGet path: ./artifacts @@ -60,9 +60,10 @@ jobs: if: github.event_name == 'release' steps: - name: Download Artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: NuGet + path: NuGet - name: Push NuGet run: | dotnet nuget push NuGet\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..c3156da --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + 10.0.60 + + diff --git a/Sample/VirtualListViewSample/Platforms/Android/AndroidManifest.xml b/Sample/VirtualListViewSample/Platforms/Android/AndroidManifest.xml index e064787..10c6f0d 100644 --- a/Sample/VirtualListViewSample/Platforms/Android/AndroidManifest.xml +++ b/Sample/VirtualListViewSample/Platforms/Android/AndroidManifest.xml @@ -1,7 +1,7 @@ - + - \ No newline at end of file + diff --git a/Sample/VirtualListViewSample/VirtualListViewSample.csproj b/Sample/VirtualListViewSample/VirtualListViewSample.csproj index 5db89e0..a56a0b2 100644 --- a/Sample/VirtualListViewSample/VirtualListViewSample.csproj +++ b/Sample/VirtualListViewSample/VirtualListViewSample.csproj @@ -1,8 +1,8 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041 + net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041 Exe true true @@ -14,7 +14,7 @@ - + 14.2 14.0 21.0 @@ -25,8 +25,8 @@ - - + + @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/VirtualListView/Platforms/Android/RvViewContainer.cs b/VirtualListView/Platforms/Android/RvViewContainer.cs index 0a03a96..14c6557 100644 --- a/VirtualListView/Platforms/Android/RvViewContainer.cs +++ b/VirtualListView/Platforms/Android/RvViewContainer.cs @@ -1,9 +1,9 @@ -using AView = Android.Views.View; +using AView = global::Android.Views.View; using Microsoft.Maui.Platform; namespace Microsoft.Maui; -sealed class RvViewContainer : Android.Widget.FrameLayout +sealed class RvViewContainer : global::Android.Widget.FrameLayout { public RvViewContainer(IMauiContext context) : base(context.Context ?? throw new ArgumentNullException($"{nameof(context.Context)}")) @@ -37,4 +37,4 @@ public void SetupView(IView view) AddView(NativeView); } } -} \ No newline at end of file +} diff --git a/VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs b/VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs index 0fd9646..a344e2b 100644 --- a/VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs +++ b/VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs @@ -14,7 +14,7 @@ public partial class VirtualListViewHandler : ViewHandler FindVisiblePositions() return positions; } -} \ No newline at end of file +} diff --git a/VirtualListView/VirtualListView.csproj b/VirtualListView/VirtualListView.csproj index 258a9a0..6222a76 100644 --- a/VirtualListView/VirtualListView.csproj +++ b/VirtualListView/VirtualListView.csproj @@ -1,7 +1,7 @@ - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041 + net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041 true true @@ -34,7 +34,7 @@ - + From 21ece6852b0738f41e52cabd5c5b88bf8249fad4 Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Tue, 12 May 2026 19:26:01 +0100 Subject: [PATCH 2/3] Revert yml changes Except the framework version --- .github/workflows/main.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85828b6..5ab6f0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,10 +15,10 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v3 with: dotnet-version: '10.0.x' @@ -38,7 +38,7 @@ jobs: if ($env:GITHUB_EVENT_NAME -eq "release") { $VERSION = $env:GITHUB_REF.Substring($env:GITHUB_REF.LastIndexOf('/') + 1) } - echo "pkgverci=$VERSION" >> $env:GITHUB_OUTPUT + echo "::set-output name=pkgverci::$VERSION" echo "PACKAGE VERSION: $VERSION" New-Item -ItemType Directory -Force -Path .\artifacts @@ -48,7 +48,7 @@ jobs: nuget sign .\artifacts\*.nupkg -CertificatePath $pfxPath -Timestamper http://timestamp.entrust.net/TSS/RFC3161sha2TS - name: Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v1 with: name: NuGet path: ./artifacts @@ -60,10 +60,9 @@ jobs: if: github.event_name == 'release' steps: - name: Download Artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v1 with: name: NuGet - path: NuGet - name: Push NuGet run: | - dotnet nuget push NuGet\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} + dotnet nuget push NuGet\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} \ No newline at end of file From bf33f7048f581eb3e348f70032a597c2c8917a00 Mon Sep 17 00:00:00 2001 From: David Humphreys Date: Tue, 12 May 2026 21:42:45 +0100 Subject: [PATCH 3/3] Removed Directory.Build.props Updated task versions in main.yml --- .github/workflows/main.yml | 9 +++++---- Directory.Build.props | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 Directory.Build.props diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ab6f0e..94546f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,10 +15,10 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '10.0.x' @@ -48,7 +48,7 @@ jobs: nuget sign .\artifacts\*.nupkg -CertificatePath $pfxPath -Timestamper http://timestamp.entrust.net/TSS/RFC3161sha2TS - name: Artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: NuGet path: ./artifacts @@ -60,9 +60,10 @@ jobs: if: github.event_name == 'release' steps: - name: Download Artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: NuGet + path: NuGet - name: Push NuGet run: | dotnet nuget push NuGet\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props deleted file mode 100644 index c3156da..0000000 --- a/Directory.Build.props +++ /dev/null @@ -1,5 +0,0 @@ - - - 10.0.60 - -