Remove nested project link in sln file

CommunityToolkit · Jan 10, 2023 · 61b444a · 61b444a
1 parent 1c63c3a
commit 61b444a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1
@@ -186,19 +186,27 @@ Write-Output "Loaded solution template from $solutionTemplatePath";
 
 # Remove test project we don't want to build (Uwp for WinAppSdk and vice versa
 if ($IncludeTests -eq "uwp") {
-	# Remove WinAppSdk Test project
 	Write-Output "Remove WinAppSdk Test Project";
 	$index = $solutionTemplate.IndexOf($templatedProjectTestWinAppSdkMarker)
 	$solutionTemplate.RemoveAt($index);
 	$solutionTemplate.RemoveAt($index);
 	$solutionTemplate.RemoveAt($index);
+
+	# Remove link to Folder
+	$index = $solutionTemplate.IndexOf($templatedProjectTestWinAppSdkMarker)
+	$solutionTemplate.RemoveAt($index);
+	$solutionTemplate.RemoveAt($index);	
 } elseif ($IncludeTests -eq "winappsdk") {
-	# Remove Uwp Test project
 	Write-Output "Remove Uwp Test Project";
 	$index = $solutionTemplate.IndexOf($templatedProjectTestUwpMarker)
 	$solutionTemplate.RemoveAt($index);
 	$solutionTemplate.RemoveAt($index);
 	$solutionTemplate.RemoveAt($index);
+
+	# Remove link to Folder
+	$index = $solutionTemplate.IndexOf($templatedProjectTestUwpMarker)
+	$solutionTemplate.RemoveAt($index);
+	$solutionTemplate.RemoveAt($index);	
 }
 
 # Add sample projects

diff --git a/common/Toolkit.Labs.All.sln.template b/common/Toolkit.Labs.All.sln.template
@@ -1020,7 +1020,9 @@ Global
 		{1B273854-1051-4FE3-9566-A9FA705304DE} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
 		{B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
 		{20926634-C200-43A6-AE59-86F9C3878992} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
+[TemplateTestUwp]
 		{FD78002E-C4E6-4BF8-9EC3-C06250DFEF34} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
+[TemplateTestWinAppSdk]
 		{53892F07-FE54-4E36-81D8-105427D097E5} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
 		{DD69BA61-C86D-4138-AE6F-76E2C8445C9A} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
 		{CA16C45E-DFB1-4641-A28D-EC52B6FB370A} = {09003B35-7A35-4BD1-9A26-5CFD02AB88DD}