diff --git a/Avalonia.Maui/Avalonia.Maui.csproj b/Avalonia.Maui/Avalonia.Maui.csproj
index 091e980..2fa25a3 100644
--- a/Avalonia.Maui/Avalonia.Maui.csproj
+++ b/Avalonia.Maui/Avalonia.Maui.csproj
@@ -23,8 +23,7 @@
-
-
+
diff --git a/MauiSampleApp/AppShell.xaml b/MauiSampleApp/AppShell.mxaml
similarity index 100%
rename from MauiSampleApp/AppShell.xaml
rename to MauiSampleApp/AppShell.mxaml
diff --git a/MauiSampleApp/AppShell.xaml.cs b/MauiSampleApp/AppShell.mxaml.cs
similarity index 100%
rename from MauiSampleApp/AppShell.xaml.cs
rename to MauiSampleApp/AppShell.mxaml.cs
diff --git a/MauiSampleApp/AvaloniaApp.axaml b/MauiSampleApp/AvaloniaApp.axaml
index 610fab7..828e2bb 100644
--- a/MauiSampleApp/AvaloniaApp.axaml
+++ b/MauiSampleApp/AvaloniaApp.axaml
@@ -3,6 +3,6 @@
xmlns:local="using:MauiSample"
x:Class="MauiSample.AvaloniaApp">
-
+
diff --git a/MauiSampleApp/AvaloniaCompositionPage.xaml b/MauiSampleApp/AvaloniaCompositionPage.mxaml
similarity index 100%
rename from MauiSampleApp/AvaloniaCompositionPage.xaml
rename to MauiSampleApp/AvaloniaCompositionPage.mxaml
diff --git a/MauiSampleApp/AvaloniaCompositionPage.xaml.cs b/MauiSampleApp/AvaloniaCompositionPage.mxaml.cs
similarity index 100%
rename from MauiSampleApp/AvaloniaCompositionPage.xaml.cs
rename to MauiSampleApp/AvaloniaCompositionPage.mxaml.cs
diff --git a/MauiSampleApp/MainPage.xaml b/MauiSampleApp/MainPage.mxaml
similarity index 100%
rename from MauiSampleApp/MainPage.xaml
rename to MauiSampleApp/MainPage.mxaml
diff --git a/MauiSampleApp/MainPage.xaml.cs b/MauiSampleApp/MainPagem.mxaml.cs
similarity index 100%
rename from MauiSampleApp/MainPage.xaml.cs
rename to MauiSampleApp/MainPagem.mxaml.cs
diff --git a/MauiSampleApp/MauiApp.xaml b/MauiSampleApp/MauiApp.mxaml
similarity index 100%
rename from MauiSampleApp/MauiApp.xaml
rename to MauiSampleApp/MauiApp.mxaml
diff --git a/MauiSampleApp/MauiApp.xaml.cs b/MauiSampleApp/MauiApp.mxaml.cs
similarity index 100%
rename from MauiSampleApp/MauiApp.xaml.cs
rename to MauiSampleApp/MauiApp.mxaml.cs
diff --git a/MauiSampleApp/MauiProgram.cs b/MauiSampleApp/MauiProgram.cs
index e99b4f2..1ca700d 100644
--- a/MauiSampleApp/MauiProgram.cs
+++ b/MauiSampleApp/MauiProgram.cs
@@ -1,37 +1,50 @@
-using Avalonia;
-using Avalonia.Maui;
-using Avalonia.Maui.Controls;
-using Avalonia.Maui.Handlers;
-using MauiSample;
-
-namespace MauiSampleApp
-{
- public static class MauiProgram
- {
- public static Microsoft.Maui.Hosting.MauiApp CreateMauiApp()
- {
- var builder = Microsoft.Maui.Hosting.MauiApp.CreateBuilder();
-
- builder.UseMauiApp();
-
- builder.UseAvalonia(appBuilder =>
- {
- });
-
- builder.ConfigureFonts(fonts =>
- {
- fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
- fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
- });
-
- builder.ConfigureMauiHandlers(handlers =>
- {
-#if ANDROID || IOS || WINDOWS
- handlers.AddHandler(typeof(AvaloniaView), typeof(AvaloniaViewHandler));
-#endif
- });
-
- return builder.Build();
- }
- }
+using Avalonia;
+using Avalonia.Maui;
+using Avalonia.Maui.Controls;
+using Avalonia.Maui.Handlers;
+using MauiSample;
+using System.Collections.Immutable;
+
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui", "Microsoft.Maui.Controls", AssemblyName = "Microsoft.Maui.Controls")]
+
+namespace MauiSampleApp
+{
+
+ public static class MauiProgram
+ {
+ private static object DoNotOptimiceAway = ImmutableArray.Create(
+
+ typeof(Microsoft.Maui.Controls.Shell),
+ typeof(Microsoft.Maui.Controls.ContentPage),
+ typeof(Microsoft.Maui.Controls.Application),
+ typeof(Microsoft.Maui.Controls.ResourceDictionary)
+ );
+
+
+ public static Microsoft.Maui.Hosting.MauiApp CreateMauiApp()
+ {
+ var builder = Microsoft.Maui.Hosting.MauiApp.CreateBuilder();
+
+ builder.UseMauiApp();
+
+ builder.UseAvalonia(appBuilder =>
+ {
+ });
+
+ builder.ConfigureFonts(fonts =>
+ {
+ fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+ fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+ });
+
+ builder.ConfigureMauiHandlers(handlers =>
+ {
+#if ANDROID || IOS || WINDOWS
+ handlers.AddHandler(typeof(AvaloniaView), typeof(AvaloniaViewHandler));
+#endif
+ });
+
+ return builder.Build();
+ }
+ }
}
\ No newline at end of file
diff --git a/MauiSampleApp/MauiSampleApp.csproj b/MauiSampleApp/MauiSampleApp.csproj
index 2c073c1..31c7983 100644
--- a/MauiSampleApp/MauiSampleApp.csproj
+++ b/MauiSampleApp/MauiSampleApp.csproj
@@ -1,76 +1,99 @@
-
-
-
- net7.0-android; net7.0-ios
- $(TargetFrameworks);net7.0-windows10.0.19041.0
-
-
- Exe
- MauiSampleApp
- true
- true
- enable
-
-
- MauiSample
-
-
- com.companyname.mauisample
- EBE44A8A-128A-438D-80EF-1832A9474CB3
-
-
- 1.0
- 1
-
- 14.2
- 14.0
- 21.0
- 10.0.17763.0
- 10.0.17763.0
- 6.5
-
-
- en
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- MauiApp.xaml
-
-
- AvaloniaApp.axaml
-
-
- App.xaml
-
-
-
-
-
- MSBuild:Compile
-
-
-
-
+
+
+
+ net7.0-android; net7.0-ios
+ $(TargetFrameworks);net7.0-windows10.0.19041.0
+
+
+ Exe
+ MauiSampleApp
+ true
+ true
+ enable
+
+
+ MauiSample
+
+
+ com.companyname.mauisample
+ EBE44A8A-128A-438D-80EF-1832A9474CB3
+
+
+ 1.0
+ 1
+
+ 14.2
+ 14.0
+ 21.0
+ 10.0.17763.0
+ 10.0.17763.0
+ 6.5
+
+
+ en
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AppShell.mxaml
+
+
+ AvaloniaCompositionPage.mxaml
+
+
+ MainPage.mxaml
+
+
+ MauiApp.mxaml
+
+
+ AvaloniaApp.axaml
+
+
+ App.xaml
+
+
+
+
diff --git a/MauiSampleApp/Resources/Styles/Colors.xaml b/MauiSampleApp/Resources/Styles/Colors.mxaml
similarity index 100%
rename from MauiSampleApp/Resources/Styles/Colors.xaml
rename to MauiSampleApp/Resources/Styles/Colors.mxaml
diff --git a/MauiSampleApp/Resources/Styles/Styles.xaml b/MauiSampleApp/Resources/Styles/Styles.mxaml
similarity index 100%
rename from MauiSampleApp/Resources/Styles/Styles.xaml
rename to MauiSampleApp/Resources/Styles/Styles.mxaml