Dreamescaper · Dreamescaper · Nov 13, 2022 · Sep 29, 2022 · Oct 16, 2022 · Oct 16, 2022
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,19 +15,12 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0        
-    - name: Install .NET 6.0.400
+    - name: Install .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '6.0.400'
-        include-prerelease: true
+        dotnet-version: '7.0.x'
     - name: Install MAUI
-      run: |
-        dotnet workload install maui `
-          --from-rollback-file https://maui.blob.core.windows.net/metadata/rollbacks/6.0.486.json `
-          --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json `
-          --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f-3/nuget/v3/index.json `
-          --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json `
-          --source https://api.nuget.org/v3/index.json
+      run: dotnet workload install maui
     - name: Restore dependencies
       run: dotnet restore BlazorBindings.Maui.sln
     - name: Run tests

diff --git a/BlazorBindings.Maui.sln b/BlazorBindings.Maui.sln
@@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		src\Directory.Build.props = src\Directory.Build.props
 		src\Directory.Build.targets = src\Directory.Build.targets
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 		global.json = global.json
 		nuget.config = nuget.config
 		Readme.md = Readme.md

diff --git a/samples/BlazorBindingsToDo/BlazorBindingsToDo.csproj b/samples/BlazorBindingsToDo/BlazorBindingsToDo.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>BlazorBindingsToDo</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/samples/BlazorBindingsToDo/Platforms/Android/AndroidManifest.xml b/samples/BlazorBindingsToDo/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/samples/BlazorBindingsXaminals/BlazorBindingsXaminals.csproj b/samples/BlazorBindingsXaminals/BlazorBindingsXaminals.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>BlazorBindingsXaminals</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/samples/BlazorBindingsXaminals/Platforms/Android/AndroidManifest.xml b/samples/BlazorBindingsXaminals/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/samples/ControlGallery/ControlGallery.csproj b/samples/ControlGallery/ControlGallery.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>ControlGallery</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/samples/ControlGallery/Platforms/Android/AndroidManifest.xml b/samples/ControlGallery/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/samples/FluxorSample/FluxorSample.csproj b/samples/FluxorSample/FluxorSample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>FluxorSample</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -47,7 +47,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Fluxor.Blazor.Web" Version="5.5.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/samples/FluxorSample/Platforms/Android/AndroidManifest.xml b/samples/FluxorSample/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/samples/FlyoutPageSample/FlyoutPageSample.csproj b/samples/FlyoutPageSample/FlyoutPageSample.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>FlyoutPageSample</RootNamespace>
 		<UseMaui>true</UseMaui>

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/Button.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/Button.generated.cs
@@ -132,7 +132,7 @@ protected override void HandleParameter(string name, object value)
                 case nameof(OnPress):
                     if (!Equals(OnPress, value))
                     {
-                        void NativeControlPressed(object sender, EventArgs e) => InvokeAsync(() => OnPress.InvokeAsync());
+                        void NativeControlPressed(object sender, EventArgs e) => InvokeEventCallback(OnPress);
 
                         OnPress = (EventCallback)value;
                         NativeControl.Pressed -= NativeControlPressed;
@@ -142,7 +142,7 @@ protected override void HandleParameter(string name, object value)
                 case nameof(OnRelease):
                     if (!Equals(OnRelease, value))
                     {
-                        void NativeControlReleased(object sender, EventArgs e) => InvokeAsync(() => OnRelease.InvokeAsync());
+                        void NativeControlReleased(object sender, EventArgs e) => InvokeEventCallback(OnRelease);
 
                         OnRelease = (EventCallback)value;
                         NativeControl.Released -= NativeControlReleased;
@@ -152,7 +152,7 @@ protected override void HandleParameter(string name, object value)
                 case nameof(OnClick):
                     if (!Equals(OnClick, value))
                     {
-                        void NativeControlClicked(object sender, EventArgs e) => InvokeAsync(() => OnClick.InvokeAsync());
+                        void NativeControlClicked(object sender, EventArgs e) => InvokeEventCallback(OnClick);
 
                         OnClick = (EventCallback)value;
                         NativeControl.Clicked -= NativeControlClicked;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/CheckBox.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/CheckBox.generated.cs
@@ -107,7 +107,7 @@ void NativeControlCheckedChanged(object sender, MC.CheckedChangedEventArgs e)
                         {
                             var value = NativeControl.IsChecked;
                             IsChecked = value;
-                            InvokeAsync(() => IsCheckedChanged.InvokeAsync(value));
+                            InvokeEventCallback(IsCheckedChanged, value);
                         }
 
                         IsCheckedChanged = (EventCallback<bool>)value;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/NumericUpDown.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/NumericUpDown.generated.cs
@@ -110,7 +110,7 @@ void NativeControlValueChanged(object sender, MC.ValueChangedEventArgs e)
                         {
                             var value = NativeControl.Value;
                             Value = value;
-                            InvokeAsync(() => ValueChanged.InvokeAsync(value));
+                            InvokeEventCallback(ValueChanged, value);
                         }
 
                         ValueChanged = (EventCallback<double>)value;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/ProgressRadial.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/ProgressRadial.generated.cs
@@ -111,7 +111,7 @@ void NativeControlValueChanged(object sender, MC.ValueChangedEventArgs e)
                         {
                             var value = NativeControl.Value;
                             Value = value;
-                            InvokeAsync(() => ValueChanged.InvokeAsync(value));
+                            InvokeEventCallback(ValueChanged, value);
                         }
 
                         ValueChanged = (EventCallback<int>)value;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/PulseIcon.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/PulseIcon.generated.cs
@@ -75,7 +75,7 @@ protected override void HandleParameter(string name, object value)
                 case nameof(OnClick):
                     if (!Equals(OnClick, value))
                     {
-                        void NativeControlClicked(object sender, EventArgs e) => InvokeAsync(() => OnClick.InvokeAsync());
+                        void NativeControlClicked(object sender, EventArgs e) => InvokeEventCallback(OnClick);
 
                         OnClick = (EventCallback)value;
                         NativeControl.Clicked -= NativeControlClicked;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/Rating.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/Rating.generated.cs
@@ -126,7 +126,7 @@ void NativeControlValueChanged(object sender, AC.RatingValueChangedEventArgs e)
                         {
                             var value = NativeControl.Value;
                             Value = value;
-                            InvokeAsync(() => ValueChanged.InvokeAsync(value));
+                            InvokeEventCallback(ValueChanged, value);
                         }
 
                         ValueChanged = (EventCallback<int>)value;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/Slider.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/Slider.generated.cs
@@ -120,7 +120,7 @@ void NativeControlValueChanged(object sender, MC.ValueChangedEventArgs e)
                         {
                             var value = NativeControl.Value;
                             Value = value;
-                            InvokeAsync(() => ValueChanged.InvokeAsync(value));
+                            InvokeEventCallback(ValueChanged, value);
                         }
 
                         ValueChanged = (EventCallback<double>)value;

diff --git a/samples/ThirdPartyControlsSample/Elements/AlohaKit/ToggleSwitch.generated.cs b/samples/ThirdPartyControlsSample/Elements/AlohaKit/ToggleSwitch.generated.cs
@@ -87,7 +87,7 @@ void NativeControlPropertyChanged(object sender, PropertyChangedEventArgs e)
                             {
                                 var value = NativeControl.IsOn;
                                 IsOn = value;
-                                InvokeAsync(() => IsOnChanged.InvokeAsync(value));
+                                InvokeEventCallback(IsOnChanged, value);
                             }
                         }
 

diff --git a/samples/ThirdPartyControlsSample/Elements/CommunityToolkit/AvatarView.generated.cs b/samples/ThirdPartyControlsSample/Elements/CommunityToolkit/AvatarView.generated.cs
@@ -26,7 +26,6 @@ static AvatarView()
         [Parameter] public Color BorderColor { get; set; }
         [Parameter] public double? BorderWidth { get; set; }
         [Parameter] public double? CharacterSpacing { get; set; }
-        [Parameter] public CornerRadius? CornerRadius { get; set; }
         [Parameter] public MC.FontAttributes? FontAttributes { get; set; }
         [Parameter] public bool? FontAutoScalingEnabled { get; set; }
         [Parameter] public string FontFamily { get; set; }
@@ -65,13 +64,6 @@ protected override void HandleParameter(string name, object value)
                         NativeControl.CharacterSpacing = CharacterSpacing ?? default;
                     }
                     break;
-                case nameof(CornerRadius):
-                    if (!Equals(CornerRadius, value))
-                    {
-                        CornerRadius = (CornerRadius?)value;
-                        NativeControl.CornerRadius = CornerRadius ?? (CornerRadius)CMV.AvatarView.CornerRadiusProperty.DefaultValue;
-                    }
-                    break;
                 case nameof(FontAttributes):
                     if (!Equals(FontAttributes, value))
                     {

diff --git a/samples/ThirdPartyControlsSample/Elements/CommunityToolkit/DrawingView.generated.cs b/samples/ThirdPartyControlsSample/Elements/CommunityToolkit/DrawingView.generated.cs
@@ -86,7 +86,7 @@ protected override void HandleParameter(string name, object value)
                 case nameof(OnDrawingLineCompleted):
                     if (!Equals(OnDrawingLineCompleted, value))
                     {
-                        void NativeControlDrawingLineCompleted(object sender, DrawingLineCompletedEventArgs e) => InvokeAsync(() => OnDrawingLineCompleted.InvokeAsync(e));
+                        void NativeControlDrawingLineCompleted(object sender, DrawingLineCompletedEventArgs e) => InvokeEventCallback(OnDrawingLineCompleted, e);
 
                         OnDrawingLineCompleted = (EventCallback<DrawingLineCompletedEventArgs>)value;
                         NativeControl.DrawingLineCompleted -= NativeControlDrawingLineCompleted;

diff --git a/samples/ThirdPartyControlsSample/Elements/CommunityToolkit/Popup.generated.cs b/samples/ThirdPartyControlsSample/Elements/CommunityToolkit/Popup.generated.cs
@@ -33,6 +33,7 @@ static Popup()
         [Parameter] public MMP.LayoutAlignment? HorizontalOptions { get; set; }
         [Parameter] public Size? Size { get; set; }
         [Parameter] public MMP.LayoutAlignment? VerticalOptions { get; set; }
+        [Parameter] public MC.Window Window { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
         [Parameter] public EventCallback<PopupClosedEventArgs> OnClosed { get; set; }
         [Parameter] public EventCallback<PopupOpenedEventArgs> OnOpened { get; set; }
@@ -80,13 +81,20 @@ protected override void HandleParameter(string name, object value)
                         NativeControl.VerticalOptions = VerticalOptions ?? (MMP.LayoutAlignment)CMV.Popup.VerticalOptionsProperty.DefaultValue;
                     }
                     break;
+                case nameof(Window):
+                    if (!Equals(Window, value))
+                    {
+                        Window = (MC.Window)value;
+                        NativeControl.Window = Window;
+                    }
+                    break;
                 case nameof(ChildContent):
                     ChildContent = (RenderFragment)value;
                     break;
                 case nameof(OnClosed):
                     if (!Equals(OnClosed, value))
                     {
-                        void NativeControlClosed(object sender, PopupClosedEventArgs e) => InvokeAsync(() => OnClosed.InvokeAsync(e));
+                        void NativeControlClosed(object sender, PopupClosedEventArgs e) => InvokeEventCallback(OnClosed, e);
 
                         OnClosed = (EventCallback<PopupClosedEventArgs>)value;
                         NativeControl.Closed -= NativeControlClosed;
@@ -96,7 +104,7 @@ protected override void HandleParameter(string name, object value)
                 case nameof(OnOpened):
                     if (!Equals(OnOpened, value))
                     {
-                        void NativeControlOpened(object sender, PopupOpenedEventArgs e) => InvokeAsync(() => OnOpened.InvokeAsync(e));
+                        void NativeControlOpened(object sender, PopupOpenedEventArgs e) => InvokeEventCallback(OnOpened, e);
 
                         OnOpened = (EventCallback<PopupOpenedEventArgs>)value;
                         NativeControl.Opened -= NativeControlOpened;

diff --git a/samples/ThirdPartyControlsSample/Properties/Elements.cs b/samples/ThirdPartyControlsSample/Properties/Elements.cs
@@ -19,7 +19,7 @@
 [assembly: GenerateComponent(typeof(PulseIcon))]
 
 // CommunityToolkit
-[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.AvatarView))]
+[assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.AvatarView), Exclude = new[] { nameof(CommunityToolkit.Maui.Views.AvatarView.CornerRadius) })]
 [assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.DrawingView))]
 [assembly: GenerateComponent(typeof(CommunityToolkit.Maui.Views.Popup), Exclude = new[] { nameof(CommunityToolkit.Maui.Views.Popup.Anchor) })]
 

diff --git a/samples/ThirdPartyControlsSample/ThirdPartyControlsSample.csproj b/samples/ThirdPartyControlsSample/ThirdPartyControlsSample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
@@ -47,7 +47,7 @@
 
 	<ItemGroup>
 	  <PackageReference Include="AlohaKit" Version="1.0.0" />
-	  <PackageReference Include="CommunityToolkit.Maui" Version="1.3.0" />
+	  <PackageReference Include="CommunityToolkit.Maui" Version="3.0.0" />
 	  <PackageReference Include="XCalendar.Maui" Version="4.2.0" />
 	</ItemGroup>
 

diff --git a/src/BlazorBindings.Core/BlazorBindings.Core.csproj b/src/BlazorBindings.Core/BlazorBindings.Core.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0</TargetFrameworks>
+		<TargetFrameworks>net7.0</TargetFrameworks>
 		<Title>Blazor Bindings Core Runtime</Title>
 		<Description>Common logic for using Blazor to target native renderers. For mobile app projects for Android and iOS use the BlazorBindings.Maui package.</Description>
 		<PackageTags>blazor;blazorbindings</PackageTags>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.10" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.0" />
 
 		<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
 			<PrivateAssets>all</PrivateAssets>

diff --git a/src/BlazorBindings.Maui.ComponentGenerator/BlazorBindings.Maui.ComponentGenerator.csproj b/src/BlazorBindings.Maui.ComponentGenerator/BlazorBindings.Maui.ComponentGenerator.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net6.0</TargetFrameworks>
+		<TargetFrameworks>net7.0</TargetFrameworks>
 
 		<Description>Dotnet tool which generate BlazorBindings.Maui components for MAUI elements.</Description>
 		<PackAsTool>true</PackAsTool>
@@ -13,6 +13,6 @@
 	<ItemGroup>
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
-		<PackageReference Include="Buildalyzer.Workspaces" Version="4.1.4" />
+		<PackageReference Include="Buildalyzer.Workspaces" Version="4.1.6" />
 	</ItemGroup>
 </Project>
diff --git a/src/BlazorBindings.Maui.SkiaSharp/BlazorBindings.Maui.SkiaSharp.csproj b/src/BlazorBindings.Maui.SkiaSharp/BlazorBindings.Maui.SkiaSharp.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net7.0</TargetFrameworks>
 		<UseMaui>true</UseMaui>
 		<Title>Experimental binding of Skia Sharp in Maui Blazor Bindings</Title>
 		<Description>Support for Skia Sharp for Maui Blazor Bindings.</Description>