fix(reg): Adjust dotnet new unoapp parameters

unoplatform · Dec 21, 2022 · 093f3f5 · 093f3f5
1 parent 72286c3
commit 093f3f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj
@@ -324,6 +324,7 @@
 							.Replace("UseAppKit", "macos")
 							.Replace("UseCatalyst", "maccatalyst")
 							.Replace("UseServer", "hosted")
+							.Replace("$UseWinUI$", "$Windows$")
 							.Replace("$UseWebAssembly$", "$WebAssembly$")
 							.Replace("$UseWebAssemblyManifestJson$", "$wasm-pwa-manifest$")
 							.Replace("$basetargetframework$", "net6.0")

diff --git a/...olutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json b/...olutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json
@@ -107,6 +107,12 @@
 			"defaultValue": "true",
 			"description": "Enables the WebAssembly platform support project"
 		},
+		"Windows": {
+			"type": "parameter",
+			"dataType": "bool",
+			"defaultValue": "true",
+			"description": "Enables the Windows platform support project"
+		},
 		"mobile": {
 			"type": "parameter",
 			"dataType": "bool",
@@ -131,17 +137,11 @@
 			"defaultValue": "true",
 			"description": "Enables the Skia/Linux Framebuffer platform support project"
 		},
-		"winui-desktop": {
-			"type": "parameter",
-			"dataType": "bool",
-			"defaultValue": "true",
-			"description": "Enables the WinUI desktop platform support project"
-		},
 		"vscode": {
 			"type": "parameter",
 			"dataType": "bool",
 			"defaultValue": "false",
-			"description": "Adds the Visual Studio Code Debugging support files for WebAssembly"
+			"description": "Adds the Visual Studio Code Debugging support files for WebAssembly",
 		},
 		"skipRestore": {
 			"type": "parameter",
@@ -155,6 +155,12 @@
 			"description": "Enables the generation of a PWA manifest for WebAssembly",
 			"defaultValue": "false"
 		},
+		"hosted": {
+			"type": "parameter",
+			"datatype": "bool",
+			"description": "Enables the ASP.NET Core hosting project",
+			"defaultValue": "true"
+		},
 		"android": {
 			"type": "generated",
 			"generator": "casing",
@@ -183,14 +189,6 @@
 				"source": "mobile"
 			}
 		},
-		"hosted": {
-			"type": "generated",
-			"generator": "constant",
-			"dataType": "bool",
-			"parameters": {
-				"value": "True"
-			}
-		},
 		"Framework": {
 			"type": "parameter",
 			"description": "The target framework for the project.",
@@ -238,7 +236,7 @@
 			"path": "UnoWinUIQuickStart.Server\\UnoWinUIQuickStart.Server.csproj"
 		},
 		{
-			"condition": "winui-desktop",
+			"condition": "Windows",
 			"path": "UnoWinUIQuickStart.Windows\\UnoWinUIQuickStart.Windows.csproj"
 		},
 		{

diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.WPF
 EndProject
 #//#endif
 
-#//#if (winui-desktop)
+#//#if (Windows)
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Windows", "UnoWinUIQuickStart.Windows\UnoWinUIQuickStart.Windows.csproj", "{1AA13270-F438-4864-9435-54FD806E10EA}"
 EndProject
 #//#endif