fix(reg): Restore multi-folder project structure

unoplatform · Dec 16, 2022 · a6ef125 · a6ef125
1 parent 67f91ec
commit a6ef125
Show file tree

Hide file tree

Showing 153 changed files with 602 additions and 489 deletions.
diff --git a/build/test-scripts/run-net7-template-linux.ps1 b/build/test-scripts/run-net7-template-linux.ps1
@@ -46,20 +46,20 @@ $release = $default + '-c' + 'Release'
 $createParams=(Get-TemplateConfiguration -wasm 1 -wasmVsCode 1 -skiaGtk 1 -skiaLinuxFB 1)
 dotnet new unoapp -n UnoAppWinUI --framework net7.0 $createParams
 
-dotnet build $debug UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Wasm.csproj
+dotnet build $debug UnoAppWinUI/UnoAppWinUI.Wasm/UnoAppWinUI.Wasm.csproj
 Assert-ExitCodeIsZero
 
-dotnet build $release UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Wasm.csproj
+dotnet build $release UnoAppWinUI/UnoAppWinUI.Wasm/UnoAppWinUI.Wasm.csproj
 Assert-ExitCodeIsZero
 
-dotnet build $debug UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Gtk.csproj
+dotnet build $debug UnoAppWinUI/UnoAppWinUI.Skia.Gtk/UnoAppWinUI.Skia.Gtk.csproj
 Assert-ExitCodeIsZero
 
-dotnet build $release UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Gtk.csproj
+dotnet build $release UnoAppWinUI/UnoAppWinUI.Skia.Gtk/UnoAppWinUI.Skia.Gtk.csproj
 Assert-ExitCodeIsZero
 
-dotnet build $debug UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj
+dotnet build $debug UnoAppWinUI/UnoAppWinUI.Skia.Linux.FrameBuffer/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj
 Assert-ExitCodeIsZero
 
-dotnet build $release UnoAppWinUI/UnoAppWinUI.App/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj
+dotnet build $release UnoAppWinUI/UnoAppWinUI.Skia.Linux.FrameBuffer/UnoAppWinUI.Skia.Linux.FrameBuffer.csproj
 Assert-ExitCodeIsZero
diff --git a/build/test-scripts/run-netcore-mobile-template-tests.ps1 b/build/test-scripts/run-netcore-mobile-template-tests.ps1
@@ -75,15 +75,16 @@ pushd UnoAppWinUI
 for($i = 0; $i -lt $dotnetBuildNet6Configurations.Length; $i++)
 {
     $platform=$dotnetBuildNet6Configurations[$i][0];
-    & dotnet build -c Debug $default $dotnetBuildNet6Configurations[$i][1] $dotnetBuildNet6Configurations[$i][2] "UnoAppWinUI.App\UnoAppWinUI.$platform.csproj"
+    & dotnet build -c Debug $default $dotnetBuildNet6Configurations[$i][1] $dotnetBuildNet6Configurations[$i][2] "UnoAppWinUI.$platform\UnoAppWinUI.$platform.csproj"
     Assert-ExitCodeIsZero
 }
 
 # Server project build (merge with above loop when .App folder is removed)
 & dotnet build -c Debug $default "UnoAppWinUI.Server\UnoAppWinUI.Server.csproj"
 
  # Build with msbuild because of https://github.com/microsoft/WindowsAppSDK/issues/1652
- & $msbuild $debug "/p:Platform=x86" "UnoAppWinUI.App\UnoAppWinUI.Windows.csproj"
+ # force targetframeworks until we can get WinAppSDK to build with `dotnet build`
+ & $msbuild $debug "/p:Platform=x86" "/p:TargetFrameworks=net6.0-windows10.0.18362;TargetFramework=net6.0-windows10.0.18362" "UnoAppWinUI.Windows\UnoAppWinUI.Windows.csproj"
 Assert-ExitCodeIsZero
 
 popd

diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/Uno.ProjectTemplates.Dotnet.csproj
@@ -120,15 +120,7 @@
 		<_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.netcore\Properties\**" />
 		<_UnoAppnet6WinUITemplateFilesExclude Include="..\UnoSolutionTemplate.WinUI.netcore\UnoSolutionTemplate.WinUI.netcore.csproj" />
 
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Shared\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Mobile\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Skia.Gtk\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Skia.Linux.FrameBuffer\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Skia.WPF\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\Wasm\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-		<_UnoAppnet6WinUITemplateSingleLocationFiles Include="..\UnoSolutionTemplate.WinUI.netcore\WinUI\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
-
-		<_UnoAppnet6WinUITemplateFiles Include="..\UnoSolutionTemplate.WinUI.netcore\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude);@(_UnoAppnet6WinUITemplateSingleLocationFiles)"/>
+		<_UnoAppnet6WinUITemplateFiles Include="..\UnoSolutionTemplate.WinUI.netcore\**" Exclude="@(_UnoAppnet6WinUITemplateFilesExclude)"/>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -271,9 +263,7 @@
 
 		<RemoveDir Directories="$(IntermediateTemplatePath)" />
 
-		<Copy SourceFiles="@(_UnoAppnet6WinUITemplateSingleLocationFiles)" DestinationFolder="$(IntermediateTemplatePath)\UnoQuickStart.App\%(RecursiveDir)" />
 		<Copy SourceFiles="@(_UnoAppnet6WinUITemplateFiles)" DestinationFolder="$(IntermediateTemplatePath)\%(RecursiveDir)" />
-		<Copy SourceFiles="..\UnoSolutionTemplate.Wizard.2022\Directory.Build-netcore.props" DestinationFiles="$(IntermediateTemplatePath)\Directory.Build.props" />
 
 		<ReplaceContent SourcePath="$(IntermediateTemplatePath)" SafeProjectName="UnoQuickStart" IsWinUI="True" />
 		<RenameSolution SourcePath="$(IntermediateTemplatePath)" SourceName="UnoQuickStart" TargetName="UnoWinUIQuickStart" />
@@ -344,9 +334,9 @@
 						{
 							// Avoid value replacement with msbuild's CodeTaskFactory expansion
 							string pattern = string.Format("^{0}\\$if\\$\\(\\${0}\\${0} == True\\)", "(.*?)");
-
+							
 							s = Regex.Replace(s, pattern, @"$1<!--#if ($2)" + Environment.NewLine + "$1", RegexOptions.Multiline);
-
+							
 							s = s
 								.Replace("$endif$", "\n#endif -->");
 								;
@@ -397,15 +387,17 @@
 
 					}
 
-					var platforms = new string[] { "iOS", "UWP", "Wasm", "Server", "Droid", "macOS", "Mobile", "Shared", "Skia.Gtk", "Skia.WPF", "Skia.WPF.Host", "Skia.Tizen", "Skia.Linux.FrameBuffer" };
+					var platforms = new string[] { "iOS", "UWP", "Wasm", "Server", "Droid", "macOS", "Mobile", "Shared", "Views", "Base", "Windows", "Skia.Gtk", "Skia.WPF", "Skia.WPF.Host", "Skia.Tizen", "Skia.Linux.FrameBuffer" };
 
 					foreach(var platform in platforms)
 					{
 						var source = Path.Combine(SourcePath, platform);
 
 						if(Directory.Exists(source))
 						{
-							Directory.Move(Path.Combine(SourcePath, platform), Path.Combine(SourcePath, SafeProjectName + "." + platform));
+							var targetName = platform == "Views" ? SafeProjectName : SafeProjectName + "." + platform;
+
+							Directory.Move(Path.Combine(SourcePath, platform), Path.Combine(SourcePath, targetName));
 						}
 					}
 				]]>

diff --git a/...olutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json b/...olutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/.template.config/template.json
@@ -157,34 +157,30 @@
 		},
 		"android": {
 			"type": "generated",
-			"generator": "constant",
-			"dataType": "bool",
+			"generator": "casing",
 			"parameters": {
-				"value": "True"
+				"source": "mobile"
 			}
 		},
 		"ios": {
 			"type": "generated",
-			"generator": "constant",
-			"dataType": "bool",
+			"generator": "casing",
 			"parameters": {
-				"value": "True"
+				"source": "mobile"
 			}
 		},
 		"macos": {
 			"type": "generated",
-			"generator": "constant",
-			"dataType": "bool",
+			"generator": "casing",
 			"parameters": {
-				"value": "True"
+				"source": "mobile"
 			}
 		},
 		"maccatalyst": {
 			"type": "generated",
-			"generator": "constant",
-			"dataType": "bool",
+			"generator": "casing",
 			"parameters": {
-				"value": "True"
+				"source": "mobile"
 			}
 		},
 		"hosted": {
@@ -211,36 +207,55 @@
 			],
 			"replaces": "net6.0",
 			"defaultValue": "net6.0"
+		},
+		"libarybasetargetframework": {
+			"type": "generated",
+			"generator": "switch",
+			"replaces": "$libarybasetargetframework$",
+			"parameters": {
+				"evaluator": "C++",
+				"datatype": "string",
+				"cases": [
+					{
+						"condition": "(Framework == 'net6.0')",
+						"value": "netstandard2.0"
+					},
+					{
+						"condition": "(Framework != 'net6.0')",
+						"value": "net7.0"
+					}
+				]
+			}
 		}
 	},
 	"primaryOutputs": [
 		{
 			"condition": "mobile",
-			"path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Mobile.csproj"
+			"path": "UnoWinUIQuickStart.Mobile\\UnoWinUIQuickStart.Mobile.csproj"
 		},
 		{
 			"condition": "hosted",
 			"path": "UnoWinUIQuickStart.Server\\UnoWinUIQuickStart.Server.csproj"
 		},
 		{
 			"condition": "winui-desktop",
-			"path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Windows.csproj"
+			"path": "UnoWinUIQuickStart.Windows\\UnoWinUIQuickStart.Windows.csproj"
 		},
 		{
 			"condition": "Wasm",
-			"path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Wasm.csproj"
+			"path": "UnoWinUIQuickStart.Wasm\\UnoWinUIQuickStart.Wasm.csproj"
 		},
 		{
 			"condition": "skia-gtk",
-			"path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.Gtk.csproj"
+			"path": "UnoWinUIQuickStart.Skia.Gtk\\UnoWinUIQuickStart.Skia.Gtk.csproj"
 		},
 		{
 			"condition": "skia-wpf",
-			"path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.WPF.csproj"
+			"path": "UnoWinUIQuickStart.Skia.WPF\\UnoWinUIQuickStart.Skia.WPF.csproj"
 		},
 		{
 			"condition": "skia-linux-fb",
-			"path": "UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj"
+			"path": "UnoWinUIQuickStart.Skia.Linux.FrameBuffer\\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj"
 		}
 	],
 	"sources": [
@@ -258,40 +273,32 @@
 				{
 					"condition": "(!mobile)",
 					"exclude": [
-						"UnoWinUIQuickStart.App/Platforms/Android/**",
-						"UnoWinUIQuickStart.App/Platforms/iOS/**",
-						"UnoWinUIQuickStart.App/Platforms/MacCatalyst/**",
-						"UnoWinUIQuickStart.App/Platforms/macOS/**",
-						"UnoWinUIQuickStart.App/UnoWinUIQuickStart.Mobile.csproj"
+						"UnoWinUIQuickStart.Mobile/**"
 					]
 				},
 				{
 					"condition": "(!WebAssembly)",
 					"exclude": [
 						"UnoWinUIQuickStart.Server/**",
-						"UnoWinUIQuickStart.App/Platforms/WebAssembly/**",
-						"UnoWinUIQuickStart.App/UnoWinUIQuickStart.Mobile.csproj"
+						"UnoWinUIQuickStart.Wasm/**",
 					]
 				},
 				{
 					"condition": "(!skia-gtk)",
 					"exclude": [
-						"UnoWinUIQuickStart.App/Platforms/Skia.Gtk/**",
-						"UnoWinUIQuickStart.App/UnoWinUIQuickStart.Skia.Gtk.csproj"
+						"UnoWinUIQuickStart.Skia.Gtk/**",
 					]
 				},
 				{
 					"condition": "(!skia-wpf)",
 					"exclude": [
-						"UnoWinUIQuickStart/Platforms/Skia.WPF/**",
-						"UnoWinUIQuickStart.App/UnoWinUIQuickStart.Skia.WPF.csproj"
+						"UnoWinUIQuickStart.Skia.WPF/UnoWinUIQuickStart.Skia.WPF.csproj"
 					]
 				},
 				{
 					"condition": "(!skia-linux-fb)",
 					"exclude": [
-						"UnoWinUIQuickStart/Platforms/Skia.Linux.FrameBuffer/**",
-						"UnoWinUIQuickStart.App/UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj"
+						"UnoWinUIQuickStart.Skia.Linux.FrameBuffer/**"
 					]
 				},
 				{

diff --git a/...SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart-vsmac.slnf b/...SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart-vsmac.slnf
@@ -3,15 +3,15 @@
     "path": "UnoWinUIQuickStart.sln",
     "projects": [
 		#//#if (mobile)
-		"UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Mobile.csproj",
+		"UnoWinUIQuickStart.Mobile\\UnoWinUIQuickStart.Mobile.csproj",
 		#//#endif
 
 		#//#if (WebAssembly)
-		"UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Wasm.csproj",
+		"UnoWinUIQuickStart.Wasm\\UnoWinUIQuickStart.Wasm.csproj",
 		#//#endif
 
 		#//#if (skia-gtk)
-		"UnoWinUIQuickStart.App\\UnoWinUIQuickStart.Skia.Gtk.csproj",
+		"UnoWinUIQuickStart.Skia.Gtk\\UnoWinUIQuickStart.Skia.Gtk.csproj",
 		#//#endif
     ]
   }

diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp/UnoWinUIQuickStart.sln
@@ -3,13 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.29920.165
 MinimumVisualStudioVersion = 15.0.26124.0
 
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart", "UnoWinUIQuickStart\UnoWinUIQuickStart.csproj", "{A5B8155A-119F-4794-B551-C6F3CF7E5411}"
+EndProject
+
 #//#if (mobile)
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Mobile", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Mobile.csproj", "{$guid2$}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnoWinUIQuickStart.Mobile", "UnoWinUIQuickStart.Mobile\UnoWinUIQuickStart.Mobile.csproj", "{$guid2$}"
 EndProject
 #//#endif
 
 #//#if (WebAssembly)
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Wasm", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Wasm.csproj", "{40EA03F7-8A22-4143-B251-79BAC3EB13D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Wasm", "UnoWinUIQuickStart.Wasm\UnoWinUIQuickStart.Wasm.csproj", "{40EA03F7-8A22-4143-B251-79BAC3EB13D2}"
 EndProject
 #//#endif
 
@@ -19,22 +22,22 @@ EndProject
 #//#endif
 
 #//#if (skia-gtk)
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Gtk", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Gtk", "UnoWinUIQuickStart.Skia.Gtk\UnoWinUIQuickStart.Skia.Gtk.csproj", "{A5B8155A-118F-4794-B551-C6F3CF7E5411}"
 EndProject
 #//#endif
 
 #//#if (skia-wpf)
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.WPF", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Skia.WPF.csproj", "{$guid5$}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.WPF", "UnoWinUIQuickStart.Skia.WPF\UnoWinUIQuickStart.Skia.WPF.csproj", "{$guid5$}"
 EndProject
 #//#endif
 
 #//#if (winui-desktop)
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Windows", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Windows.csproj", "{1AA13270-F438-4864-9435-54FD806E10EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Windows", "UnoWinUIQuickStart.Windows\UnoWinUIQuickStart.Windows.csproj", "{1AA13270-F438-4864-9435-54FD806E10EA}"
 EndProject
 #//#endif
 
 #//#if (skia-linux-fb)
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Linux.FrameBuffer", "UnoWinUIQuickStart.App\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj", "{761D821E-9905-4444-9ADF-76C995FE5427}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnoWinUIQuickStart.Skia.Linux.FrameBuffer", "UnoWinUIQuickStart.Skia.Linux.FrameBuffer\UnoWinUIQuickStart.Skia.Linux.FrameBuffer.csproj", "{761D821E-9905-4444-9ADF-76C995FE5427}"
 EndProject
 #//#endif
 
@@ -310,6 +313,35 @@ Global
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.ActiveCfg = Release|Any CPU
 		{40EA03F7-8A22-4143-B251-79BAC3EB13D2}.Release|x86.Build.0 = Release|Any CPU
 
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM.Build.0 = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|ARM64.Build.0 = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhone.Build.0 = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x64.Build.0 = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5B8155A-119F-4794-B551-C6F3CF7E5411}.Release|x86.Build.0 = Release|Any CPU
+
 		{40EA03F7-8A22-1234-B251-79BAC3EB13D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40EA03F7-8A22-1234-B251-79BAC3EB13D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40EA03F7-8A22-1234-B251-79BAC3EB13D2}.Debug|ARM.ActiveCfg = Debug|Any CPU

diff --git a/...ionTemplate.WinUI.netcore/Shared/App.xaml → ...utionTemplate.WinUI.netcore/Base/App.xaml b/...ionTemplate.WinUI.netcore/Shared/App.xaml → ...utionTemplate.WinUI.netcore/Base/App.xaml
diff --git a/...Template.WinUI.netcore/Shared/App.xaml.cs → ...onTemplate.WinUI.netcore/Base/App.xaml.cs b/...Template.WinUI.netcore/Shared/App.xaml.cs → ...onTemplate.WinUI.netcore/Base/App.xaml.cs
diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/Base.winui.netcore.vstemplate b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Base/Base.winui.netcore.vstemplate
@@ -0,0 +1,27 @@
+<VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
+	<TemplateData>
+		<Name>UnoQuickStart.Base</Name>
+		<Description>
+		</Description>
+		<ProjectType>CSharp</ProjectType>
+		<ProjectSubType>
+		</ProjectSubType>
+		<SortOrder>1000</SortOrder>
+		<CreateNewFolder>true</CreateNewFolder>
+		<DefaultName>UnoQuickStart.Base</DefaultName>
+		<ProvideDefaultName>true</ProvideDefaultName>
+		<LocationField>Enabled</LocationField>
+		<EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+		<Icon>__TemplateIcon.png</Icon>
+		<PreviewImage>__PreviewImage.png</PreviewImage>
+		<CreateInPlace>true</CreateInPlace>
+		<Hidden>true</Hidden>
+	</TemplateData>
+	<TemplateContent>
+		<Project TargetFileName="$ext_safeprojectname$.Base.shproj" File="UnoQuickStart.Base.shproj" ReplaceParameters="true">
+			<ProjectItem ReplaceParameters="true" TargetFileName="App.xaml.cs">App.xaml.cs</ProjectItem>
+			<ProjectItem ReplaceParameters="true" TargetFileName="App.xaml">App.xaml</ProjectItem>
+			<ProjectItem ReplaceParameters="true" TargetFileName="base.props">base.props</ProjectItem>
+		</Project>
+	</TemplateContent>
+</VSTemplate>
diff --git a/...etcore/Shared/UnoQuickStart.Shared.shproj → ...UI.netcore/Base/UnoQuickStart.Base.shproj b/...etcore/Shared/UnoQuickStart.Shared.shproj → ...UI.netcore/Base/UnoQuickStart.Base.shproj
diff --git a/...te.WinUI.netcore/WinUI/__PreviewImage.png → ...ate.WinUI.netcore/Base/__PreviewImage.png b/...te.WinUI.netcore/WinUI/__PreviewImage.png → ...ate.WinUI.netcore/Base/__PreviewImage.png
diff --git a/...te.WinUI.netcore/WinUI/__TemplateIcon.png → ...ate.WinUI.netcore/Base/__TemplateIcon.png b/...te.WinUI.netcore/WinUI/__TemplateIcon.png → ...ate.WinUI.netcore/Base/__TemplateIcon.png