From 3cdcdc6b04ae5880a34178959dc492dca2cca121 Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Thu, 13 Mar 2025 18:24:15 -0500
Subject: [PATCH 1/3] Remove "Experiment" from RootNamespace and AssemblyName

---
 .../Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj                | 4 ++--
 .../Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj            | 4 ++--
 ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
index 8e90b9ea..4e49d188 100644
--- a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
+++ b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
@@ -21,8 +21,8 @@
 
   <PropertyGroup>
     <ProjectGuid>{7134BD2E-0A74-4345-868A-E425FC452A89}</ProjectGuid>
-    <RootNamespace>ProjectTemplateExperiment.Tests</RootNamespace>
-    <AssemblyName>ProjectTemplateExperiment.Tests.Uwp</AssemblyName>
+    <RootNamespace>ProjectTemplate.Tests</RootNamespace>
+    <AssemblyName>ProjectTemplate.Tests.Uwp</AssemblyName>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
   </PropertyGroup>
 
diff --git a/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj b/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
index 872db0c3..70d082e5 100644
--- a/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
+++ b/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
@@ -18,8 +18,8 @@
   <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />
 
   <PropertyGroup>
-    <RootNamespace>ProjectTemplateExperiment.Tests</RootNamespace>
-    <AssemblyName>ProjectTemplateExperiment.Tests.WinAppSdk</AssemblyName>
+    <RootNamespace>ProjectTemplate.Tests</RootNamespace>
+    <AssemblyName>ProjectTemplate.Tests.WinAppSdk</AssemblyName>
   </PropertyGroup>
 
   <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
diff --git a/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj b/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
index 4b86ee92..3caf6433 100644
--- a/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
+++ b/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
@@ -19,8 +19,8 @@
   <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Uwp.props" />
 
   <PropertyGroup>
-    <RootNamespace>ProjectTemplateExperiment.Samples</RootNamespace>
-    <AssemblyName>ProjectTemplateExperiment.Samples.Uwp</AssemblyName>
+    <RootNamespace>ProjectTemplate.Samples</RootNamespace>
+    <AssemblyName>ProjectTemplate.Samples.Uwp</AssemblyName>
     <ProjectGuid>{E25BF6D0-24D6-459C-A180-1E9405D59F87}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>

From a73b34fdca378377b48f01e373524233f2819677 Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Thu, 13 Mar 2025 18:29:17 -0500
Subject: [PATCH 2/3] Align RootNamespace for single-component test heads

---
 ProjectHeads/SingleComponent/Tests.Uwp/Package.appxmanifest   | 2 +-
 ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest | 2 +-
 ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs      | 2 +-
 ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml     | 2 +-
 ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs  | 2 +-
 ProjectTemplate/tests/ProjectTemplate.Tests.projitems         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ProjectHeads/SingleComponent/Tests.Uwp/Package.appxmanifest b/ProjectHeads/SingleComponent/Tests.Uwp/Package.appxmanifest
index 9d628377..c4fd9676 100644
--- a/ProjectHeads/SingleComponent/Tests.Uwp/Package.appxmanifest
+++ b/ProjectHeads/SingleComponent/Tests.Uwp/Package.appxmanifest
@@ -13,7 +13,7 @@
   <mp:PhoneIdentity PhoneProductId="FC4ACA4C-2390-44E2-B85C-B7763D87C6AB" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
-    <DisplayName>ProjectTemplateExperiment.Tests.Uwp</DisplayName>
+    <DisplayName>ProjectTemplate.Tests.Uwp</DisplayName>
     <PublisherDisplayName>CommunityToolkit</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
diff --git a/ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest b/ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest
index 8e68a0d6..c7ba74f7 100644
--- a/ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest
+++ b/ProjectHeads/SingleComponent/Tests.Wasdk/Package.appxmanifest
@@ -12,7 +12,7 @@
     Version="1.0.0.0" />
 
   <Properties>
-    <DisplayName>ProjectTemplateExperiment.Tests.WinAppSdk</DisplayName>
+    <DisplayName>ProjectTemplate.Tests.WinAppSdk</DisplayName>
     <PublisherDisplayName>CommunityToolkit</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs b/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
index 50fcad4c..3d9a7834 100644
--- a/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
+++ b/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
@@ -6,7 +6,7 @@
 using CommunityToolkit.Tests;
 using CommunityToolkit.WinUI.Controls;
 
-namespace ProjectTemplateExperiment.Tests;
+namespace ProjectTemplate.Tests;
 
 [TestClass]
 public partial class ExampleProjectTemplateTestClass : VisualUITestBase
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index b3f44a5a..09c4b591 100644
--- a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -1,5 +1,5 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<Page x:Class="ProjectTemplateExperiment.Tests.ExampleProjectTemplateTestPage"
+<Page x:Class="ProjectTemplate.Tests.ExampleProjectTemplateTestPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:CommunityToolkit.WinUI.Controls"
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs
index 3035942c..5bc6b603 100644
--- a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs
+++ b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace ProjectTemplateExperiment.Tests;
+namespace ProjectTemplate.Tests;
 
 /// <summary>
 /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/ProjectTemplate/tests/ProjectTemplate.Tests.projitems b/ProjectTemplate/tests/ProjectTemplate.Tests.projitems
index cd927a81..de568df0 100644
--- a/ProjectTemplate/tests/ProjectTemplate.Tests.projitems
+++ b/ProjectTemplate/tests/ProjectTemplate.Tests.projitems
@@ -6,7 +6,7 @@
     <SharedGUID>19AC7A6A-B001-45AA-ACBE-0536F688DB74</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>ProjectTemplateExperiment.Tests</Import_RootNamespace>
+    <Import_RootNamespace>ProjectTemplate.Tests</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleProjectTemplateTestClass.cs" />

From bfc1ea9a4077eefba2d2b969b5efe83f782a1c27 Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Mon, 17 Mar 2025 15:42:49 -0500
Subject: [PATCH 3/3] Align ProjectTemplate test namespaces to avoid component
 class name conflicts.

- Components with classes matching the component name had an invalid namespace declared for test projects.
- Previously, the test namespace would have looked like `ComponentNameExperiment.Tests`, but was changed to look like `ComponentName.Tests`.
- In places where `ComponentName` is an existing class, this causes the observed error.
 -We were unable to use a unified namespace here due to the layout change it causes in the Visual Studio Test Explorer, breaking the existing grouping.
 - To fix the issue "'SomeComponent' is a namespace but is used like a type" while keeping known behavior, we simply remove the `.` in namespace declarations for `SomeComponent.Tests`.
---
 .../SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj  | 2 +-
 .../Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj              | 2 +-
 ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs        | 2 +-
 ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml       | 2 +-
 ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs    | 2 +-
 ProjectTemplate/tests/ProjectTemplate.Tests.projitems           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
index 4e49d188..67b51f8d 100644
--- a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
+++ b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
@@ -21,7 +21,7 @@
 
   <PropertyGroup>
     <ProjectGuid>{7134BD2E-0A74-4345-868A-E425FC452A89}</ProjectGuid>
-    <RootNamespace>ProjectTemplate.Tests</RootNamespace>
+    <RootNamespace>ProjectTemplateTests</RootNamespace>
     <AssemblyName>ProjectTemplate.Tests.Uwp</AssemblyName>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
   </PropertyGroup>
diff --git a/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj b/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
index 70d082e5..63f2382b 100644
--- a/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
+++ b/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
@@ -18,7 +18,7 @@
   <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />
 
   <PropertyGroup>
-    <RootNamespace>ProjectTemplate.Tests</RootNamespace>
+    <RootNamespace>ProjectTemplateTests</RootNamespace>
     <AssemblyName>ProjectTemplate.Tests.WinAppSdk</AssemblyName>
   </PropertyGroup>
 
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs b/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
index 3d9a7834..dfa8a0e8 100644
--- a/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
+++ b/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
@@ -6,7 +6,7 @@
 using CommunityToolkit.Tests;
 using CommunityToolkit.WinUI.Controls;
 
-namespace ProjectTemplate.Tests;
+namespace ProjectTemplateTests;
 
 [TestClass]
 public partial class ExampleProjectTemplateTestClass : VisualUITestBase
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
index 09c4b591..e5597cac 100644
--- a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
+++ b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml
@@ -1,5 +1,5 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
-<Page x:Class="ProjectTemplate.Tests.ExampleProjectTemplateTestPage"
+<Page x:Class="ProjectTemplateTests.ExampleProjectTemplateTestPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:controls="using:CommunityToolkit.WinUI.Controls"
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs
index 5bc6b603..49e3c252 100644
--- a/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs
+++ b/ProjectTemplate/tests/ExampleProjectTemplateTestPage.xaml.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace ProjectTemplate.Tests;
+namespace ProjectTemplateTests;
 
 /// <summary>
 /// An empty page that can be used on its own or navigated to within a Frame.
diff --git a/ProjectTemplate/tests/ProjectTemplate.Tests.projitems b/ProjectTemplate/tests/ProjectTemplate.Tests.projitems
index de568df0..f0b93203 100644
--- a/ProjectTemplate/tests/ProjectTemplate.Tests.projitems
+++ b/ProjectTemplate/tests/ProjectTemplate.Tests.projitems
@@ -6,7 +6,7 @@
     <SharedGUID>19AC7A6A-B001-45AA-ACBE-0536F688DB74</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>ProjectTemplate.Tests</Import_RootNamespace>
+    <Import_RootNamespace>ProjectTemplateTests</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleProjectTemplateTestClass.cs" />