CommunityToolkit · Arlodotexe · Mar 2, 2023 · Sep 14, 2022 · Sep 14, 2022 · Sep 14, 2022
diff --git a/.editorconfig b/.editorconfig
@@ -432,3 +432,6 @@ csharp_style_prefer_extended_property_pattern = true:suggestion
 
 # Require file header
 dotnet_diagnostic.IDE0073.severity = warning
+
+# Uno platform exposes IDisposable on Storyboard publicly when it should be internal. Ignore this.
+dotnet_code_quality.CA1001.excluded_type_names_with_derived_types = T:Windows.UI.Xaml.Media.Animation.Storyboard
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -152,7 +152,7 @@ jobs:
     env:
       PROJECT_DIRECTORY: template/ProjectTemplate
       TEST_PROJECT_NAME: CiTestExp
-      TEST_PROJECT_DIRECTORY: labs/CiTestExp
+      TEST_PROJECT_DIRECTORY: components/CiTestExp
 
     steps:
       - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
@@ -193,7 +193,7 @@ jobs:
         run: dotnet new --install ./
 
       - name: Create new experiment
-        working-directory: ./labs
+        working-directory: ./components
         run: dotnet new labexp -n ${{ env.TEST_PROJECT_NAME }}
 
       - name: Add project heads to ${{ env.TEST_PROJECT_NAME }}
@@ -215,11 +215,11 @@ jobs:
 
       - name: Run tests in the generated experiment against UWP
         id: test-uwp
-        run:  vstest.console.exe ./labs/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.UWP.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}UWP.trx"
+        run:  vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.UWP.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}UWP.trx"
 
       - name: Run tests in the generated experiment against WinAppSDK
         id: test-winappsdk
-        run:  vstest.console.exe ./labs/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx"
+        run:  vstest.console.exe ./components/${{ env.TEST_PROJECT_NAME }}/**/${{ env.TEST_PROJECT_NAME }}.Tests.WinAppSdk.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PROJECT_NAME }}WinAppSdk.trx"
 
       - name: Create test reports
         run: |

diff --git a/ReadMe.md b/ReadMe.md
@@ -19,7 +19,7 @@ You can find the corresponding `CommunityToolkit.Labs` packages in our Azure Dev
 
 If you find an experiment useful, please up-vote 👍 its corresponding issue and comment with any feedback. Each experiment has an issue assigned to it with the `experiment` label for tracking. Please file any feedback or issues about that experiment on that singular issue. For any other questions or concerns, please [open a Discussion](https://github.com/CommunityToolkit/Labs-Windows/discussions).
 
-Otherwise, you can clone the repo, open the `labs` directory, navigate within the folder for a particular experiment and open up it's solution file in Visual Studio. Run one of the project heads (_ExperimentName.Uwp/Wasm/WinAppSDK_) to see its samples.
+Otherwise, you can clone the repo, open the `components` directory, navigate within the folder for a particular experiment and open up it's solution file in Visual Studio. Run one of the project heads (_ExperimentName.Uwp/Wasm/WinAppSDK_) to see its samples.
 
 ## Build Requirements
 
@@ -41,7 +41,7 @@ Then you can fork the Labs repo, create a new branch, and start working on your
 ```ascii
 dotnet new --install .\template\ProjectTemplate\
 
-cd labs
+cd components
 
 dotnet new labexp -n MyExperimentNameHere
 ```

diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs
@@ -162,24 +162,14 @@ private static async Task<string> GetDocumentationFileContents(ToolkitFrontMatte
         var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase);
         var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");
         var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;
-
+        
         if (metadata.FilePath is null || string.IsNullOrWhiteSpace(metadata.FilePath))
             throw new InvalidOperationException("Missing or malformed path to markdown file. Unable to continue;");
 
+        // Normalize the path separators
         var path = metadata.FilePath;
 
-        if (isSingleExperimentHead || isProjectTemplateHead)
-        {
-            var experimentName = assemblyName.Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)[0];
-
-            // Our assembly has 'ProjectTemplateExperiment.Samples', but our folder is 'ProjectTemplate.Samples'
-            experimentName = experimentName.Replace("Experiment", "");
-
-            path = path.Split(new[] { $"\\{experimentName}.Samples" }, StringSplitOptions.RemoveEmptyEntries)[1];
-            path = $"{experimentName}.Samples{path}";
-        }
-
-        var fileUri = new Uri($"ms-appx:///SourceAssets/{path}");
+        var fileUri = new Uri($"ms-appx:///SourceAssets/{(isSingleExperimentHead ? Path.GetFileName(path.Replace('\\', '/')) : path)}");
 
         try
         {

diff --git a/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/common/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs
@@ -226,7 +226,7 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
         if (string.IsNullOrWhiteSpace(assemblyName))
             throw new InvalidOperationException();
 
-        var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.Labs.", StringComparison.OrdinalIgnoreCase);
+        var isAllExperimentHead = assemblyName.StartsWith("CommunityToolkit.", StringComparison.OrdinalIgnoreCase);
         var isProjectTemplateHead = assemblyName.StartsWith("ProjectTemplate");
         var isSingleExperimentHead = !isAllExperimentHead && !isProjectTemplateHead;
 
@@ -247,19 +247,19 @@ private static string GetRelativePathToFileWithoutExtension(Type type)
         if (folderPath.Length != 0)
             folderPath += "/";
 
-        // Component assembly names are formatted as 'ProjectTemplateComponent.Samples'
+        // Component assembly names are formatted as 'ProjectTemplateExperiment.Samples'
         // but the content folder is formatted as 'ProjectTemplate.Samples'
         simpleAssemblyName = simpleAssemblyName.Replace("Experiment", "");
 
         if (isSingleExperimentHead || isProjectTemplateHead)
         {
-            return $"SourceAssets/{simpleAssemblyName}/{folderPath}{type.Name}";
+            return $"SourceAssets/{folderPath}{type.Name}";
         }
 
         if (isAllExperimentHead)
         {
             var sampleName = simpleAssemblyName.Replace(".Samples", "");
-            return $"SourceAssets/{sampleName}/samples/{simpleAssemblyName}/{folderPath}{type.Name}";
+            return $"SourceAssets/{sampleName}/samples/{folderPath}{type.Name}";
         }
 
         throw new InvalidOperationException("Unable to determine if running in a single or all experiment solution.");

diff --git a/common/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs b/common/CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.cs
@@ -473,7 +473,7 @@ from assembly in AppDomain.CurrentDomain.GetAssemblies()
 
         if (!string.IsNullOrWhiteSpace(markdown))
         {
-            var text = new InMemoryAdditionalText(@"C:\pathtorepo\labs\experiment\samples\experiment.Samples\documentation.md", markdown);
+            var text = new InMemoryAdditionalText(@"C:\pathtorepo\components\experiment\samples\experiment.Samples\documentation.md", markdown);
 
             driver = driver.AddAdditionalTexts(ImmutableArray.Create<AdditionalText>(text));
         }

diff --git a/common/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs b/common/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
@@ -148,7 +148,7 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu
                 }
 
                 // Get the filepath we need to be able to load the markdown file in sample app.
-                var filepath = file.Path.Split(new string[] { @"\labs\", "/labs/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+                var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\template\", "/template/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
 
                 // Look for sample id tags
                 var matches = MarkdownRegexSampleTag.Matches(content);

diff --git a/common/GenerateAllSolution.ps1 b/common/GenerateAllSolution.ps1
@@ -64,9 +64,9 @@ if ($IncludeHeads -ne 'uwp')
 [void]$projects.Add(".\common\ProjectHeads\AllComponents\**\*.Wasm.csproj")
 
 # Individual projects
-[void]$projects.Add(".\labs\**\src\*.csproj")
-[void]$projects.Add(".\labs\**\samples\*.Samples\*.Samples.csproj")
-[void]$projects.Add(".\labs\**\tests\*.Tests\*.shproj")
+[void]$projects.Add(".\components\**\src\*.csproj")
+[void]$projects.Add(".\components\**\samples\*.Samples.csproj")
+[void]$projects.Add(".\components\**\tests\*.Tests\*.shproj")
 
 if ($UseDiagnostics.IsPresent)
 {

diff --git a/common/GenerateVSCodeLaunchConfig.ps1 b/common/GenerateVSCodeLaunchConfig.ps1
@@ -20,12 +20,12 @@ function CreateVsCodeLaunchConfigJson {
       `"/p:UnoSourceGeneratorUseGenerationHost=true`",
       `"/p:UnoSourceGeneratorUseGenerationController=false`",
       `"/p:UnoRemoteControlPort=443`",
-      `"--project=`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`"
+      `"--project=`$`{workspaceFolder`}/components/$projectName/samples/$projectName.Wasm/$projectName.Wasm.csproj`"
     ],
     `"presentation`": {
       `"group`": `"2`"
     },
-    `"cwd`": `"`$`{workspaceFolder`}/labs/$projectName/samples/$projectName.Wasm`"
+    `"cwd`": `"`$`{workspaceFolder`}/components/$projectName/samples/$projectName.Wasm`"
   }";
 }
 

diff --git a/common/GlobalUsings_WinUI.cs b/common/GlobalUsings_WinUI.cs
@@ -26,6 +26,7 @@
 global using Windows.UI.Xaml.Input;
 global using Windows.UI.Xaml.Markup;
 global using Windows.UI.Xaml.Media;
+global using Windows.UI.Xaml.Media.Animation;
 global using Windows.UI.Xaml.Navigation;
 
 #else
@@ -40,6 +41,7 @@
 global using Microsoft.UI.Xaml.Input;
 global using Microsoft.UI.Xaml.Markup;
 global using Microsoft.UI.Xaml.Media;
+global using Microsoft.UI.Xaml.Media.Animation;
 global using Microsoft.UI.Xaml.Navigation;
 #endif
 

diff --git a/common/MultiTarget/GenerateAllProjectReferences.ps1 b/common/MultiTarget/GenerateAllProjectReferences.ps1
@@ -11,7 +11,7 @@ Remove-Item -Path $projectPropsOutputDir -Recurse -Force -ErrorAction SilentlyCo
 New-Item -ItemType Directory -Force -Path $projectPropsOutputDir -ErrorAction SilentlyContinue | Out-Null;
 
 # Discover projects in provided paths
-foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/../../labs/") {
+foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/../../components/*") {
   # Normalize project path
   $projectName = $projectPath.Name;
 
@@ -21,7 +21,7 @@ foreach ($projectPath in Get-ChildItem -Directory -Depth 0 -Path "$PSScriptRoot/
   $srcPath = Resolve-Path "$($projectPath.FullName)\src";
   $srcProjectPath = Get-ChildItem -File "$srcPath\*.csproj";
 
-  $samplePath = Resolve-Path "$($projectPath.FullName)\samples\$projectName.Samples";
+  $samplePath = Resolve-Path "$($projectPath.FullName)\samples";
   $sampleProjectPath = Get-ChildItem -File "$samplePath\*.csproj";
 
   if ($srcProjectPath.Length -eq 0) {

diff --git a/common/ProjectHeads/AllComponents/Tests.Head.AllComponents.props b/common/ProjectHeads/AllComponents/Tests.Head.AllComponents.props
@@ -3,7 +3,7 @@
   <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Visual Studio likes to delete the following line - but it's needed to find the tests -->
-  <Import Project="$(RepositoryDirectory)\labs\**\*.Tests.projitems" Label="Shared" />
+  <Import Project="$(RepositoryDirectory)\components\**\*.Tests.projitems" Label="Shared" />
 
   <!-- Include all base code to be tested -->
   <Import Project="$(RepositoryDirectory)common\MultiTarget\Generated\*.props" />

diff --git a/common/ProjectHeads/App.Head.props b/common/ProjectHeads/App.Head.props
@@ -36,34 +36,36 @@
   <!-- See https://github.com/CommunityToolkit/Labs-Windows/issues/142 -->
   <ItemGroup Condition="'$(IsAllExperimentHead)' == 'true'">
     <!-- These are also included in the Samples props file, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
-    <Content Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\obj\**\*.md;$(RepositoryDirectory)**\**\samples\*.Samples\bin\**\*.md;$(RepositoryDirectory)\**\SourceAssets\**\*.md">
+    <Content Include="$(RepositoryDirectory)components\**\samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.md;$(RepositoryDirectory)**\**\samples\bin\**\*.md;$(RepositoryDirectory)\**\SourceAssets\**\*.md">
       <Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
 
-    <Content Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.xaml" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\obj\**\*.xaml;$(RepositoryDirectory)**\**\samples\*.Samples\bin\**\*.xaml;$(RepositoryDirectory)\**\SourceAssets\**\*.xaml">
+    <Content Include="$(RepositoryDirectory)components\**\samples\**\*.xaml" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.xaml;$(RepositoryDirectory)**\**\samples\bin\**\*.xaml;$(RepositoryDirectory)\**\SourceAssets\**\*.xaml">
       <Link>SourceAssets/%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
 
     <!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->
-    <Content Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.cs" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\obj\**\*.cs;$(RepositoryDirectory)**\**\samples\*.Samples\bin\**\*.cs">
+    <Content Include="$(RepositoryDirectory)components\**\samples\**\*.cs" Exclude="$(RepositoryDirectory)**\**\samples\obj\**\*.cs;$(RepositoryDirectory)**\**\samples\bin\**\*.cs">
       <Link Condition="$(IsWasm) == 'true'">SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
     </Content>
 
     <!-- Include markdown files from all samples so the head can access them in the source generator -->
-    <AdditionalFiles Include="$(RepositoryDirectory)labs\**\samples\*.Samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\*.Samples\**\obj\**\*.md;$(RepositoryDirectory)**\**\samples\*.Samples\**\bin\**\*.md"/>
+    <AdditionalFiles Include="$(RepositoryDirectory)components\**\samples\**\*.md" Exclude="$(RepositoryDirectory)**\**\samples\**\obj\**\*.md;$(RepositoryDirectory)**\**\samples\**\bin\**\*.md"/>
   </ItemGroup>
 
   <!-- See https://github.com/CommunityToolkit/Labs-Windows/issues/142 -->
   <ItemGroup Condition="'$(IsSingleExperimentHead)' == 'true' or '$(IsProjectTemplateHead)' == 'true'">
     <!-- These are also included in the Samples props file, but added here to workaround https://github.com/unoplatform/uno/issues/2502 -->
-    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\samples\*.Samples\bin\**\*.md;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.md" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
-    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.xaml" Exclude="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\obj\**\*.xaml;$(MSBuildProjectDirectory)\..\..\samples\*.Samples\bin\**\*.xaml;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.xaml" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
+    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.md;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.md" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
+    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.xaml" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.xaml;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.xaml;$(MSBuildProjectDirectory)\..\..\**\SourceAssets\**\*.xaml" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension)"/>
 
     <!-- Link/.dat is a workaround for https://github.com/unoplatform/uno/issues/8649 -->
-    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.cs" Exclude="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\obj\**\*.cs;$(MSBuildProjectDirectory)\..\..\samples\*.Samples\bin\**\*.cs" Link="SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat" />
+    <Content Include="$(MSBuildProjectDirectory)\..\..\samples\**\*.cs" Exclude="$(MSBuildProjectDirectory)\..\..\samples\obj\**\*.cs;$(MSBuildProjectDirectory)\..\..\samples\bin\**\*.cs">
+      <Link Condition="$(IsWasm) == 'true'">SourceAssets/%(RecursiveDir)%(FileName)%(Extension).dat</Link>
+    </Content>
 
     <!-- Include markdown files from all samples so the head can access them in the source generator -->
-    <AdditionalFiles Include="$(MSBuildProjectDirectory)\..\..\samples\*.Samples\**\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\**\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\**\bin\**\*.md"/>
+    <AdditionalFiles Include="$(MSBuildProjectDirectory)\..\..\samples\*.md" Exclude="$(MSBuildProjectDirectory)\..\..\**\obj\**\*.md;$(MSBuildProjectDirectory)\..\..\**\bin\**\*.md"/>
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/common/ProjectHeads/GenerateSingleSampleHeads.ps1 b/common/ProjectHeads/GenerateSingleSampleHeads.ps1
@@ -29,7 +29,7 @@ Param (
     [switch]$UseDiagnostics = $false
 )
 
-if ($Env:Path.Contains("MSBuild") -eq $false) {
+if ($Env:Path.ToLower().Contains("msbuild") -eq $false) {
     Write-Host
     Write-Host -ForegroundColor Red "Please run from a command window that has MSBuild.exe on the PATH"
     Write-Host
@@ -55,7 +55,7 @@ Push-Location $componentPath
 dotnet new ct-tooling-heads -n $componentName
 
 # Rename folder from component name (dotnet tooling default) to 'heads'
-Rename-Item -Path "$componentPath/$componentName" -NewName $headsFolderName -Force
+Rename-Item -Path "$componentName" -NewName $headsFolderName -Force
 
 # Remove template, as just for script
 dotnet new --uninstall "$PSScriptRoot/SingleComponent"

diff --git a/common/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/common/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
@@ -42,7 +42,7 @@
   <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Include the unit test files themselves -->
-  <Import Project="..\..\tests\ProjectTemplate.Tests\ProjectTemplate.Tests.projitems" Label="Shared" />
+  <Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />

diff --git a/common/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj b/common/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj
@@ -39,7 +39,7 @@
   <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Include the unit test files themselves -->
-  <Import Project="..\..\tests\ProjectTemplate.Tests\ProjectTemplate.Tests.projitems" Label="Shared" />
+  <Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />

diff --git a/common/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj b/common/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj"/>
-    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples\ProjectTemplate.Samples.csproj"/>
+    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj"/>
   </ItemGroup>
 
   <!-- Must be imported after any shared projects in non-sdk style projects -->

diff --git a/common/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/common/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
@@ -28,6 +28,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
-    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples\ProjectTemplate.Samples.csproj" />
+    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj" />
   </ItemGroup>
 </Project>
diff --git a/common/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/common/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\CommunityToolkit.Labs.WinUI.ProjectTemplate.csproj" />
-    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples\ProjectTemplate.Samples.csproj" />
+    <ProjectReference Include="..\..\samples\ProjectTemplate.Samples.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/common/Scripts/PackEachExperiment.ps1 b/common/Scripts/PackEachExperiment.ps1
@@ -1,4 +1,4 @@
 
-foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../labs/*/src/*.csproj') {
+foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../components/*/src/*.csproj') {
   & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable $experimentProjPath
 }