diff --git a/build/templates/package-validation.yml b/build/templates/package-validation.yml
index dc3437bb2..d6bd8146e 100644
--- a/build/templates/package-validation.yml
+++ b/build/templates/package-validation.yml
@@ -14,8 +14,8 @@ steps:
$workloadRestore = 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.92.json'
if ($templateArgs.Contains('net8')) {
- $dotnetVersion = '8.0.100-preview.7.23376.3'
- $workloadRestore = 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.0-preview.7.8842.json'
+ $dotnetVersion = '8.0.100-rc.1.23463.5'
+ $workloadRestore = 'https://maui.blob.core.windows.net/metadata/rollbacks/8.0.0-rc.1.9171.json'
}
Write-Host "DotNetVersion = $dotnetVersion"
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
index 2eedac9f7..6ead2b05f 100644
--- a/src/Uno.Templates/content/unoapp/.template.config/template.json
+++ b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -1032,12 +1032,12 @@
"useGtk": {
"type": "computed",
"datatype": "bool",
- "value": "((!mauiEmbedding) && platforms == gtk)"
+ "value": "(platforms == gtk)"
},
"useLinuxFb": {
"type": "computed",
"datatype": "bool",
- "value": "((!mauiEmbedding) && platforms == linux-fb)"
+ "value": "(platforms == linux-fb)"
},
"useAndroid": {
"type": "computed",
@@ -1052,7 +1052,7 @@
"useMacOS": {
"type": "computed",
"datatype": "bool",
- "value": "((!mauiEmbedding) && platforms == macos)"
+ "value": "(platforms == macos)"
},
"useMacCatalyst": {
"type": "computed",
@@ -1067,7 +1067,7 @@
"useWasm": {
"type": "computed",
"datatype": "bool",
- "value": "((!mauiEmbedding) && platforms == wasm)"
+ "value": "(platforms == wasm)"
},
"useWinAppSdk": {
"type": "computed",
@@ -1077,7 +1077,32 @@
"useWpf": {
"type": "computed",
"datatype": "bool",
- "value": "((!mauiEmbedding) && platforms == wpf)"
+ "value": "(platforms == wpf)"
+ },
+ "useNonMauiPlatforms": {
+ "type": "computed",
+ "datatype": "bool",
+ "value": "(platforms == wpf || platforms == wasm || platforms == gtk || platforms == linux-fb || platforms == macos)"
+ },
+ "xamlNamespaces": {
+ "type": "generated",
+ "generator": "switch",
+ "replaces": "$xamlNamespaces$",
+ "parameters": {
+ "evaluator": "C++",
+ "datatype": "string",
+ "cases": [
+ {
+ // Can't use useNonMauiPlatforms here as we can't rely on computed values
+ "condition": "(mauiEmbedding && (platforms == wpf || platforms == wasm || platforms == gtk || platforms == linux-fb || platforms == macos))",
+ "value": "\n\txmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n\txmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n\txmlns:maui=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\"\n\txmlns:not_maui=\"http://notmaui\"\n\tmc:Ignorable=\"d not_maui\""
+ },
+ {
+ "condition": "!(mauiEmbedding && (platforms == wpf || platforms == wasm || platforms == gtk || platforms == linux-fb || platforms == macos))",
+ "value": "\n\txmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n\txmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n\tmc:Ignorable=\"d\""
+ }
+ ]
+ }
},
"useDataContracts": {
"type": "computed",
@@ -1105,7 +1130,7 @@
"useSkia": {
"type": "computed",
"datatype": "bool",
- "value": "((!mauiEmbedding) && (platforms == wpf || platforms == gtk || platforms == linux-fb))"
+ "value": "(platforms == wpf || platforms == gtk || platforms == linux-fb)"
},
"useServer": {
"type": "computed",
diff --git a/src/Uno.Templates/content/unoapp/Directory.Build.props b/src/Uno.Templates/content/unoapp/Directory.Build.props
index 9ed7c7053..f2f8f7a32 100644
--- a/src/Uno.Templates/content/unoapp/Directory.Build.props
+++ b/src/Uno.Templates/content/unoapp/Directory.Build.props
@@ -23,7 +23,20 @@
true
- $(NoWarn);CA1416;NU1507
+
+
+ $(NoWarn);NU1507;NETSDK1023
+
+
+ $(NoWarn);NU1507
+
en
@@ -70,7 +83,7 @@
true
10.0.18362.0
10.0.18362.0
- win10-x86;win10-x64;win10-arm64
+ win-x86;win-x64;win-arm64
false
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Mobile/MyExtensionsApp._1.Mobile.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Mobile/MyExtensionsApp._1.Mobile.csproj
index ba22d43b3..6b85837ce 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Mobile/MyExtensionsApp._1.Mobile.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Mobile/MyExtensionsApp._1.Mobile.csproj
@@ -272,9 +272,6 @@
-
-
-
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Windows/MyExtensionsApp._1.Windows.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Windows/MyExtensionsApp._1.Windows.csproj
index e26c3ef0f..803edde8f 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Windows/MyExtensionsApp._1.Windows.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1.Windows/MyExtensionsApp._1.Windows.csproj
@@ -6,8 +6,8 @@
MyExtensionsApp._1.Windows
app.manifest
x86;x64;arm64
- win10-x86;win10-x64;win10-arm64
- win10-$(Platform).pubxml
+ win-x86;win-x64;win-arm64
+ win-$(Platform).pubxml
true
true
@@ -227,9 +227,6 @@
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/MyExtensionsApp._1.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/MyExtensionsApp._1.csproj
index 8fc1e31e1..3e85cf600 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/MyExtensionsApp._1.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/MyExtensionsApp._1.csproj
@@ -239,9 +239,6 @@
must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-->
-
- win10-x86;win10-x64;win10-arm64
-
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/Presentation/MainPage.xaml b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/Presentation/MainPage.xaml
index 562c6ad77..6e29309c3 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/Presentation/MainPage.xaml
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/Presentation/MainPage.xaml
@@ -1,10 +1,7 @@
@@ -25,10 +22,24 @@
VerticalAlignment="Center"
Spacing="16">
+
+
+
+
+
+
+
+
+ xmlns:embed="using:Uno.Extensions.Maui"
+ xmlns:controls="using:MyExtensionsApp._1.MauiControls"
+ Source="controls:EmbeddedControl" />
+