Skip to content

Add .NET 10 Support #2902

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

Draft
wants to merge 26 commits into
base: main
Choose a base branch
from
+122 −2,393
Draft

Add .NET 10 Support #2902

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4696d3d
Update to .NET 10
TheCodeTraveler Oct 7, 2025
40101eb
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Oct 7, 2025
d438f9c
Update CSharpCodeFixVerifier`2+Test.cs
TheCodeTraveler Oct 7, 2025
fcf2e95
Fix Unit Test
TheCodeTraveler Oct 7, 2025
bfefeb2
Update Verifiers
TheCodeTraveler Oct 7, 2025
7fe076c
Downgrade `Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net`
TheCodeTraveler Oct 7, 2025
fbbcf5d
Keep Compiler Error for `Microsoft.CodeAnalysis.Testing.ReferenceAsse…
TheCodeTraveler Oct 7, 2025
60ccda6
Update Directory.Build.props
TheCodeTraveler Oct 7, 2025
e271c71
Remove AOT
TheCodeTraveler Oct 9, 2025
c4cc7d7
Update to .NET 10 RC 2
TheCodeTraveler Oct 14, 2025
7ad3990
Update NuGet Packages
TheCodeTraveler Oct 14, 2025
a8fffa1
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Oct 14, 2025
6db0619
Update NuGet packages
TheCodeTraveler Oct 14, 2025
e4f283d
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Oct 14, 2025
3376442
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Oct 14, 2025
05a0a11
Remove `[RequiresUnreferencedCode]`
TheCodeTraveler Oct 14, 2025
5f38f13
Remove `<NoWarn>CsWinRT1028`
TheCodeTraveler Oct 14, 2025
e447a65
Increase to JDK 21
TheCodeTraveler Oct 15, 2025
8c9402b
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Oct 23, 2025
f8febd1
Remove `NextMauiPackageVersion`
TheCodeTraveler Oct 23, 2025
c029aa3
sample apps builds
ne0rrmatrix Oct 25, 2025
8f49d50
Update for .NET MAUI compatibility and .NET 10 support
ne0rrmatrix Oct 25, 2025
7827462
Temp fix for `AllowMissingPrunePackageData` to true
ne0rrmatrix Oct 25, 2025
8710216
Add `AllowMissingPrunePackageData` to resolve issues. This will need …
ne0rrmatrix Oct 25, 2025
989d5e9
Fix Tizen `IDisposable` in CamerViewHandler
ne0rrmatrix Oct 25, 2025
6cbf841
Fix Tizen?
ne0rrmatrix Oct 25, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- '*'

env:
LATEST_NET_VERSION: '9.0.x'
LATEST_NET_VERSION: '10.0.x'
PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'

concurrency:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ env.LATEST_NET_VERSION }}
dotnet-quality: 'ga'
dotnet-quality: 'preview'

- name: Install .NET MAUI Workload
run: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/dotnet-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ env:
NugetPackageVersionCamera: '99.0.0-preview${{ github.run_number }}'
NugetPackageVersionMediaElement: '99.0.0-preview${{ github.run_number }}'
NugetPackageVersionMaps: '99.0.0-preview${{ github.run_number }}'
TOOLKIT_NET_VERSION: '9.0.300'
LATEST_NET_VERSION: '9.0.x'
TOOLKIT_NET_VERSION: '10.0.x'
LATEST_NET_VERSION: '10.0.x'
PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
Expand All @@ -43,7 +43,7 @@ env:
PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.csproj'
PathToCommunityToolkitAnalyzersUnitTestProjectDirectory: 'src/CommunityToolkit.Maui.Analyzers.UnitTests'
PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
CommunityToolkitLibrary_Xcode_Version: '16.2'
CommunityToolkitLibrary_Xcode_Version: '16.4'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ env.LATEST_NET_VERSION }}
dotnet-quality: 'ga'
dotnet-quality: 'preview'

- uses: actions/setup-java@v5
with:
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
dotnet-quality: 'ga'
dotnet-quality: 'preview'

- uses: actions/setup-java@v5
with:
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
dotnet-quality: 'ga'
dotnet-quality: 'preview'

- name: Download NuGet List
uses: actions/download-artifact@v5
Expand Down Expand Up @@ -345,7 +345,7 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
dotnet-quality: 'ga'
dotnet-quality: 'preview'

- name: Download signed packages
uses: actions/download-artifact@v5
Expand Down Expand Up @@ -373,7 +373,7 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
dotnet-quality: 'ga'
dotnet-quality: 'preview'

- name: Download signed packages
uses: actions/download-artifact@v5
Expand Down
8 changes: 4 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<NoWarn>NETSDK1023</NoWarn>
<NetVersion>net9.0</NetVersion>
<NoWarn>NETSDK1023;XCODE_26_0_PREVIEW</NoWarn>
<NetVersion>net10.0</NetVersion>
<LangVersion>preview</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand All @@ -16,8 +16,8 @@
<NuGetAuditMode>all</NuGetAuditMode>

<!-- MAUI Specific -->
<MauiPackageVersion>9.0.110</MauiPackageVersion>
<NextMauiPackageVersion>10.0.0</NextMauiPackageVersion>
<MauiPackageVersion>10.0.0-rc.1.25452.6</MauiPackageVersion>
<NextMauiPackageVersion>11.0.0</NextMauiPackageVersion>
<MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
<SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "9.0.300",
"version": "10.0.100-rc.1.25451.107",
"rollForward": "latestFeature",
"allowPrerelease": false
"allowPrerelease": true
}
}
2 changes: 1 addition & 1 deletion samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="6.0.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
<PackageReference Include="xunit.v3" Version="3.1.0" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.4" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0-preview.25412.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
</ItemGroup>

<ItemGroup>
<!--Fix vulnerabilities-->
<PackageReference Include="System.Formats.Asn1" Version="9.0.9" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.0-rc.1.25451.107" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably we can remove these packages. Maybe vulnerabilities are fixed

<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
Expand Down
4 changes: 2 additions & 2 deletions src/CommunityToolkit.Maui.Analyzers.UnitTests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ namespace CommunityToolkit.Maui.Analyzers.UnitTests;
public static partial class CSharpAnalyzerVerifier<TAnalyzer>
where TAnalyzer : DiagnosticAnalyzer, new()
{
public class Test : CSharpAnalyzerTest<TAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>
class Test : CSharpAnalyzerTest<TAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>
{
public Test(params ReadOnlySpan<Type> assembliesUnderTest)
{
#if NET9_0
#if NET10_0
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also update net10 here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup! We're waiting on Microsoft to release support for testing Analyzers with .NET 10. Microsoft.CodeAnalysis.Testing.ReferenceAssemblys.Net.Net100 hasn't yet been released.

For now, the Analyzer tests all fail.

I assume (hope) Microsoft will push support for this before .NET 10 GAs.

#else
#error ReferenceAssemblies must be updated to current version of .NET
Expand Down
4 changes: 2 additions & 2 deletions src/CommunityToolkit.Maui.Analyzers.UnitTests/Verifiers/CSharpCodeFixVerifier`2+Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
where TAnalyzer : DiagnosticAnalyzer, new()
where TCodeFix : CodeFixProvider, new()
{
protected class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
{
public Test(params ReadOnlySpan<Type> assembliesUnderTest)
{
#if NET9_0
#if NET10_0
ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reference assemblies net10?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup! We're waiting on Microsoft to release support for testing Analyzers with .NET 10. Microsoft.CodeAnalysis.Testing.ReferenceAssemblys.Net.Net100 hasn't yet been released.

For now, the Analyzer tests all fail.

I assume (hope) Microsoft will push support for this before .NET 10 GAs.

#else
#error ReferenceAssemblies must be updated to current version of .NET
Expand Down
151 changes: 0 additions & 151 deletions src/CommunityToolkit.Maui.Core/Handlers/Popup/PopUpHandler.android.cs
View file
Open in desktop

This file was deleted.

Loading
Loading