Support .NET 9.0

Directory.Build.props

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
   <PropertyGroup>
-    <NetVersion>net8.0</NetVersion>
-    <MauiPackageVersion>8.0.71</MauiPackageVersion>
+    <NetVersion>net9.0</NetVersion>
+    <MauiPackageVersion>9.0.0-rc.1.24453.9</MauiPackageVersion>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

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.1.24452.12'
+  LATEST_NET_VERSION: '9.0.x'
   PathToLibrarySolution: 'src/CommunityToolkit.Maui.sln'
   PathToSamplesSolution: 'samples/CommunityToolkit.Maui.Sample.sln'
   PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
@@ -76,7 +76,7 @@ jobs:
         inputs:
           packageType: 'sdk'
           version: '$(LATEST_NET_VERSION)'
-          includePreviewVersions: false
+          includePreviewVersions: true
 
       - task: CmdLine@2
         displayName: 'Install Latest .NET MAUI Workload'
@@ -206,7 +206,7 @@ jobs:
         inputs:
           packageType: 'sdk'
           version: '$(TOOLKIT_NET_VERSION)'
-          includePreviewVersions: false
+          includePreviewVersions: true
 
       - task: CmdLine@2
         displayName: 'Install .NET MAUI Workload $(TOOLKIT_NET_VERSION)'

global.json

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

src/CommunityToolkit.Maui.Analyzers.UnitTests/Verifiers/CSharpAnalyzerVerifier`1+Test.cs

@@ -12,6 +12,8 @@ public Test(params Type[] assembliesUnderTest)
 		{
 #if NET8_0
 			ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net80;
+#elif NET9_0
+			ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net90;
 #else
 #error ReferenceAssemblies must be updated to current version of .NET
 #endif

src/CommunityToolkit.Maui.Analyzers.UnitTests/Verifiers/CSharpCodeFixVerifier`2+Test.cs

@@ -15,6 +15,8 @@ public Test(params Type[] assembliesUnderTest)
 		{
 #if NET8_0
 			ReferenceAssemblies = ReferenceAssemblies.Net.Net80;
+#elif NET9_0
+			ReferenceAssemblies = ReferenceAssemblies.Net.Net90;
 #else
 #error ReferenceAssemblies must be updated to current version of .NET
 #endif

src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj

@@ -51,23 +51,25 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.1.1" />
-    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.1.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.4.1" />
+    <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.4.1" />
 
-    <!-- Xamarin.AndroidX.Camera 1.3.1.1 depends on Xamarin.AndroidX.Lifecycle.LiveData 2.7.0.1:
+    <!-- Xamarin.AndroidX.Camera 1.3.4.1 depends on Xamarin.AndroidX.Lifecycle.LiveData 2.8.4.0:
     https://www.nuget.org/packages/Xamarin.AndroidX.Camera.Core/#dependencies-body-tab 
-    However, Dotnet MAUI still implicitly references Xamarin.AndroidX.Lifecycle.LiveData 2.6.1.3:
+    However, Dotnet MAUI still implicitly references Xamarin.AndroidX.Lifecycle.LiveData 2.8.3.1:
     https://github.com/dotnet/maui/blob/main/eng/AndroidX.targets
     This causes build error "Detected package downgrade":
     https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1605
     Workaround: add a package reference to the higher version of the package. Possibly can be removed when MAUI bumps the implicit reference version.
     -->
-    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.7.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.8.4.0" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.4.0" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core" Version="2.8.4.0" />
 
     <!--Adding the above package reference requires Workaround for https://github.com/xamarin/AndroidX/issues/800#issuecomment-1774639627 -->
     <!-- Tracking issue https://github.com/xamarin/AndroidX/issues/764 -->
-    <PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.0.1" />
-    <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.1" />
+    <PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.3.1" />
+    <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewTests.cs

@@ -108,7 +108,7 @@ public void ConstructorTest()
 		avatarView.TextColor.Should().Be(Colors.Pink);
 		avatarView.Text.Should().Be("GL");
 		avatarView.TextTransform.Should().Be(TextTransform.Lowercase);
-		Size request = avatarView.Measure(double.PositiveInfinity, double.PositiveInfinity).Request;
+		Size request = avatarView.Measure(double.PositiveInfinity, double.PositiveInfinity);
 		request.Width.Should().Be(10);
 		request.Height.Should().Be(20);
 	}
@@ -191,7 +191,7 @@ public void DefaultFontSize()
 	public void DefaultHeightRequest()
 	{
 		var avatarView = new Maui.Views.AvatarView();
-		Size request = avatarView.Measure(double.PositiveInfinity, double.PositiveInfinity).Request;
+		Size request = avatarView.Measure(double.PositiveInfinity, double.PositiveInfinity);
 		request.Height.Should().Be(AvatarViewDefaults.DefaultHeightRequest);
 	}
 
@@ -228,7 +228,7 @@ public void DefaultProperties()
 	public void DefaultWidthRequest()
 	{
 		var avatarView = new Maui.Views.AvatarView();
-		Size request = avatarView.Measure(double.PositiveInfinity, double.PositiveInfinity).Request;
+		Size request = avatarView.Measure(double.PositiveInfinity, double.PositiveInfinity);
 		request.Width.Should().Be(AvatarViewDefaults.DefaultWidthRequest);
 	}
 

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

@@ -34,7 +34,9 @@ public class EventToCommandBehavior : BaseBehavior<VisualElement>
 	public static readonly BindableProperty EventArgsConverterProperty =
 		BindableProperty.Create(nameof(EventArgsConverter), typeof(IValueConverter), typeof(EventToCommandBehavior));
 
+#pragma warning disable IL2026 // NET9.0 - check if this can be fixed
 	readonly MethodInfo eventHandlerMethodInfo = typeof(EventToCommandBehavior).GetTypeInfo().GetDeclaredMethod(nameof(OnTriggerHandled)) ?? throw new InvalidOperationException($"Cannot find method {nameof(OnTriggerHandled)}");
+#pragma warning restore IL2026
 
 	Delegate? eventHandler;
 

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

@@ -26,11 +26,13 @@ internal bool TrySetBindingContextToAttachedViewBindingContext()
 			return false;
 		}
 
+#pragma warning disable IL2026 // NET9.0 - check if this can be fixed
 		behavior.SetBinding(BindableObject.BindingContextProperty, new Binding
 		{
 			Source = View,
 			Path = BindableObject.BindingContextProperty.PropertyName
 		});
+#pragma warning restore IL2026
 
 		return true;
 

src/CommunityToolkit.Maui/Behaviors/Validators/ValidationBehavior.shared.cs

@@ -346,11 +346,13 @@ async Task OnValuePropertyChanged(CancellationToken token)
 
 	void OnValuePropertyNamePropertyChanged()
 	{
+#pragma warning disable IL2026 // NET9.0 - check if this can be fixed
 		SetBinding(ValueProperty, new Binding
 		{
 			Path = ValuePropertyName,
 			Source = View
 		});
+#pragma warning restore IL2026
 	}
 
 	async ValueTask UpdateStateAsync(VisualElement? view, ValidationFlags flags, bool isForced, CancellationToken? parentToken = null)
@@ -410,13 +412,8 @@ async ValueTask UpdateStateAsync(VisualElement? view, ValidationFlags flags, boo
 	void UpdateStyle(in VisualElement view, bool isValid)
 	{
 		VisualStateManager.GoToState(view, isValid ? ValidVisualState : InvalidVisualState);
-
-		if ((ValidStyle ?? InvalidStyle) == null)
-		{
-			return;
-		}
-
-		view.Style = isValid ? ValidStyle : InvalidStyle;
+
+		view.Style = (isValid ? ValidStyle : InvalidStyle) ?? view.Style;
 	}
 
 	void ResetValidationTokenSource(CancellationTokenSource? newTokenSource)

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

@@ -52,7 +52,7 @@ public interface ICommunityToolkitValueConverter : IValueConverter
 
 
 	/// <inheritdoc />
-#if NET8_0 // Should be fixed in .NET 9
+#if NET8_0 || NET9_0 // Should be fixed in .NET 9 - Not fixed in the first RC
 #pragma warning disable IL2092
 #endif
 	object? IValueConverter.Convert(object? value, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type targetType, object? parameter, CultureInfo culture) =>
@@ -61,7 +61,7 @@ public interface ICommunityToolkitValueConverter : IValueConverter
 	/// <inheritdoc />
 	object? IValueConverter.ConvertBack(object? value, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type targetType, object? parameter, CultureInfo culture) =>
 		ConvertBack(value, targetType, parameter, culture);
-#if NET8_0
+#if NET8_0 || NET9_0
 #pragma warning restore IL2092
 #endif
 }

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

@@ -7,7 +7,7 @@ namespace CommunityToolkit.Maui.Converters;
 public sealed class IsInRangeConverter : IsInRangeConverter<IComparable, object>;
 
 /// <summary>Converts the incoming value to a <see cref="bool"/> indicating whether or not the value is within a range.</summary>
-public abstract class IsInRangeConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] TValue, TReturnObject> : BaseConverterOneWay<TValue, object> where TValue : IComparable
+public abstract class IsInRangeConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TValue, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TReturnObject> : BaseConverterOneWay<TValue, object> where TValue : IComparable
 {
 	/// <summary>
 	/// Bindable property for <see cref="FalseObject"/>

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

@@ -17,7 +17,7 @@ public class MultiConverter : List<ICommunityToolkitValueConverter>, ICommunityT
 	[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
 	Type ICommunityToolkitValueConverter.ToType => throw new NotSupportedException($"{nameof(ICommunityToolkitMultiValueConverter)} does not implement {nameof(ICommunityToolkitValueConverter.ToType)}");
 
-#if NET8_0 // Should be fixed in .NET 9
+#if NET8_0 || NET9_0 // Should be fixed in .NET 9
 #pragma warning disable IL2092
 #endif
 	/// <summary>
@@ -44,7 +44,7 @@ public class MultiConverter : List<ICommunityToolkitValueConverter>, ICommunityT
 	/// <returns>N/A</returns>
 	public object? ConvertBack(object? value, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type targetType, object? parameter, System.Globalization.CultureInfo? culture)
 		=> throw new NotSupportedException("Impossible to revert to original value. Consider setting BindingMode to OneWay.");
-#if NET8_0 // Should be fixed in .NET 9
+#if NET8_0 || NET9_0 // Should be fixed in .NET 9
 #pragma warning restore IL2092
 #endif
 }

src/CommunityToolkit.Maui/ImageSources/GravatarImageSource.shared.cs

@@ -1,4 +1,6 @@
-namespace CommunityToolkit.Maui.ImageSources;
+using Microsoft.Maui.Controls.Internals;
+
+namespace CommunityToolkit.Maui.ImageSources;
 
 using CommunityToolkit.Maui.Extensions;
 using Microsoft.Maui.Controls;
@@ -143,8 +145,8 @@ protected override void OnParentSet()
 			return;
 		}
 
-		SetBinding(ParentWidthProperty, new Binding(nameof(VisualElement.Width), BindingMode.OneWay, source: parentElement));
-		SetBinding(ParentHeightProperty, new Binding(nameof(VisualElement.Height), BindingMode.OneWay, source: parentElement));
+		SetBinding(ParentWidthProperty, BindingBase.Create<VisualElement, double>(static p => p.Width, source: parentElement));
+		SetBinding(ParentHeightProperty, BindingBase.Create<VisualElement, double>(static p => p.Height, source: parentElement));
 	}
 
 	static string DefaultGravatarName(DefaultImage defaultGravatar) => defaultGravatar switch

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

@@ -72,8 +72,8 @@ public AvatarView()
 			CornerRadius = new CornerRadius(AvatarViewDefaults.DefaultCornerRadius.TopLeft, AvatarViewDefaults.DefaultCornerRadius.TopRight, AvatarViewDefaults.DefaultCornerRadius.BottomLeft, AvatarViewDefaults.DefaultCornerRadius.BottomRight),
 		};
 		Content = avatarLabel;
-		avatarImage.SetBinding(WidthRequestProperty, new Binding(nameof(WidthRequest), source: this));
-		avatarImage.SetBinding(HeightRequestProperty, new Binding(nameof(HeightRequest), source: this));
+		avatarImage.SetBinding(WidthRequestProperty, BindingBase.Create<VisualElement, double>(static p => p.WidthRequest, source: this));
+		avatarImage.SetBinding(HeightRequestProperty, BindingBase.Create<VisualElement, double>(static p => p.HeightRequest, source: this));
 	}
 
 	/// <summary>Gets or sets the control font.</summary>

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

@@ -81,7 +81,7 @@ static void OnContentPropertyChanged(BindableObject bindable, object oldValue, o
 		var expander = (Expander)bindable;
 		if (newValue is View view)
 		{
-			view.SetBinding(IsVisibleProperty, new Binding(nameof(IsExpanded), source: bindable));
+			view.SetBinding(IsVisibleProperty, BindingBase.Create<Expander, bool>(static p => p.IsExpanded, source: expander));
 
 			expander.ContentGrid.Remove(oldValue);
 			expander.ContentGrid.Add(newValue);