Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 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
f6975da
Adopt Xaml Source Generation
ne0rrmatrix Nov 4, 2025
66bf811
Merge branch 'main' into Update-to-NET-10
ne0rrmatrix Nov 4, 2025
0afa114
Merge branch 'CommunityToolkit:Update-to-NET-10' into Update-to-NET-10
ne0rrmatrix Nov 4, 2025
2a456ae
Fix `Microsoft.Extensions.Logging.Debug` dependency
TheCodeTraveler Nov 4, 2025
2a01ee0
Fix Nullable Type Errors
TheCodeTraveler Nov 4, 2025
c799b2d
Build `CommunityToolit.Maui.csproj` instead of `CommunityToolkit.Maui…
TheCodeTraveler Nov 4, 2025
6f53910
Fix .NET 10 Warnings
TheCodeTraveler Nov 5, 2025
f14b77b
Fix Tizen build errors for upgrading NET10 (#2928)
JoonghyunCho Nov 5, 2025
2781421
`dotnet format`
TheCodeTraveler Nov 5, 2025
4bbe434
Add Latest NuGet Version
TheCodeTraveler Nov 5, 2025
2fe3937
Fix namespace
TheCodeTraveler Nov 5, 2025
6dc00b2
Merge branch 'Update-to-NET-10' of https://github.com/CommunityToolki…
TheCodeTraveler Nov 5, 2025
6b2c4d1
FixTizen Build Errors
TheCodeTraveler Nov 5, 2025
52be289
Add `new` keyword functionality to `BindablePropertyAttributeSourceGe…
TheCodeTraveler Nov 5, 2025
1d7128f
Update BadgeImplementation.tizen.cs
TheCodeTraveler Nov 5, 2025
b5add8a
Add Fix for Android StatusBarBehavior on Android 35
TheCodeTraveler Nov 5, 2025
a840aad
Merge branch 'Update-to-NET-10' of https://github.com/CommunityToolki…
TheCodeTraveler Nov 5, 2025
ec0e53a
Update NuGet Packages
TheCodeTraveler Nov 5, 2025
054f390
Remove NuGet Package References Fixing Vulnerabilities
TheCodeTraveler Nov 5, 2025
51866ed
Merge branch 'main' into Update-to-NET-10
ne0rrmatrix Nov 6, 2025
4d8cfa2
Fix OnPlatform not working with nested Bindings by nesting OnPlatform…
ne0rrmatrix Nov 6, 2025
7f9ae1c
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Nov 6, 2025
20ff110
Update Main.cs
TheCodeTraveler Nov 6, 2025
8c823db
Use `TestContext.Current.CancellationToken`
TheCodeTraveler Nov 6, 2025
1e2448c
Update Main.cs
TheCodeTraveler Nov 6, 2025
79a8e06
Convert `sln` -> `slnx`
TheCodeTraveler Nov 6, 2025
3ed4a3e
Update Build to Workaround .NET 10 errors
TheCodeTraveler Nov 10, 2025
1168b40
Use `macos-26`
TheCodeTraveler Nov 10, 2025
2a3b4cf
Merge branch 'main' into Update-to-NET-10
TheCodeTraveler Nov 10, 2025
e3c9cd6
Revert `preview`
TheCodeTraveler Nov 11, 2025
f302d64
Merge branch 'Update-to-NET-10' of https://github.com/CommunityToolki…
TheCodeTraveler Nov 11, 2025
d31e197
Use `ga`
TheCodeTraveler Nov 11, 2025
5ffd1a8
Use `macos26`
TheCodeTraveler Nov 11, 2025
0ed76c2
Remove Obsolete attribute from BasePage constructor
TheCodeTraveler Nov 11, 2025
7debcd4
Update dotnet-build.yml
TheCodeTraveler Nov 11, 2025
fdf40b2
`dotnet format`
TheCodeTraveler Nov 11, 2025
414db22
Change Button_Clicked to async for URL loading
TheCodeTraveler Nov 11, 2025
cb89ad2
Remove Obsolete attribute from ConvertersGalleryViewModel
TheCodeTraveler Nov 11, 2025
53848ac
Update Microsoft.Maui.Controls package reference version
TheCodeTraveler Nov 11, 2025
325c017
Update MauiPackageVersion to 10.0.0
TheCodeTraveler Nov 11, 2025
a7a568f
Update LangVersion from 'preview' to 'latest'
TheCodeTraveler Nov 11, 2025
6c234f9
Remove `[Obsolete]`
TheCodeTraveler Nov 11, 2025
cdd3990
Revert `Microsoft.CodeAnalysis.CSharp` NuGet Packages to latest stabl…
TheCodeTraveler Nov 11, 2025
c752054
Remove `[Obsolete]`
TheCodeTraveler Nov 11, 2025
358c4c6
Set `<IncludeTizenTargetFrameworks>true</IncludeTizenTargetFrameworks…
TheCodeTraveler Nov 11, 2025
ef80980
Update NuGet Packages, Fix Build Errors
TheCodeTraveler Nov 11, 2025
9890b81
Use `Assert. ThrowsAnyAsync`
TheCodeTraveler Nov 11, 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
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 All @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-15]
os: [windows-latest, macos-26]

steps:
- name: Checkout code
Expand Down
25 changes: 13 additions & 12 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ 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.306'
LATEST_NET_VERSION: '9.0.x'
PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
TOOLKIT_NET_VERSION: '10.0.100'
LATEST_NET_VERSION: '10.0.x'
PathToLibrarySolution: 'src/CommunityToolkit.Maui.slnx'
PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.slnx'
PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
PathToCommunityToolkitCoreCsproj: 'src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj'
PathToCommunityToolkitCameraCsproj: 'src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj'
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-15]
os: [windows-latest, macos-26]
steps:
- name: Checkout code
uses: actions/checkout@v5
Expand All @@ -76,7 +76,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'microsoft'
java-version: '17'
java-version: '21'

- name: Install .NET MAUI Workload
run: |
Expand All @@ -101,7 +101,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-15]
os: [windows-latest, macos-26]
steps:
- name: Checkout code
uses: actions/checkout@v5
Expand Down Expand Up @@ -203,12 +203,13 @@ jobs:
run: dotnet build ${{ env.PathToCommunityToolkitCoreCsproj }} -c Release -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }}

- name: 'Build CommunityToolkit.Maui'
run: dotnet build ${{ env.PathToLibrarySolution }} -c Release -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }}
run: dotnet build ${{ env.PathToCommunityToolkitCsproj }} -c Release -p:PackageVersion=${{ env.NugetPackageVersion }} -p:Version=${{ env.NugetPackageVersion }}

- name: Run CommunityToolkit Analyzers UnitTests
run: |
cd ${{ env.PathToCommunityToolkitAnalyzersUnitTestProjectDirectory }}
dotnet run -c Release --results-directory "${{ runner.temp }}" --coverage --coverage-output "${{ runner.temp }}/ut-analyzers.cobertura.xml" --coverage-output-format cobertura --report-xunit
# Uncomment this step once Microsoft releases Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net100
# - name: Run CommunityToolkit Analyzers UnitTests
# run: |
# cd ${{ env.PathToCommunityToolkitAnalyzersUnitTestProjectDirectory }}
# dotnet run -c Release --results-directory "${{ runner.temp }}" --coverage --coverage-output "${{ runner.temp }}/ut-analyzers.cobertura.xml" --coverage-output-format cobertura --report-xunit

- name: Run CommunityToolkit UnitTests
run: |
Expand Down
10 changes: 6 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Nullable>enable</Nullable>
<NoWarn>NETSDK1023</NoWarn>
<NetVersion>net9.0</NetVersion>
<NetVersion>net10.0</NetVersion>
<LangVersion>preview</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand All @@ -16,10 +16,11 @@
<NuGetAuditMode>all</NuGetAuditMode>

<!-- MAUI Specific -->
<MauiPackageVersion>9.0.120</MauiPackageVersion>
<MauiPackageVersion>10.0.0</MauiPackageVersion>
<MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
<SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
<MauiXamlInflator>SourceGen</MauiXamlInflator>

<!-- WindowsAppSDK
We should keep this in sync with .NET MAUI https://github.com/dotnet/maui/blob/8ee00e00f603cd8a420a3467daddaf3935c8c587/Directory.Build.props#L142
Expand Down Expand Up @@ -202,7 +203,7 @@
IL2090,IL2091,IL2092,IL2093,IL2094,IL2095,IL2096,IL2097,IL2098,IL2099,
IL2100,IL2101,IL2102,IL2103,IL2104,IL2105,IL2106,IL2107,IL2108,IL2109,
IL2110,IL2111,IL2112,IL2113,IL2114,IL2115,IL2116,IL2117,IL2118,IL2119,
IL2120,IL2121,IL2122,
IL2120,IL2121,IL2122,IL2123,
IL3050,IL3051,IL3052,IL3053,IL3054,IL3055,IL3056,
RS1038,RS2007
</WarningsAsErrors>
Expand Down Expand Up @@ -237,6 +238,7 @@
</ItemGroup>

<PropertyGroup Condition="('$(TF_BUILD)' == 'true' OR '$(GITHUB_ACTIONS)' == 'true') and $([MSBuild]::IsOSPlatform('windows')) == 'true'">
<IncludeTizenTargetFrameworks>true</IncludeTizenTargetFrameworks>
<!-- Re-enable Tizen once it includes support for .NET 10 -->
<IncludeTizenTargetFrameworks>false</IncludeTizenTargetFrameworks>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.306",
"version": "10.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
157 changes: 0 additions & 157 deletions samples/CommunityToolkit.Maui.Sample.sln

This file was deleted.

Loading
Loading