Skip to content

Upgraded to .NET 10 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
newky2k wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Upgraded to .NET 10 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bae4ad7
Upgrade projects to .NET 10
newky2k May 8, 2026
21ece68
Revert yml changes
newky2k May 12, 2026
bf33f70
Removed Directory.Build.props
newky2k May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
4 changes: 2 additions & 2 deletions Sample/VirtualListViewSample/Platforms/Android/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="36" />
<application>
</application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
</manifest>
12 changes: 6 additions & 6 deletions Sample/VirtualListViewSample/VirtualListViewSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>
<OutputType>Exe</OutputType>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
Expand All @@ -14,7 +14,7 @@



<!--<RuntimeIdentifiers Condition="'$(TargetFramework)' == 'net6.0-android'">android-arm64</RuntimeIdentifiers>-->
<!--<RuntimeIdentifiers Condition="'$(TargetFramework)' == 'net10.0-android'">android-arm64</RuntimeIdentifiers>-->
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
Expand All @@ -25,8 +25,8 @@


<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="LiteDb" Version="5.0.17" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="LiteDB" Version="5.0.21" />
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
</ItemGroup>
Expand All @@ -36,4 +36,4 @@
<ItemGroup>
<ProjectReference Include="..\..\VirtualListView\VirtualListView.csproj" />
</ItemGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions VirtualListView/Platforms/Android/RvViewContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)}"))
Expand Down Expand Up @@ -37,4 +37,4 @@ public void SetupView(IView view)
AddView(NativeView);
}
}
}
}
4 changes: 2 additions & 2 deletions VirtualListView/Platforms/Android/VirtualListViewHandler.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public partial class VirtualListViewHandler : ViewHandler<IVirtualListView, Fram
RvAdapter adapter;
RecyclerView recyclerView;
LinearLayoutManager layoutManager;
Android.Views.View emptyView;
global::Android.Views.View emptyView;

protected override FrameLayout CreatePlatformView()
{
Expand Down Expand Up @@ -210,4 +210,4 @@ public IReadOnlyList<IPositionInfo> FindVisiblePositions()

return positions;
}
}
}
6 changes: 3 additions & 3 deletions VirtualListView/VirtualListView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041</TargetFrameworks>

<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
Expand Down Expand Up @@ -34,7 +34,7 @@
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitInfo" Version="3.1.1" PrivateAssets="all" />
<PackageReference Include="GitInfo" Version="3.6.0" PrivateAssets="all" />
<PackageReference Include="MemoryAnalyzers" Version="0.1.0-beta.5" PrivateAssets="all" />
</ItemGroup>

Expand Down
Loading