diff --git a/Build-Toolkit-Components.ps1 b/Build-Toolkit-Components.ps1
index 6cbc0ec5..438be416 100644
--- a/Build-Toolkit-Components.ps1
+++ b/Build-Toolkit-Components.ps1
@@ -60,7 +60,7 @@ Param (
[ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
[Alias("mt")]
[string[]]$MultiTargets = @('uwp', 'wasm', 'wasdk'), # default settings
-
+
[ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
[string[]]$ExcludeMultiTargets = @(), # default settings
diff --git a/Build-Toolkit-Gallery.ps1 b/Build-Toolkit-Gallery.ps1
index 7d92154e..566ba237 100644
--- a/Build-Toolkit-Gallery.ps1
+++ b/Build-Toolkit-Gallery.ps1
@@ -49,7 +49,7 @@ Param (
[ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
[Alias("mt")]
[string[]]$MultiTargets = @('uwp', 'wasdk', 'wasm'), # default settings
-
+
[ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
[string[]]$ExcludeMultiTargets = @(), # default settings
diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props
index 02f9d9aa..3ca0df19 100644
--- a/MultiTarget/AvailableTargetFrameworks.props
+++ b/MultiTarget/AvailableTargetFrameworks.props
@@ -15,7 +15,7 @@
net9.0;
net9.0;
net9.0;
-
+
net9.0-android;
net9.0-maccatalyst;
net9.0-ios;
diff --git a/MultiTarget/PackageReferences/Uno.props b/MultiTarget/PackageReferences/Uno.props
index 14128ff7..37b157f6 100644
--- a/MultiTarget/PackageReferences/Uno.props
+++ b/MultiTarget/PackageReferences/Uno.props
@@ -1,29 +1,48 @@
- 5.5.87
+
+ 5.5.87
+
+ 6.4.229
+
+ $(UnoUIPackageVersion)
+ $(UnoWinUIPackageVersion)
-
-
+
-
+
+
+
+
+
+
+
+
true
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
+
+
@@ -45,7 +64,12 @@
$(NoWarn);CS1570;
-
+
+
+
+
+
+
diff --git a/MultiTarget/Test-Component-Support.ps1 b/MultiTarget/Test-Component-Support.ps1
index 3844dedd..3b5d068f 100644
--- a/MultiTarget/Test-Component-Support.ps1
+++ b/MultiTarget/Test-Component-Support.ps1
@@ -61,7 +61,7 @@ $WinUI0MultiTargets = @('netstandard')
$WinUI2MultiTargets = @('uwp', 'wasm', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')
# List of WinUI-3 compatible multitargets
-$WinUI3MultiTargets = @('wasdk', 'wasm', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')
+$WinUI3MultiTargets = @('wasdk', 'wasm', 'ios', 'android')
# If WinUI 0 is requested, the component must not support WinUI 2 or WinUI 3 to be built.
# If WinUI 2 or 3 is requested, the component must have a target that supports WinUI 2 or 3 to be built.
diff --git a/ProjectHeads/AllComponents/Wasm/Program.cs b/ProjectHeads/AllComponents/Wasm/Program.cs
index 43e990c1..a7aae2ee 100644
--- a/ProjectHeads/AllComponents/Wasm/Program.cs
+++ b/ProjectHeads/AllComponents/Wasm/Program.cs
@@ -5,7 +5,7 @@
using CommunityToolkit.App.Shared;
#if WINAPPSDK
-using Microsoft.UI.Xaml;
+using Uno.UI.Hosting;
#else
using Windows.UI.Xaml;
#endif
@@ -14,6 +14,17 @@ namespace CommunityToolkit.App.Wasm;
public class Program
{
+#if WINAPPSDK
+ static async Task Main(string[] args)
+ {
+ var host = UnoPlatformHostBuilder.Create()
+ .App(() => new CommunityToolkit.App.Shared.App())
+ .UseWebAssembly()
+ .Build();
+
+ await host.RunAsync();
+ }
+#else
private static CommunityToolkit.App.Shared.App? _app;
static int Main(string[] args)
@@ -22,4 +33,5 @@ static int Main(string[] args)
return 0;
}
+#endif
}
diff --git a/ProjectHeads/App.Head.Uno.UI.Dependencies.props b/ProjectHeads/App.Head.Uno.UI.Dependencies.props
index 361463b9..49fe326c 100644
--- a/ProjectHeads/App.Head.Uno.UI.Dependencies.props
+++ b/ProjectHeads/App.Head.Uno.UI.Dependencies.props
@@ -6,5 +6,3 @@
-
-
diff --git a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
index d18fbfb5..77c9bc88 100644
--- a/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
+++ b/ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
@@ -4,6 +4,6 @@
-
+
diff --git a/ProjectHeads/App.Head.Uno.props b/ProjectHeads/App.Head.Uno.props
index 865ea717..900312c4 100644
--- a/ProjectHeads/App.Head.Uno.props
+++ b/ProjectHeads/App.Head.Uno.props
@@ -25,7 +25,7 @@
diff --git a/ProjectHeads/App.Head.Wasm.props b/ProjectHeads/App.Head.Wasm.props
index 9861b527..26f9fbea 100644
--- a/ProjectHeads/App.Head.Wasm.props
+++ b/ProjectHeads/App.Head.Wasm.props
@@ -2,6 +2,7 @@
Exe
$(WasmHeadTargetFramework.Split(';')[0])
+ false
@@ -68,7 +69,7 @@
-
+
diff --git a/ProjectHeads/SingleComponent/Wasm/Program.cs b/ProjectHeads/SingleComponent/Wasm/Program.cs
index 9522ede6..91bd1b52 100644
--- a/ProjectHeads/SingleComponent/Wasm/Program.cs
+++ b/ProjectHeads/SingleComponent/Wasm/Program.cs
@@ -4,10 +4,25 @@
using CommunityToolkit.App.Shared;
+#if WINAPPSDK
+using Uno.UI.Hosting;
+#endif
+
namespace ProjectTemplateExperiment.Samples.Wasm;
public class Program
{
+#if WINAPPSDK
+ static async Task Main(string[] args)
+ {
+ var host = UnoPlatformHostBuilder.Create()
+ .App(() => new App())
+ .UseWebAssembly()
+ .Build();
+
+ await host.RunAsync();
+ }
+#else
private static App? _app;
static int Main(string[] args)
@@ -16,4 +31,5 @@ static int Main(string[] args)
return 0;
}
+#endif
}