diff --git a/docs/tutorials/notes-app/includes/navigation.md b/docs/tutorials/notes-app/includes/navigation.md
index 09a150942..2204e1d02 100644
--- a/docs/tutorials/notes-app/includes/navigation.md
+++ b/docs/tutorials/notes-app/includes/navigation.md
@@ -1,7 +1,7 @@
 ---
 author: adegeo
 ms.author: adegeo
-ms.date: 03/21/2024
+ms.date: 02/26/2025
 ms.topic: include
 no-loc: ["MainPage.xaml", "MainPage.xaml.cs", "NotePage.xaml", "NotePage.xaml.cs", "AboutPage.xaml", "AboutPage.xaml.cs", "AppShell.xaml", "AppShell.xaml.cs", "Note.cs", "AllNotes"]
 ---
@@ -150,7 +150,7 @@ The about page will be the quickest page to update and you'll be able to run the
 01. In the **Solution Explorer** pane, open the _Views\\AboutPage.xaml_ file.
 01. Replace the content with the following snippet:
 
-    :::code language="xaml" source="../snippets/navigation/Views/AboutPage.xaml" highlight="4,6-8,14,15,18":::
+    :::code language="xaml" source="../snippets/navigation/Views/AboutPage.xaml" highlight="4,6,7-9,15,16,19":::
 
 Let's look at the changed lines, which are highlighted in the previous snippet:
 
@@ -158,6 +158,10 @@ Let's look at the changed lines, which are highlighted in the previous snippet:
 
   This line maps the `Notes.Models` .NET namespace to the `models` XML namespace.
 
+- `x:DataType="models:About"`
+
+  This line instructs the XAML compiler to compile all binding expressions for increased runtime performance, and resolves the binding expressions against the `Notes.Models.About` type.
+
 - The `BindingContext` property of the <xref:Microsoft.Maui.Controls.ContentPage> is set to an instance of the `Note.Models.About` class, using the XML namespace and object of `models:About`. This was set using **property element syntax** instead of an XML attribute.
 
   > [!IMPORTANT]
@@ -199,9 +203,23 @@ Run the app and you should see that it runs exactly the same as before. Try chan
 The previous section bound the **:::no-loc text="about":::** page view to the **:::no-loc text="about":::** model, and now you'll do the same, binding the **:::no-loc text="note":::** view to the **:::no-loc text="note":::** model. However, in this case, the model won't be created in XAML but will be provided in the code-behind in the next few steps.
 
 01. In the **Solution Explorer** pane, open the _Views\\NotePage.xaml_ file.
-01. Change the `<Editor>` control adding the `Text` property. Bind the property to the `Text` property: `<Editor ... Text="{Binding Text}"`:
+01. Replace the content with the following snippet:
+
+    :::code language="xaml" source="../snippets/navigation/Views/NotePage.xaml" highlight="4,7,11":::
+
+Let's look at the changed lines, which are highlighted in the previous snippet:
+
+- `xmlns:models="clr-namespace:Notes.Models"`
+
+  This line maps the `Notes.Models` .NET namespace to the `models` XML namespace.
+
+- `x:DataType="models:Note"`
+
+  This line instructs the XAML compiler to compile all binding expressions for increased runtime performance, and resolves the binding expressions against the `Notes.Models.Note` type.
+
+- `Text="{Binding Text}"`
 
-    :::code language="xaml" source="../snippets/navigation/Views/NotePage.xaml" highlight="9":::
+  This line changes the `<Editor>` control by adding the `Text` property, and by binding the property to the `Text` property.  
 
 The modifications for the code-behind are more complicated than the XAML. The current code is loading the file content in the constructor, and then setting it directly to the `TextEditor.Text` property. Here is what the current code looks like:
 
diff --git a/docs/tutorials/notes-app/includes/project.md b/docs/tutorials/notes-app/includes/project.md
index 97e375766..9d1e200ab 100644
--- a/docs/tutorials/notes-app/includes/project.md
+++ b/docs/tutorials/notes-app/includes/project.md
@@ -17,7 +17,7 @@ Before you can begin this tutorial, you must follow the [Build your first app ar
 
 :::image type="content" source="../media/project/vs-configure-project.png" alt-text="Set the name of the .NET MAUI project to Notes in Visual Studio.":::
 
-Choose the latest .NET framework when creating your project.
+Choose the latest .NET version when creating your project.
 
 ## Select the target device
 
diff --git a/docs/tutorials/notes-app/snippets/allnotes/App.xaml.cs b/docs/tutorials/notes-app/snippets/allnotes/App.xaml.cs
index 89b87d193..6a451a225 100644
--- a/docs/tutorials/notes-app/snippets/allnotes/App.xaml.cs
+++ b/docs/tutorials/notes-app/snippets/allnotes/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
         
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-app/snippets/allnotes/Notes.csproj b/docs/tutorials/notes-app/snippets/allnotes/Notes.csproj
index 434b11b4e..64de7188c 100644
--- a/docs/tutorials/notes-app/snippets/allnotes/Notes.csproj
+++ b/docs/tutorials/notes-app/snippets/allnotes/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,6 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +29,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -58,8 +60,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-app/snippets/allnotes/Notes.csproj.user b/docs/tutorials/notes-app/snippets/allnotes/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-app/snippets/allnotes/Notes.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_7_-_api_35</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/docs/tutorials/notes-app/snippets/allnotes/Properties/launchSettings.json b/docs/tutorials/notes-app/snippets/allnotes/Properties/launchSettings.json
index edf8aadcc..4f857936f 100644
--- a/docs/tutorials/notes-app/snippets/allnotes/Properties/launchSettings.json
+++ b/docs/tutorials/notes-app/snippets/allnotes/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
diff --git a/docs/tutorials/notes-app/snippets/allnotes/Views/AboutPage.xaml b/docs/tutorials/notes-app/snippets/allnotes/Views/AboutPage.xaml
index 1e8d46f1a..a07812e2f 100644
--- a/docs/tutorials/notes-app/snippets/allnotes/Views/AboutPage.xaml
+++ b/docs/tutorials/notes-app/snippets/allnotes/Views/AboutPage.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:models="clr-namespace:Notes.Models"
-             x:Class="Notes.Views.AboutPage">
+             x:Class="Notes.Views.AboutPage"
+             x:DataType="models:About">
     <ContentPage.BindingContext>
         <models:About />
     </ContentPage.BindingContext>
diff --git a/docs/tutorials/notes-app/snippets/allnotes/Views/AllNotesPage.xaml b/docs/tutorials/notes-app/snippets/allnotes/Views/AllNotesPage.xaml
index faab926c9..f5ad2f036 100644
--- a/docs/tutorials/notes-app/snippets/allnotes/Views/AllNotesPage.xaml
+++ b/docs/tutorials/notes-app/snippets/allnotes/Views/AllNotesPage.xaml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:models="clr-namespace:Notes.Models"
              x:Class="Notes.Views.AllNotesPage"
-             Title="Your Notes">
+             Title="Your Notes"
+             x:DataType="models:AllNotes">
     <!-- Add an item to the toolbar -->
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="Add" Clicked="Add_Clicked" IconImageSource="{FontImage Glyph='+', Color=Black, Size=22}" />
@@ -22,7 +24,7 @@
 
         <!-- Define the appearance of each item in the list -->
         <CollectionView.ItemTemplate>
-            <DataTemplate>
+            <DataTemplate x:DataType="models:Note">
                 <StackLayout>
                     <Label Text="{Binding Text}" FontSize="22"/>
                     <Label Text="{Binding Date}" FontSize="14" TextColor="Silver"/>
diff --git a/docs/tutorials/notes-app/snippets/allnotes/Views/NotePage.xaml b/docs/tutorials/notes-app/snippets/allnotes/Views/NotePage.xaml
index 2f6a6e929..001bbfb99 100644
--- a/docs/tutorials/notes-app/snippets/allnotes/Views/NotePage.xaml
+++ b/docs/tutorials/notes-app/snippets/allnotes/Views/NotePage.xaml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:models="clr-namespace:Notes.Models"
              x:Class="Notes.Views.NotePage"
-             Title="Note">
+             Title="Note"
+             x:DataType="models:Note">
     <VerticalStackLayout Spacing="10" Margin="5">
         <Editor x:Name="TextEditor"
                 Placeholder="Enter your note"
diff --git a/docs/tutorials/notes-app/snippets/navigation/App.xaml.cs b/docs/tutorials/notes-app/snippets/navigation/App.xaml.cs
index feeb28b10..b87121cb4 100644
--- a/docs/tutorials/notes-app/snippets/navigation/App.xaml.cs
+++ b/docs/tutorials/notes-app/snippets/navigation/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
 
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-app/snippets/navigation/Notes.csproj b/docs/tutorials/notes-app/snippets/navigation/Notes.csproj
index ffe76cc53..41bc4bcc5 100644
--- a/docs/tutorials/notes-app/snippets/navigation/Notes.csproj
+++ b/docs/tutorials/notes-app/snippets/navigation/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,6 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +29,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -58,8 +60,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-app/snippets/navigation/Notes.csproj.user b/docs/tutorials/notes-app/snippets/navigation/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-app/snippets/navigation/Notes.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_7_-_api_35</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/docs/tutorials/notes-app/snippets/navigation/Properties/launchSettings.json b/docs/tutorials/notes-app/snippets/navigation/Properties/launchSettings.json
index edf8aadcc..4f857936f 100644
--- a/docs/tutorials/notes-app/snippets/navigation/Properties/launchSettings.json
+++ b/docs/tutorials/notes-app/snippets/navigation/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
diff --git a/docs/tutorials/notes-app/snippets/navigation/Views/AboutPage.xaml b/docs/tutorials/notes-app/snippets/navigation/Views/AboutPage.xaml
index 1e8d46f1a..a07812e2f 100644
--- a/docs/tutorials/notes-app/snippets/navigation/Views/AboutPage.xaml
+++ b/docs/tutorials/notes-app/snippets/navigation/Views/AboutPage.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:models="clr-namespace:Notes.Models"
-             x:Class="Notes.Views.AboutPage">
+             x:Class="Notes.Views.AboutPage"
+             x:DataType="models:About">
     <ContentPage.BindingContext>
         <models:About />
     </ContentPage.BindingContext>
diff --git a/docs/tutorials/notes-app/snippets/navigation/Views/NotePage.xaml b/docs/tutorials/notes-app/snippets/navigation/Views/NotePage.xaml
index 2f6a6e929..001bbfb99 100644
--- a/docs/tutorials/notes-app/snippets/navigation/Views/NotePage.xaml
+++ b/docs/tutorials/notes-app/snippets/navigation/Views/NotePage.xaml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:models="clr-namespace:Notes.Models"
              x:Class="Notes.Views.NotePage"
-             Title="Note">
+             Title="Note"
+             x:DataType="models:Note">
     <VerticalStackLayout Spacing="10" Margin="5">
         <Editor x:Name="TextEditor"
                 Placeholder="Enter your note"
diff --git a/docs/tutorials/notes-app/snippets/note/App.xaml.cs b/docs/tutorials/notes-app/snippets/note/App.xaml.cs
index feeb28b10..b87121cb4 100644
--- a/docs/tutorials/notes-app/snippets/note/App.xaml.cs
+++ b/docs/tutorials/notes-app/snippets/note/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
 
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-app/snippets/note/Notes.csproj b/docs/tutorials/notes-app/snippets/note/Notes.csproj
index 9b78ff91c..fd4e4aa52 100644
--- a/docs/tutorials/notes-app/snippets/note/Notes.csproj
+++ b/docs/tutorials/notes-app/snippets/note/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,6 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +29,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -58,8 +60,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-app/snippets/note/Notes.csproj.user b/docs/tutorials/notes-app/snippets/note/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-app/snippets/note/Notes.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_7_-_api_35</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/docs/tutorials/notes-app/snippets/note/Properties/launchSettings.json b/docs/tutorials/notes-app/snippets/note/Properties/launchSettings.json
index edf8aadcc..de9182acd 100644
--- a/docs/tutorials/notes-app/snippets/note/Properties/launchSettings.json
+++ b/docs/tutorials/notes-app/snippets/note/Properties/launchSettings.json
@@ -1,8 +1,8 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
-}
\ No newline at end of file
+}
diff --git a/docs/tutorials/notes-app/snippets/shell/App.xaml.cs b/docs/tutorials/notes-app/snippets/shell/App.xaml.cs
index feeb28b10..b87121cb4 100644
--- a/docs/tutorials/notes-app/snippets/shell/App.xaml.cs
+++ b/docs/tutorials/notes-app/snippets/shell/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
 
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-app/snippets/shell/Notes.csproj b/docs/tutorials/notes-app/snippets/shell/Notes.csproj
index d9a51d464..9d1625944 100644
--- a/docs/tutorials/notes-app/snippets/shell/Notes.csproj
+++ b/docs/tutorials/notes-app/snippets/shell/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,6 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +29,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -58,8 +60,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-app/snippets/shell/Notes.csproj.user b/docs/tutorials/notes-app/snippets/shell/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-app/snippets/shell/Notes.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_7_-_api_35</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/docs/tutorials/notes-app/snippets/shell/Properties/launchSettings.json b/docs/tutorials/notes-app/snippets/shell/Properties/launchSettings.json
index edf8aadcc..de9182acd 100644
--- a/docs/tutorials/notes-app/snippets/shell/Properties/launchSettings.json
+++ b/docs/tutorials/notes-app/snippets/shell/Properties/launchSettings.json
@@ -1,8 +1,8 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
-}
\ No newline at end of file
+}
diff --git a/docs/tutorials/notes-mvvm/includes/viewmodel-about.md b/docs/tutorials/notes-mvvm/includes/viewmodel-about.md
index b7d649f04..a753b30e6 100644
--- a/docs/tutorials/notes-mvvm/includes/viewmodel-about.md
+++ b/docs/tutorials/notes-mvvm/includes/viewmodel-about.md
@@ -67,7 +67,7 @@ Update the **About view**:
 01. In the **Solution Explorer** pane of Visual Studio, double-click on **Views\\AboutPage.xaml**.
 01. Paste in the following code:
 
-    :::code language="xaml" source="../snippets/viewmodel-shared/Views/AboutPage.xaml" highlight="4,7,19":::
+    :::code language="xaml" source="../snippets/viewmodel-shared/Views/AboutPage.xaml" highlight="4,6,8,20":::
 
     The previous code snippet highlights the lines that have changed in this version of the view.
 
diff --git a/docs/tutorials/notes-mvvm/includes/viewmodel-note.md b/docs/tutorials/notes-mvvm/includes/viewmodel-note.md
index a1529ac6e..74a6a7583 100644
--- a/docs/tutorials/notes-mvvm/includes/viewmodel-note.md
+++ b/docs/tutorials/notes-mvvm/includes/viewmodel-note.md
@@ -26,9 +26,9 @@ Create the **Note viewmodel**:
     using CommunityToolkit.Mvvm.Input;
     using CommunityToolkit.Mvvm.ComponentModel;
     using System.Windows.Input;
-    
+
     namespace Notes.ViewModels;
-    
+
     internal class NoteViewModel : ObservableObject, IQueryAttributable
     {
         private Models.Note _note;
@@ -104,7 +104,7 @@ Update the **Note view**:
 01. In the **Solution Explorer** pane of Visual Studio, double-click on **Views\\NotePage.xaml** to open the XAML editor.
 01. Paste in the following code:
 
-:::code language="xaml" source="../snippets/viewmodel-shared/Views/NotePage.xaml" highlight="4,7-9,18,22":::
+    :::code language="xaml" source="../snippets/viewmodel-shared/Views/NotePage.xaml" highlight="4,7,8-10,19,23":::
 
 Previously, this view didn't declare a binding context, as it was supplied by the code-behind of the page itself. Setting the binding context directly in the XAML provides two things:
 
diff --git a/docs/tutorials/notes-mvvm/includes/viewmodel-notes.md b/docs/tutorials/notes-mvvm/includes/viewmodel-notes.md
index e78828b5c..cf5d4372f 100644
--- a/docs/tutorials/notes-mvvm/includes/viewmodel-notes.md
+++ b/docs/tutorials/notes-mvvm/includes/viewmodel-notes.md
@@ -1,7 +1,7 @@
 ---
 author: adegeo
 ms.author: adegeo
-ms.date: 03/21/2024
+ms.date: 02/26/2025
 ms.topic: include
 no-loc: ["Notes viewmodel", "AllNotes view", "ViewModels", "NotesViewModel.cs", "AllNotesPage.xaml", "AllNotesPage.xaml.cs"]
 ---
@@ -83,7 +83,7 @@ Update the **AllNotes view**:
 01. In the **Solution Explorer** pane of Visual Studio, double-click on **Views\\AllNotesPage.xaml**.
 01. Paste in the following code:
 
-    :::code language="xaml" source="../snippets/viewmodel-shared/Views/AllNotesPage.xaml" id="full" highlight="3,7,12,17,20-21":::
+    :::code language="xaml" source="../snippets/viewmodel-shared/Views/AllNotesPage.xaml" id="full" highlight="3,6,8,13,18,21-22":::
 
 The toolbar no longer uses the `Clicked` event and instead uses a command.
 
@@ -93,7 +93,15 @@ Look at the binding used for the `CollectionView`:
 
 :::code language="xaml" source="../snippets/viewmodel-shared/Views/AllNotesPage.xaml" id="collection_view" highlight="5-6":::
 
-The `SelectionChangedCommandParameter` property uses `Source={RelativeSource Self}` binding. The `Self` references the current object, which is the `CollectionView`. Notice that the binding path is the `SelectedItem` property. When the command is invoked by changing the selected item, the `SelectNoteCommand` command is invoked and the selected item is passed to the command as a parameter.
+The `SelectionChangedCommandParameter` property uses `Source={RelativeSource Self}` binding. The `Self` references the current object, which is the `CollectionView`. Therefore, `x:DataType` specifies `CollectionView` as the type for the compiled binding. Notice that the binding path is the `SelectedItem` property. When the command is invoked by changing the selected item, the `SelectNoteCommand` command is invoked and the selected item is passed to the command as a parameter.
+
+For the binding expression defined in the `SelectionChangedCommandParameter` property to compile, it's necessary to instruct the project to enable compiled bindings in expressions that specify the `Source` property. To do this edit the project file for your solution and add `<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>` within the `<PropertyGroup>` element:
+
+```xml
+<PropertyGroup>
+  <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
+</PropertyGroup>
+```
 
 ## Clean up the AllNotes code-behind
 
diff --git a/docs/tutorials/notes-mvvm/snippets/bugs/App.xaml.cs b/docs/tutorials/notes-mvvm/snippets/bugs/App.xaml.cs
index feeb28b10..b87121cb4 100644
--- a/docs/tutorials/notes-mvvm/snippets/bugs/App.xaml.cs
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
 
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-mvvm/snippets/bugs/Notes.csproj b/docs/tutorials/notes-mvvm/snippets/bugs/Notes.csproj
index f98526676..766176748 100644
--- a/docs/tutorials/notes-mvvm/snippets/bugs/Notes.csproj
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,7 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+		<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +30,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -59,8 +62,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-mvvm/snippets/bugs/Notes.csproj.user b/docs/tutorials/notes-mvvm/snippets/bugs/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/Notes.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_7_-_api_35</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/docs/tutorials/notes-mvvm/snippets/bugs/Properties/launchSettings.json b/docs/tutorials/notes-mvvm/snippets/bugs/Properties/launchSettings.json
index edf8aadcc..4f857936f 100644
--- a/docs/tutorials/notes-mvvm/snippets/bugs/Properties/launchSettings.json
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
diff --git a/docs/tutorials/notes-mvvm/snippets/bugs/Views/AboutPage.xaml b/docs/tutorials/notes-mvvm/snippets/bugs/Views/AboutPage.xaml
index aa7c32832..06cf947c9 100644
--- a/docs/tutorials/notes-mvvm/snippets/bugs/Views/AboutPage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/Views/AboutPage.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewModels="clr-namespace:Notes.ViewModels"
-             x:Class="Notes.Views.AboutPage">
+             x:Class="Notes.Views.AboutPage"
+             x:DataType="viewModels:AboutViewModel">
     <ContentPage.BindingContext>
         <viewModels:AboutViewModel />
     </ContentPage.BindingContext>
diff --git a/docs/tutorials/notes-mvvm/snippets/bugs/Views/AllNotesPage.xaml b/docs/tutorials/notes-mvvm/snippets/bugs/Views/AllNotesPage.xaml
index 06aeccc0d..7f0ec974e 100644
--- a/docs/tutorials/notes-mvvm/snippets/bugs/Views/AllNotesPage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/Views/AllNotesPage.xaml
@@ -3,7 +3,8 @@
              xmlns:viewModels="clr-namespace:Notes.ViewModels"
              x:Class="Notes.Views.AllNotesPage"
              Title="Your Notes"
-             NavigatedTo="ContentPage_NavigatedTo">
+             NavigatedTo="ContentPage_NavigatedTo"
+             x:DataType="viewModels:NotesViewModel">
     <ContentPage.BindingContext>
         <viewModels:NotesViewModel />
     </ContentPage.BindingContext>
@@ -19,7 +20,7 @@
                     Margin="20"
                     SelectionMode="Single"
                     SelectionChangedCommand="{Binding SelectNoteCommand}"
-                    SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}">
+                    SelectionChangedCommandParameter="{Binding x:DataType='CollectionView', Source={RelativeSource Self}, Path=SelectedItem}">
         <!-- Designate how the collection of items are laid out -->
         <CollectionView.ItemsLayout>
             <LinearItemsLayout Orientation="Vertical" ItemSpacing="10" />
@@ -27,7 +28,7 @@
 
         <!-- Define the appearance of each item in the list -->
         <CollectionView.ItemTemplate>
-            <DataTemplate>
+            <DataTemplate x:DataType="viewModels:NoteViewModel">
                 <StackLayout>
                     <Label Text="{Binding Text}" FontSize="22"/>
                     <Label Text="{Binding Date}" FontSize="14" TextColor="Silver"/>
diff --git a/docs/tutorials/notes-mvvm/snippets/bugs/Views/NotePage.xaml b/docs/tutorials/notes-mvvm/snippets/bugs/Views/NotePage.xaml
index 9ce54d821..65ba5e944 100644
--- a/docs/tutorials/notes-mvvm/snippets/bugs/Views/NotePage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/bugs/Views/NotePage.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewModels="clr-namespace:Notes.ViewModels"
              x:Class="Notes.Views.NotePage"
-             Title="Note">
+             Title="Note"
+             x:DataType="viewModels:NoteViewModel">
     <ContentPage.BindingContext>
         <viewModels:NoteViewModel />
     </ContentPage.BindingContext>
diff --git a/docs/tutorials/notes-mvvm/snippets/model/App.xaml.cs b/docs/tutorials/notes-mvvm/snippets/model/App.xaml.cs
index feeb28b10..b87121cb4 100644
--- a/docs/tutorials/notes-mvvm/snippets/model/App.xaml.cs
+++ b/docs/tutorials/notes-mvvm/snippets/model/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
 
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-mvvm/snippets/model/Notes.csproj b/docs/tutorials/notes-mvvm/snippets/model/Notes.csproj
index 434b11b4e..64de7188c 100644
--- a/docs/tutorials/notes-mvvm/snippets/model/Notes.csproj
+++ b/docs/tutorials/notes-mvvm/snippets/model/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,6 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +29,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -58,8 +60,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-mvvm/snippets/model/Notes.csproj.user b/docs/tutorials/notes-mvvm/snippets/model/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-mvvm/snippets/model/Notes.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_7_-_api_35</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/docs/tutorials/notes-mvvm/snippets/model/Properties/launchSettings.json b/docs/tutorials/notes-mvvm/snippets/model/Properties/launchSettings.json
index edf8aadcc..4f857936f 100644
--- a/docs/tutorials/notes-mvvm/snippets/model/Properties/launchSettings.json
+++ b/docs/tutorials/notes-mvvm/snippets/model/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
diff --git a/docs/tutorials/notes-mvvm/snippets/model/Views/NotePage.xaml b/docs/tutorials/notes-mvvm/snippets/model/Views/NotePage.xaml
index 2f6a6e929..001bbfb99 100644
--- a/docs/tutorials/notes-mvvm/snippets/model/Views/NotePage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/model/Views/NotePage.xaml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:models="clr-namespace:Notes.Models"
              x:Class="Notes.Views.NotePage"
-             Title="Note">
+             Title="Note"
+             x:DataType="models:Note">
     <VerticalStackLayout Spacing="10" Margin="5">
         <Editor x:Name="TextEditor"
                 Placeholder="Enter your note"
diff --git a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/App.xaml.cs b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/App.xaml.cs
index feeb28b10..b87121cb4 100644
--- a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/App.xaml.cs
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/App.xaml.cs
@@ -7,7 +7,7 @@ public App()
             InitializeComponent();
         }
 
-        protected override Window CreateWindow(IActivationState? activationState)
+        protected override Window CreateWindow(IActivationState activationState)
         {
             return new Window(new AppShell());
         }
diff --git a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.csproj b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.csproj
index f98526676..766176748 100644
--- a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.csproj
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.csproj
@@ -1,8 +1,8 @@
 <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> -->
 
@@ -18,7 +18,7 @@
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+		<MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
 
 		<!-- Display name -->
 		<ApplicationTitle>Notes</ApplicationTitle>
@@ -30,8 +30,11 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
+		<WindowsPackageType>None</WindowsPackageType>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</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>
@@ -59,8 +62,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.csproj.user b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.csproj.user
new file mode 100644
index 000000000..1ec8a8f68
--- /dev/null
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Notes.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_7_-_api_35</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/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Properties/launchSettings.json b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Properties/launchSettings.json
index edf8aadcc..4f857936f 100644
--- a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Properties/launchSettings.json
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
     "Windows Machine": {
-      "commandName": "MsixPackage",
+      "commandName": "Project",
       "nativeDebugging": false
     }
   }
diff --git a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AboutPage.xaml b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AboutPage.xaml
index aa7c32832..06cf947c9 100644
--- a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AboutPage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AboutPage.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewModels="clr-namespace:Notes.ViewModels"
-             x:Class="Notes.Views.AboutPage">
+             x:Class="Notes.Views.AboutPage"
+             x:DataType="viewModels:AboutViewModel">
     <ContentPage.BindingContext>
         <viewModels:AboutViewModel />
     </ContentPage.BindingContext>
diff --git a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AllNotesPage.xaml b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AllNotesPage.xaml
index f1489df98..c1261acfa 100644
--- a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AllNotesPage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/AllNotesPage.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewModels="clr-namespace:Notes.ViewModels"
              x:Class="Notes.Views.AllNotesPage"
-             Title="Your Notes">
+             Title="Your Notes"
+             x:DataType="viewModels:NotesViewModel">
     <ContentPage.BindingContext>
         <viewModels:NotesViewModel />
     </ContentPage.BindingContext>
@@ -20,7 +21,7 @@
                     Margin="20"
                     SelectionMode="Single"
                     SelectionChangedCommand="{Binding SelectNoteCommand}"
-                    SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}">
+                    SelectionChangedCommandParameter="{Binding x:DataType='CollectionView', Source={RelativeSource Self}, Path=SelectedItem}">
     <!--</collection_view>-->
         <!-- Designate how the collection of items are laid out -->
         <CollectionView.ItemsLayout>
@@ -29,7 +30,7 @@
 
         <!-- Define the appearance of each item in the list -->
         <CollectionView.ItemTemplate>
-            <DataTemplate>
+            <DataTemplate x:DataType="viewModels:NoteViewModel">
                 <StackLayout>
                     <Label Text="{Binding Text}" FontSize="22"/>
                     <Label Text="{Binding Date}" FontSize="14" TextColor="Silver"/>
diff --git a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/NotePage.xaml b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/NotePage.xaml
index 9ce54d821..65ba5e944 100644
--- a/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/NotePage.xaml
+++ b/docs/tutorials/notes-mvvm/snippets/viewmodel-shared/Views/NotePage.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewModels="clr-namespace:Notes.ViewModels"
              x:Class="Notes.Views.NotePage"
-             Title="Note">
+             Title="Note"
+             x:DataType="viewModels:NoteViewModel">
     <ContentPage.BindingContext>
         <viewModels:NoteViewModel />
     </ContentPage.BindingContext>