.NET 8

Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
   <PropertyGroup>
-    <NetVersion>net7.0</NetVersion>
+    <NetVersion>net8.0</NetVersion>
     <!-- Fixes https://github.com/dotnet/maui/pull/12114 -->
     <PublishReadyToRun>false</PublishReadyToRun>
     <LangVersion>latest</LangVersion>

azure-pipelines.yml

@@ -5,8 +5,8 @@ variables:
   NugetPackageVersion: '$(CurrentSemanticVersion)'
   NugetPackageVersionMediaElement: '$(CurrentSemanticVersion)'
   NugetPackageVersionMaps: '$(CurrentSemanticVersion)'
-  TOOLKIT_NET_VERSION: '7.0.200'
-  LATEST_NET_VERSION: '7.0.x'
+  TOOLKIT_NET_VERSION: '8.0.100-preview.7.23376.3'
+  LATEST_NET_VERSION: '8.0.x'
   PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
   PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
   PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
@@ -21,9 +21,9 @@ variables:
   PathToCommunityToolkitAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.Analyzers.CodeFixes/CommunityToolkit.Maui.Analyzers.CodeFixes.csproj'
   PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.csproj'
   PathToCommunityToolkitAnalyzersUnitTestCsproj: 'src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj'
-  DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json'
+  DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.0-preview.7.8842.json'
   CommunityToolkitSampleApp_Xcode_Version: '14.3.0'
-  CommunityToolkitLibrary_Xcode_Version: '14.0.1'
+  CommunityToolkitLibrary_Xcode_Version: '14.3.0'
 
 trigger:
   branches:
@@ -70,6 +70,7 @@ jobs:
         inputs:
           packageType: 'sdk'
           version: '$(LATEST_NET_VERSION)'
+          includePreviewVersions: true
 
       - powershell: dotnet workload install maui
         displayName: Install Latest .NET MAUI Workload
@@ -117,7 +118,7 @@ jobs:
         'Windows':
           image: 'windows-latest'
         'macOS':
-          image: 'macos-12'
+          image: 'macos-13'
     pool:
       vmImage: $(image)
     steps:
@@ -173,6 +174,7 @@ jobs:
         inputs:
           packageType: 'sdk'
           version: '$(TOOLKIT_NET_VERSION)'
+          includePreviewVersions: true
 
       - task: CmdLine@2
         displayName: 'Install .NET MAUI Workload $(TOOLKIT_NET_VERSION)'

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.200",
+    "version": "8.0.100-preview.7.23376.3",
     "rollForward": "latestFeature",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }

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

@@ -56,6 +56,7 @@
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-preview.7.8842" />
   </ItemGroup>
 
   <PropertyGroup>

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

@@ -5,7 +5,7 @@ namespace CommunityToolkit.Maui.Sample.Converters;
 
 sealed class SecondsToStringConverter : IValueConverter
 {
-	public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
 	{
 		if (value is not double && value is not TimeSpan)
 		{
@@ -42,7 +42,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 		return value;
 	}
 
-	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
 	{
 		throw new NotSupportedException();
 	}

samples/CommunityToolkit.Maui.Sample/Pages/Views/Maps/BasicMapsPage.xaml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:maps="http://schemas.microsoft.com/dotnet/2021/maui/maps"
              xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
              xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
              x:Class="CommunityToolkit.Maui.Sample.Pages.Views.BasicMapsPage"
@@ -32,7 +33,7 @@
             <Label Text="Scroll enabled" VerticalOptions="Center"/>
         </HorizontalStackLayout>
         <Button Text="Move to region" Clicked="Button_OnClicked" Grid.Row="3"/>
-        <Map x:Name="BasicMap" Grid.Row="4" 
+        <maps:Map x:Name="BasicMap" Grid.Row="4" 
              IsShowingUser="{Binding IsToggled, Source={x:Reference ShowUserLocationSwitch}}"
              IsTrafficEnabled="{Binding IsToggled, Source={x:Reference ShowTrafficSwitch}}"
              IsZoomEnabled="{Binding IsToggled, Source={x:Reference ZoomEnabledSwitch}}"

samples/CommunityToolkit.Maui.Sample/Pages/Views/Maps/MapsPinsPage.xaml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <pages:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:maps="http://schemas.microsoft.com/dotnet/2021/maui/maps"
              xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
              xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
              x:DataType="vm:MapsPinsViewModel"
@@ -14,6 +15,6 @@
             <Button Text="Remove Pin" Clicked="RemovePin_Clicked" />
             <Button Text="Add 10 Pins" Clicked="Add10Pins_Clicked" />
         </HorizontalStackLayout>
-        <Map x:Name="PinsMap" Grid.Row="1" MapClicked="PinsMap_MapClicked" />
+        <maps:Map x:Name="PinsMap" Grid.Row="1" MapClicked="PinsMap_MapClicked" />
     </Grid>
 </pages:BasePage>

src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj

@@ -14,13 +14,12 @@
     <PackageReference Include="FluentAssertions" Version="6.11.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-preview.7.8842" />
   </ItemGroup>
 
   <ItemGroup>

src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj

@@ -55,7 +55,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-
+    <PackageReference Include="Microsoft.Maui.Core" Version="8.0.0-preview.7.8842" />
+    <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.0-preview.7.8842" />
     <PackageReference Include="System.Speech" Version="7.0.0" Condition="'$(TargetFramework)' == '$(NetVersion)-windows10.0.19041.0'" />
   </ItemGroup>
 

src/CommunityToolkit.Maui.Core/Platform/KeyboardExtensions/KeyboardExtensions.shared.cs

@@ -59,7 +59,9 @@ public static Task<bool> ShowKeyboardAsync(this ITextInput targetView, Cancellat
 		{
 			var showKeyboardTCS = new TaskCompletionSource<bool>();
 
-			handler.Invoke(nameof(IView.Focus), new FocusRequest(false));
+			var focusRequest = new FocusRequest();
+			focusRequest.SetResult(false);
+			handler.Invoke(nameof(IView.Focus), focusRequest);
 
 			handler.GetRequiredService<IDispatcher>().Dispatch(() =>
 			{

src/CommunityToolkit.Maui.Core/Views/DrawingView/Service/DrawingViewService.android.cs

@@ -57,7 +57,7 @@ static Stream GetBitmapStream(Bitmap? image, Size imageSize)
 
 		using var resizedImage = GetMaximumBitmap(image, (float)imageSize.Width, (float)imageSize.Height);
 		var stream = new MemoryStream();
-		var compressResult = resizedImage.Compress(Bitmap.CompressFormat.Png, 100, stream);
+		var compressResult = resizedImage.Compress(Bitmap.CompressFormat.Png!, 100, stream);
 
 		resizedImage.Recycle();
 

src/CommunityToolkit.Maui.Maps/CommunityToolkit.Maui.Maps.csproj

@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls.Maps" Version="7.0.86" />
+    <PackageReference Include="Microsoft.Maui.Controls.Maps" Version="8.0.0-preview.7.8842" />
   </ItemGroup>
 
 </Project>

src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj

@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFrameworks>$(NetVersion);$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);$(NetVersion)-tizen</TargetFrameworks> 
-		<UseMaui>true</UseMaui>
-		<SingleProject>true</SingleProject>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-    
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+  <PropertyGroup>
+    <TargetFrameworks>$(NetVersion);$(NetVersion)-android;$(NetVersion)-ios;$(NetVersion)-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);$(NetVersion)-tizen</TargetFrameworks>
+    <UseMaui>true</UseMaui>
+    <SingleProject>true</SingleProject>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
     <RootNamespace>CommunityToolkit.Maui</RootNamespace>
     <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
-	</PropertyGroup>
+  </PropertyGroup>
 
   <PropertyGroup>
     <GitInfoReportImportance>high</GitInfoReportImportance>
@@ -53,7 +53,7 @@
     <None Include="ReadMe.txt" pack="true" PackagePath="." />
   </ItemGroup>
 
-    <ItemGroup>
+  <ItemGroup>
     <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
@@ -62,4 +62,7 @@
     <PackageReference Include="Xam.Plugins.Android.ExoPlayer" Version="2.18.10" />
     <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Transformer" Version="2.18.10" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-preview.7.8842" />
+  </ItemGroup>
 </Project>

src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="xunit" Version="2.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-preview.7.8842" />
   </ItemGroup>
 
   <ItemGroup>

src/CommunityToolkit.Maui.UnitTests/Mocks/MockValueConverter.cs

@@ -4,19 +4,19 @@ namespace CommunityToolkit.Maui.UnitTests.Mocks;
 
 class MockValueConverter : IValueConverter
 {
-	readonly Func<object, object> returnValue;
+	readonly Func<object?, object> returnValue;
 
-	public MockValueConverter(Func<object, object> returnValue)
+	public MockValueConverter(Func<object?, object> returnValue)
 	{
 		this.returnValue = returnValue;
 	}
 
-	public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
 	{
 		return returnValue.Invoke(value);
 	}
 
-	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
 	{
 		return returnValue.Invoke(value);
 	}

src/CommunityToolkit.Maui/Behaviors/EventToCommandBehavior.shared.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Globalization;
+using System.Reflection;
 using System.Windows.Input;
 using CommunityToolkit.Maui.Converters;
 
@@ -134,7 +135,7 @@ void UnregisterEvent()
 	protected virtual void OnTriggerHandled(object? sender = null, object? eventArgs = null)
 	{
 		var parameter = CommandParameter
-			?? EventArgsConverter?.Convert(eventArgs, typeof(object), null, null);
+			?? EventArgsConverter?.Convert(eventArgs, typeof(object), null, CultureInfo.InvariantCulture);
 
 		var command = Command;
 		if (command?.CanExecute(parameter) ?? false)

src/CommunityToolkit.Maui/Behaviors/EventToCommandBehaviorGeneric.shared.cs

@@ -1,4 +1,6 @@
-namespace CommunityToolkit.Maui.Behaviors;
+using System.Globalization;
+
+namespace CommunityToolkit.Maui.Behaviors;
 
 /// <summary>
 /// This <see cref="EventToCommandBehavior"/> cast the sender object to a specific type defined by the user.
@@ -10,7 +12,7 @@ public sealed class EventToCommandBehavior<TType> : EventToCommandBehavior
 	protected override void OnTriggerHandled(object? sender = null, object? eventArgs = null)
 	{
 		var parameter = CommandParameter
-			?? EventArgsConverter?.Convert(eventArgs, typeof(object), null, null)
+			?? EventArgsConverter?.Convert(eventArgs, typeof(object), null, CultureInfo.InvariantCulture)
 			?? eventArgs;
 
 		if (parameter is not TType)

src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj

@@ -67,6 +67,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.0-preview.7.8842" />
   </ItemGroup>
 
 </Project>

src/CommunityToolkit.Maui/Converters/ICommunityToolkitValueConverter.shared.cs

@@ -48,10 +48,10 @@ public interface ICommunityToolkitValueConverter : IValueConverter
 	new object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo? culture);
 
 	/// <inheritdoc />
-	object? IValueConverter.Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+	object? IValueConverter.Convert(object? value, Type targetType, object? parameter, CultureInfo culture) =>
 		Convert(value, targetType, parameter, culture);
 
 	/// <inheritdoc />
-	object? IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
+	object? IValueConverter.ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) =>
 		ConvertBack(value, targetType, parameter, culture);
 }

src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs

@@ -46,7 +46,7 @@ public partial class Popup : Element, IPopup, IWindowController, IPropertyPropag
 
 	TaskCompletionSource popupDismissedTaskCompletionSource = new();
 	TaskCompletionSource<object?> resultTaskCompletionSource = new();
-	Window? window;
+	Window window;
 
 	/// <summary>
 	/// Instantiates a new instance of <see cref="Popup"/>.
@@ -56,6 +56,7 @@ public Popup()
 		platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<Popup>>(() => new(this));
 
 		VerticalOptions = HorizontalOptions = LayoutAlignment.Center;
+		window = Window;
 	}
 
 	/// <summary>
@@ -165,7 +166,7 @@ public bool CanBeDismissedByTappingOutsideOfPopup
 	/// <summary>
 	/// Property that represents the Window that's showing the Popup.
 	/// </summary>
-	public Window? Window
+	public Window Window
 	{
 		get => window;
 		set