diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index adfde41..94546f1 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 @@ -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 }} + 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/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 @@ - +