Support .NET 9.0

.editorconfig

@@ -142,4 +142,10 @@ dotnet_diagnostic.CA2208.severity = error
 dotnet_diagnostic.CA1834.severity = error
 
 # IDE0220: Add explicit cast
-dotnet_diagnostic.IDE0220.severity = error
+dotnet_diagnostic.IDE0220.severity = error
+
+# Warning CA2264 : Calling 'ArgumentNullException.ThrowIfNull' and passing a non-nullable value is a no-op
+dotnet_diagnostic.CA2264.severity = error
+
+# IDE0220: The field [ObservableProperty] can be converted to a partial property
+dotnet_diagnostic.MVMTK0042.severity = error

Directory.Build.props

@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
   <PropertyGroup>
-    <NetVersion>net8.0</NetVersion>
-    <MauiPackageVersion>8.0.71</MauiPackageVersion>
-    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <NoWarn>NETSDK1023</NoWarn>
+    <NetVersion>net9.0</NetVersion>
+    <LangVersion>preview</LangVersion>
+    <MauiPackageVersion>9.0.0-rc.2.24503.2</MauiPackageVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-    <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
-    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+    <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
+
+    <!-- Prevent NuGet Package Vulnerabilities -->
+    <NuGetAudit>enable</NuGetAudit>
+    <NuGetAuditMode>all</NuGetAuditMode>
+
+    <!-- MAUI Specific -->
+    <MauiStrictXamlCompilation>true</MauiStrictXamlCompilation>
+    <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
+    <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
 
     <!-- https://learn.microsoft.com/dotnet/core/deploying/native-aot/?tabs=net8plus%2Cwindows -->
     <StripSymbols>false</StripSymbols>
@@ -39,18 +47,30 @@
      CS1712: Type parameter has no matching typeparam tag in the XML comment
      CS1723: XML comment has cref attribute that refers to a type parameter
      CS1734: XML comment has a paramref tag, but there is no parameter by that name
-
+     MVMTK0042: The field [ObservableProperty] can be converted to a partial property
+     CsWinRT1028: Class implements WinRT interfaces but isn't marked partial
+     CsWinRT1030: Class implements WinRT interfaces that require unsafe code
+     NU1900	Error communicating with package source, while getting vulnerability information.
+     NU1901	Package with low severity detected
+     NU1902	Package with moderate severity detected
+     NU1903	Package with high severity detected
+     NU1904	Package with critical severity detected
+     NU1905	An audit source does not provide a vulnerability database
      xUnit1012: Null should not be used for type parameter
      xUnit2021: Assert.ThrowsAsync is async. The resulting task should be awaited
-
-     IL2***: Trim Warnings
-
-     IL3***: AOT Warnings 
-
+     XC0045: Binding: Property not found
+     XC0103: Consider attributing the markup extension with [RequireService] or [AcceptEmptyServiceProvider] if it doesn't require any
+     IL2***: Trim Warnings     
+     IL3***: AOT Warnings     
      RS2007: Analyzer release file 'AnalyzerReleases.Shipped.md' has a missing or invalid release header-->
-     <WarningsAsErrors>nullable,
+     <WarningsAsErrors>
+       nullable,
        CS0419,CS1570,CS1571,CS1572,CS1573,CS1574,CS1580,CS1581,CS1584,CS1587,CS1589,CS1590,CS1591,CS1592,CS1598,CS1658,CS1710,CS1711,CS1712,CS1723,CS1734,
+       CsWinRT1028,CsWinRT1030,
+       MVMTK0042,
+       NU1900,NU1901,NU1902,NU1903,NU1904,NU1905,
        xUnit1012,xUnit2021,
+       XC0045,XC0103,
        IL2001,IL2002,IL2003,IL2004,IL2005,IL2006,IL2007,IL2008,IL2009,
        IL2010,IL2011,IL2012,IL2013,IL2014,IL2015,IL2016,IL2017,IL2018,IL2019,
        IL2020,IL2021,IL2022,IL2023,IL2024,IL2025,IL2026,IL2027,IL2028,IL2029,
@@ -69,10 +89,27 @@
      </WarningsAsErrors>
   </PropertyGroup>
 
+  <!-- Required for NuGet Source Link -->
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true' OR '$(GITHUB_ACTIONS)' == 'true'">
+    <!--  Ensure deterministic build when using Azure Pipelines or GitHub Actions-->
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+
+    <!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+
+    <!-- Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <!-- Embed symbols containing Source Link in the main file (exe/dll) -->
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="CommunityToolkit.Maui.UnitTests" />
+    <InternalsVisibleTo Include="CommunityToolkit.Maui.Analyzers.UnitTests" />
   </ItemGroup>
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true' and $([MSBuild]::IsOSPlatform('windows')) == 'true'">
+
+  <PropertyGroup Condition="('$(TF_BUILD)' == 'true' OR '$(GITHUB_ACTIONS)' == 'true') and $([MSBuild]::IsOSPlatform('windows')) == 'true'">
     <IncludeTizenTargetFrameworks>true</IncludeTizenTargetFrameworks>
   </PropertyGroup>
 </Project>

azure-pipelines.yml

@@ -6,8 +6,8 @@ variables:
   NugetPackageVersionCamera: '$(CurrentSemanticVersion)'
   NugetPackageVersionMediaElement: '$(CurrentSemanticVersion)'
   NugetPackageVersionMaps: '$(CurrentSemanticVersion)'
-  TOOLKIT_NET_VERSION: '8.0.303'
-  LATEST_NET_VERSION: '8.0.x'
+  TOOLKIT_NET_VERSION: '9.0.100-rc.2.24474.11'
+  LATEST_NET_VERSION: '9.0.x'
   PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
   PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
   PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
@@ -29,7 +29,7 @@ variables:
   PathToCommunityToolkitAnalyzersBenchmarkCsproj: 'src/CommunityToolkit.Maui.Analyzers.Benchmarks/CommunityToolkit.Maui.Analyzers.Benchmarks.csproj'
   DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.6.json'
   CommunityToolkitSampleApp_Xcode_Version: '16'
-  CommunityToolkitLibrary_Xcode_Version: '15.4'
+  CommunityToolkitLibrary_Xcode_Version: '16'
 
 trigger:
   branches:
@@ -61,22 +61,25 @@ jobs:
         'Windows':
           image: 'windows-latest'
         'macOS':
-          image: 'macos-14'
+          image: 'macos-15'
     pool:
       vmImage: $(image)
     steps:
       - task: CmdLine@2
         displayName: 'Set Xcode v$(CommunityToolkitSampleApp_Xcode_Version)'
         condition: eq(variables['Agent.OS'], 'Darwin') # Only run this step on macOS
         inputs:
-          script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app;sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app/Contents/Developer
+          script: |
+            echo Installed Xcode Versions:
+            ls -al  /Applications | grep Xcode
+            echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app;sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitSampleApp_Xcode_Version).app/Contents/Developer
 
       - task: UseDotNet@2
         displayName: 'Install Latest .NET SDK, v$(LATEST_NET_VERSION)'
         inputs:
           packageType: 'sdk'
           version: '$(LATEST_NET_VERSION)'
-          includePreviewVersions: false
+          includePreviewVersions: true
 
       - task: CmdLine@2
         displayName: 'Install Latest .NET MAUI Workload'
@@ -139,7 +142,7 @@ jobs:
         'Windows':
           image: 'windows-latest'
         'macOS':
-          image: 'macos-14'
+          image: 'macos-15'
     pool:
       vmImage: $(image)
     steps:
@@ -199,14 +202,17 @@ jobs:
         displayName: 'Set Xcode v$(CommunityToolkitLibrary_Xcode_Version)'
         condition: eq(variables['Agent.OS'], 'Darwin') # Only run this step on macOS
         inputs:
-          script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app;sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app/Contents/Developer
+          script: |
+            echo Installed Xcode Versions:
+            ls -al  /Applications | grep Xcode
+            echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app;sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app/Contents/Developer
 
       - task: UseDotNet@2
         displayName: Install .NET v$(TOOLKIT_NET_VERSION)
         inputs:
           packageType: 'sdk'
           version: '$(TOOLKIT_NET_VERSION)'
-          includePreviewVersions: false
+          includePreviewVersions: true
 
       - task: CmdLine@2
         displayName: 'Install .NET MAUI Workload $(TOOLKIT_NET_VERSION)'
@@ -451,13 +457,14 @@ jobs:
           'Windows':
             image: 'windows-latest'
           'macOS':
-            image: 'macos-14'
+            image: 'macos-15'
     pool:
       vmImage: $(image)
     steps:
       - script: |
-          sudo xcode-select -s /Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app 
-          sudo xcode-select -p
+          echo Installed Xcode Versions:
+          ls -al  /Applications | grep Xcode
+          echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app;sudo xcode-select --switch /Applications/Xcode_$(CommunityToolkitLibrary_Xcode_Version).app/Contents/Developer
         displayName: 'Set Xcode v$(CommunityToolkitLibrary_Xcode_Version)'
         condition: eq(variables['Agent.OS'], 'Darwin') # Only run this step on macOS
 
@@ -466,7 +473,7 @@ jobs:
         inputs:
           packageType: 'sdk'
           version: '$(LATEST_NET_VERSION)'
-          includePreviewVersions: false
+          includePreviewVersions: true
 
       - task: CmdLine@2
         displayName: 'Install .NET MAUI Workload'

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.303",
+    "version": "9.0.100-rc.2.24474.11",
     "rollForward": "latestFeature",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }

samples/CommunityToolkit.Maui.Sample/App.xaml.cs

@@ -4,10 +4,14 @@ namespace CommunityToolkit.Maui.Sample;
 
 public partial class App : Application
 {
-	public App()
+	readonly AppShell appShell;
+
+	public App(AppShell appShell)
 	{
 		InitializeComponent();
 
-		MainPage = new AppShell();
+		this.appShell = appShell;
 	}
+
+	protected override Window CreateWindow(IActivationState? activationState) => new(appShell);
 }

samples/CommunityToolkit.Maui.Sample/AppShell.xaml

@@ -17,8 +17,8 @@
        x:Name="flyout"
        Title="{OnPlatform WinUI='Toolkit Features', Default={x:Null}}"
        FlyoutBackgroundColor="{OnPlatform WinUI=Transparent,
-                                          Default={AppThemeBinding Light={StaticResource White},
-                                                                   Dark={StaticResource Black}}}"
+                                          Default={AppThemeBinding Light= White,
+                                                                   Dark= Black}}"
        FlyoutBehavior="{OnPlatform WinUI=Locked, Default=Flyout}">
 
     <Shell.FlyoutHeader>
@@ -100,6 +100,7 @@
     <Shell.FlyoutFooter>
         <Label Padding="4"
                HorizontalOptions="End"
+               x:DataType="{x:Type sys:DateTime}"
                Text="{Binding Source={x:Static sys:DateTime.Now}, StringFormat='{0:yyyy}'}"
                VerticalOptions="End" />
     </Shell.FlyoutFooter>

samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj

@@ -34,6 +34,9 @@
 
     <WindowsSdkPackageVersion>10.0.19041.53</WindowsSdkPackageVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+    <!-- Remove this NoWarn once XamlTypeInfo Generator (owned by .NET MAUI Engineering Team) implements a partial class-->
+    <NoWarn>CsWinRT1028</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Release' 
@@ -64,17 +67,17 @@
     <!-- Custom Fonts -->
     <MauiFont Include="Resources\Fonts\*" />
 
-    <PackageReference Include="Microsoft.Maui.Controls" Version="*" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)" />
     <PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.2.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview1" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.9.24507.7" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
 
   <PropertyGroup>
-    <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>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">26.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>

samples/CommunityToolkit.Maui.Sample/Converters/CompareDoubleToColorConverter.cs

@@ -6,6 +6,7 @@ namespace CommunityToolkit.Maui.Sample.Converters;
 /// Compares a double value against the ComparingValue property
 /// and returns a <see cref="Color"/> based on the comparison.
 /// </summary>
-public sealed class CompareDoubleToColorConverter : CompareConverter<double, Color>
+[AcceptEmptyServiceProvider]
+public sealed partial class CompareDoubleToColorConverter : CompareConverter<double, Color>
 {
 }

samples/CommunityToolkit.Maui.Sample/MauiProgram.cs

@@ -68,6 +68,14 @@ public static MauiApp CreateMauiApp()
 								.UseMauiCommunityToolkitCamera()
 								.UseMauiCommunityToolkitMediaElement()
 
+                                .ConfigureMauiHandlers(handlers =>
+                                {
+#if IOS || MACCATALYST
+									handlers.AddHandler<CollectionView, Microsoft.Maui.Controls.Handlers.Items2.CollectionViewHandler2>();
+                                    handlers.AddHandler<CarouselView, Microsoft.Maui.Controls.Handlers.Items2.CarouselViewHandler2>();
+#endif
+                                })
+
 #if WINDOWS
 								.UseMauiCommunityToolkitMaps("KEY") // You should add your own key here from bingmapsportal.com
 #else
@@ -112,6 +120,7 @@ public static MauiApp CreateMauiApp()
 		builder.Services.AddHttpClient<ByteArrayToImageSourceConverterViewModel>()
 						.AddStandardResilienceHandler(static options => options.Retry = new MobileHttpRetryStrategyOptions());
 
+		builder.Services.AddSingleton<AppShell>();
 		builder.Services.AddSingleton<PopupSizeConstants>();
 
 		RegisterViewsAndViewModels(builder.Services);

samples/CommunityToolkit.Maui.Sample/Pages/Alerts/AlertsGalleryPage.cs

@@ -2,7 +2,7 @@
 
 namespace CommunityToolkit.Maui.Sample.Pages.Alerts;
 
-public class AlertsGalleryPage(IDeviceInfo deviceInfo, AlertsGalleryViewModel alertsGalleryViewModel) : BaseGalleryPage<AlertsGalleryViewModel>("Alerts", deviceInfo, alertsGalleryViewModel)
+public partial class AlertsGalleryPage(IDeviceInfo deviceInfo, AlertsGalleryViewModel alertsGalleryViewModel) : BaseGalleryPage<AlertsGalleryViewModel>("Alerts", deviceInfo, alertsGalleryViewModel)
 {
 
 }

samples/CommunityToolkit.Maui.Sample/Pages/Alerts/SnackbarPage.xaml.cs

@@ -95,27 +95,27 @@ void Snackbar_Shown(object? sender, EventArgs e)
 
 	async void DisplaySnackbarInModalButtonClicked(object? sender, EventArgs e)
 	{
-		if (Application.Current?.MainPage is not null)
+		if (Application.Current?.Windows[0].Page is Page mainPage)
 		{
-			await Application.Current.MainPage.Navigation.PushModalAsync(new ContentPage
+			await mainPage.Navigation.PushModalAsync(new ContentPage
 			{
 				Content = new VerticalStackLayout
 				{
 					Spacing = 12,
 
 					Children =
 					{
-						new Button { Command = new AsyncRelayCommand(token => Snackbar.Make("Snackbar in a Modal Page").Show(token)) }
+						new Button { Command = new AsyncRelayCommand(static token => Snackbar.Make("Snackbar in a Modal MainPage").Show(token)) }
 							.Top().CenterHorizontal()
 							.Text("Display Snackbar"),
 
 						new Label()
 							.Center().TextCenter()
-							.Text("This is a Modal Page"),
+							.Text("This is a Modal MainPage"),
 
-						new Button { Command = new AsyncRelayCommand(Application.Current.MainPage.Navigation.PopModalAsync) }
+						new Button { Command = new AsyncRelayCommand(mainPage.Navigation.PopModalAsync) }
 							.Bottom().CenterHorizontal()
-							.Text("Back to Snackbar Page")
+							.Text("Back to Snackbar MainPage")
 					}
 				}.Center()
 			}.Padding(12));