diff --git a/DataFormSample/DataFormSample/App.xaml.cs b/DataFormSample/DataFormSample/App.xaml.cs
index 0979011..7bad6a7 100644
--- a/DataFormSample/DataFormSample/App.xaml.cs
+++ b/DataFormSample/DataFormSample/App.xaml.cs
@@ -5,8 +5,10 @@ public partial class App : Application
         public App()
         {
             InitializeComponent();
-
-            MainPage = new AppShell();
+        }
+        protected override Window CreateWindow(IActivationState? activationState)
+        {
+            return new Window(new MainPage());
         }
     }
 }
diff --git a/DataFormSample/DataFormSample/AppShell.xaml b/DataFormSample/DataFormSample/AppShell.xaml
deleted file mode 100644
index 51b5b53..0000000
--- a/DataFormSample/DataFormSample/AppShell.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="DataFormSample.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:DataFormSample"
-    Shell.FlyoutBehavior="Disabled"
-    Title="DataFormSample">
-
-    <ShellContent
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
-</Shell>
diff --git a/DataFormSample/DataFormSample/AppShell.xaml.cs b/DataFormSample/DataFormSample/AppShell.xaml.cs
deleted file mode 100644
index 23bda42..0000000
--- a/DataFormSample/DataFormSample/AppShell.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace DataFormSample
-{
-    public partial class AppShell : Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/DataFormSample/DataFormSample/DataFormSample.csproj b/DataFormSample/DataFormSample/DataFormSample.csproj
index 09c0c5e..b72e2e6 100644
--- a/DataFormSample/DataFormSample/DataFormSample.csproj
+++ b/DataFormSample/DataFormSample/DataFormSample.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.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);net8.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 
 		<!-- Note for MacCatalyst:
 		The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -61,9 +61,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.82" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.82" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.DataForm" Version="*" />
 	</ItemGroup>
 
diff --git a/DataFormSample/DataFormSample/DataFormSample.csproj.user b/DataFormSample/DataFormSample/DataFormSample.csproj.user
new file mode 100644
index 0000000..345183c
--- /dev/null
+++ b/DataFormSample/DataFormSample/DataFormSample.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
+    <ActiveDebugFramework>net9.0-windows10.0.19041.0</ActiveDebugFramework>
+    <ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
+    <SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
+    <DefaultDevice>pixel_5_-_api_34</DefaultDevice>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/DataFormSample/DataFormSample/MainPage.xaml b/DataFormSample/DataFormSample/MainPage.xaml
index 7e2deae..4ddd6d4 100644
--- a/DataFormSample/DataFormSample/MainPage.xaml
+++ b/DataFormSample/DataFormSample/MainPage.xaml
@@ -9,7 +9,9 @@
         <local:ViewModel/>
     </ContentPage.BindingContext>
 
-    <dataForm:SfDataForm DataObject="{Binding Info}"
+    <dataForm:SfDataForm 
+        x:DataType="local:ViewModel"
+        DataObject="{Binding Info}"
                          LayoutType="TextInputLayout"
                          GenerateDataFormItem="SfDataForm_GenerateDataFormItem">
     </dataForm:SfDataForm>
diff --git a/DataFormSample/DataFormSample/MainPage.xaml.cs b/DataFormSample/DataFormSample/MainPage.xaml.cs
index 5eefd53..ae4568a 100644
--- a/DataFormSample/DataFormSample/MainPage.xaml.cs
+++ b/DataFormSample/DataFormSample/MainPage.xaml.cs
@@ -11,7 +11,7 @@ public MainPage()
             InitializeComponent();
         }
 
-        private void SfDataForm_GenerateDataFormItem(object sender, GenerateDataFormItemEventArgs e)
+        private void SfDataForm_GenerateDataFormItem(object? sender, GenerateDataFormItemEventArgs e)
         {
             if (e.DataFormItem != null)
             {