Update all common folder references to tooling

michael-hawker · michael-hawker · commit b1fd78d3d8c0 · 2023-03-14T02:01:17.000-07:00
Add a ToolingDirectory property for simplifying naming in future
Abstract a few directories in build.yml to make simpler to change later too
diff --git a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs b/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[] { @"\components\", "/components/", @"\common\", "/common/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+                var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\tooling\", "/tooling/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
 
                 // Look for sample id tags
                 var matches = MarkdownRegexSampleTag.Matches(content);
diff --git a/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1
@@ -29,7 +29,7 @@ Param (
 )
 
 # Generate required props for "All" solution.
-& ./common/MultiTarget/GenerateAllProjectReferences.ps1
+& ./tooling/MultiTarget/GenerateAllProjectReferences.ps1
 
 # Set up constant values
 $generatedSolutionFilePath = 'CommunityToolkit.AllComponents.sln'
@@ -47,20 +47,20 @@ if (Test-Path -Path $generatedSolutionFilePath)
 $projects = [System.Collections.ArrayList]::new()
 
 # Common/Dependencies for shared infrastructure
-[void]$projects.Add(".\common\CommunityToolkit*\*.*proj")
+[void]$projects.Add(".\tooling\CommunityToolkit*\*.*proj")
 
 # App Head and Test Head
 if ($IncludeHeads -ne 'winappsdk')
 {
-    [void]$projects.Add(".\common\ProjectHeads\AllComponents\**\*.Uwp.csproj")
+    [void]$projects.Add(".\tooling\ProjectHeads\AllComponents\**\*.Uwp.csproj")
 }
 
 if ($IncludeHeads -ne 'uwp')
 {
-    [void]$projects.Add(".\common\ProjectHeads\AllComponents\**\*.WinAppSdk.csproj")
+    [void]$projects.Add(".\tooling\ProjectHeads\AllComponents\**\*.WinAppSdk.csproj")
 }
 
-[void]$projects.Add(".\common\ProjectHeads\AllComponents\**\*.Wasm.csproj")
+[void]$projects.Add(".\tooling\ProjectHeads\AllComponents\**\*.Wasm.csproj")
 
 # Individual projects
 [void]$projects.Add(".\components\**\src\*.csproj")
diff --git a/MultiTarget/MultiTarget.props b/MultiTarget/MultiTarget.props
@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepositoryDirectory)common\GlobalUsings_WinUI.cs" />
+    <Compile Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
   </ItemGroup>
 
   <!-- Automatically include XAML pages within multi-targetted projects (source and samples) -->
diff --git a/ProjectHeads/AllComponents/Tests.Head.AllComponents.props b/ProjectHeads/AllComponents/Tests.Head.AllComponents.props
@@ -1,10 +1,10 @@
 <Project>
   <!-- Needed Unit Testing helper base classes -->
-  <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
+  <Import Project="$(ToolingDirectory)\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)\components\**\*.Tests.projitems" Label="Shared" />
 
   <!-- Include all base code to be tested -->
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\Generated\*.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\Generated\*.props" />
 </Project>
diff --git a/ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj b/ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
   
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -21,9 +21,9 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\Tests.Head.Uwp.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\AllComponents\Tests.Head.AllComponents.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.Uwp.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\AllComponents\Tests.Head.AllComponents.props" />
 
   <PropertyGroup>
     <ProjectGuid>{FD78002E-C4E6-4BF8-9EC3-C06250DFEF34}</ProjectGuid>
diff --git a/ProjectHeads/AllComponents/Tests.WinAppSdk/CommunityToolkit.Tests.WinAppSdk.csproj b/ProjectHeads/AllComponents/Tests.WinAppSdk/CommunityToolkit.Tests.WinAppSdk.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -19,9 +19,9 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\Tests.Head.WinAppSdk.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\AllComponents\Tests.Head.AllComponents.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\AllComponents\Tests.Head.AllComponents.props" />
 
   <PropertyGroup>
     <RootNamespace>CommunityToolkit.Tests</RootNamespace>
diff --git a/ProjectHeads/AllComponents/Uwp/CommunityToolkit.App.Uwp.csproj b/ProjectHeads/AllComponents/Uwp/CommunityToolkit.App.Uwp.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
   
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -21,9 +21,9 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.Uwp.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\Generated\*.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Uwp.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\Generated\*.props" />
 
   <PropertyGroup>
     <RootNamespace>CommunityToolkit.App.Uwp</RootNamespace>
diff --git a/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj b/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web" TreatAsLocalProperty="TargetFramework">
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>true</IsUno>
@@ -19,9 +19,9 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\Generated\*.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.Wasm.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\Generated\*.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Wasm.props" />
 
   <ItemGroup>
     <EmbeddedResource Include="WasmScripts\AppManifest.js" />
diff --git a/ProjectHeads/AllComponents/WinAppSdk/CommunityToolkit.App.WinAppSdk.csproj b/ProjectHeads/AllComponents/WinAppSdk/CommunityToolkit.App.WinAppSdk.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -19,9 +19,9 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\Generated\*.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.WinAppSdk.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\Generated\*.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.WinAppSdk.props" />
 
   <PropertyGroup>
     <RootNamepace>CommunityToolkit.App.WinAppSdk</RootNamepace>
diff --git a/ProjectHeads/App.Head.Wasm.props b/ProjectHeads/App.Head.Wasm.props
@@ -35,6 +35,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <LinkerDescriptor Include="$(RepositoryDirectory)\common\CommunityToolkit.App.Shared\LinkerConfig.xml" />
+    <LinkerDescriptor Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\LinkerConfig.xml" />
   </ItemGroup>
 </Project>
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
@@ -1,7 +1,7 @@
 <!-- Common props for any deployable app project head. -->
 <Project>
   <!-- Shared project -->
-  <Import Project="$(RepositoryDirectory)\common\CommunityToolkit.App.Shared\CommunityToolkit.App.Shared.projitems" Label="Shared" />
+  <Import Project="$(ToolingDirectory)\CommunityToolkit.App.Shared\CommunityToolkit.App.Shared.projitems" Label="Shared" />
 
   <!-- Shared project dependencies -->
   <ItemGroup>
@@ -15,11 +15,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepositoryDirectory)common\CommunityToolkit.Tooling.SampleGen\CommunityToolkit.Tooling.SampleGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+    <ProjectReference Include="$(ToolingDirectory)\CommunityToolkit.Tooling.SampleGen\CommunityToolkit.Tooling.SampleGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepositoryDirectory)common\GlobalUsings_WinUI.cs" />
+    <Compile Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/ProjectHeads/GenerateSingleSampleHeads.ps1 b/ProjectHeads/GenerateSingleSampleHeads.ps1
@@ -85,11 +85,11 @@ $projects = [System.Collections.ArrayList]::new()
 [void]$projects.Add(".\**.*proj")
 
 # Include common dependencies required for solution to build
-[void]$projects.Add("..\..\common\CommunityToolkit.App.Shared\**\*.*proj")
-[void]$projects.Add("..\..\common\CommunityToolkit.Tests.Shared\**\*.*proj")
-[void]$projects.Add("..\..\common\CommunityToolkit.Tooling.SampleGen\*.csproj")
-[void]$projects.Add("..\..\common\CommunityToolkit.Tooling.TestGen\*.csproj")
-[void]$projects.Add("..\..\common\CommunityToolkit.Tooling.XamlNamedPropertyRelay\*.csproj")
+[void]$projects.Add("..\..\tooling\CommunityToolkit.App.Shared\**\*.*proj")
+[void]$projects.Add("..\..\tooling\CommunityToolkit.Tests.Shared\**\*.*proj")
+[void]$projects.Add("..\..\tooling\CommunityToolkit.Tooling.SampleGen\*.csproj")
+[void]$projects.Add("..\..\tooling\CommunityToolkit.Tooling.TestGen\*.csproj")
+[void]$projects.Add("..\..\tooling\CommunityToolkit.Tooling.XamlNamedPropertyRelay\*.csproj")
 
 if ($UseDiagnostics.IsPresent)
 {
diff --git a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
   
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -21,8 +21,8 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\Tests.Head.Uwp.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.Uwp.props" />
 
   <PropertyGroup>
     <ProjectGuid>{7134BD2E-0A74-4345-868A-E425FC452A89}</ProjectGuid>
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <!-- Needed Unit Testing helper base classes -->
-  <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
+  <Import Project="$(ToolingDirectory)\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Include the unit test files themselves -->
   <Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
diff --git a/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj b/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -20,8 +20,8 @@
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\Tests.Head.WinAppSdk.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />
 
   <PropertyGroup>
     <RootNamespace>ProjectTemplateExperiment.Tests</RootNamespace>
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <!-- Needed Unit Testing helper base classes -->
-  <Import Project="$(RepositoryDirectory)common\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
+  <Import Project="$(ToolingDirectory)\CommunityToolkit.Tests.Shared\CommunityToolkit.Tests.Shared.projitems" Label="Unit Testing Helpers" />
 
   <!-- Include the unit test files themselves -->
   <Import Project="..\..\tests\ProjectTemplate.Tests.projitems" Label="Shared" />
diff --git a/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj b/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
   
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -21,8 +21,8 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.Uwp.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Uwp.props" />
 
   <PropertyGroup>
     <RootNamespace>ProjectTemplateExperiment.Samples</RootNamespace>
diff --git a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web" TreatAsLocalProperty="TargetFramework">
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>true</IsUno>
@@ -19,8 +19,8 @@
     <IsGtkHead>false</IsGtkHead>
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.Wasm.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Wasm.props" />
 
   <ItemGroup>
     <EmbeddedResource Include="WasmScripts\AppManifest.js" />
diff --git a/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj b/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
   <PropertyGroup>
     <IsDeployableHead>true</IsDeployableHead>
     <IsUno>false</IsUno>
@@ -20,8 +20,8 @@
     <IsGtkLib>false</IsGtkLib>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\ProjectHeads\App.Head.WinAppSdk.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.WinAppSdk.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\*.csproj" />
diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
@@ -15,23 +15,23 @@
       <Version>2.2.10</Version>
     </PackageReference>
 
-    <ProjectReference Include="$(RepositoryDirectory)common\CommunityToolkit.Tooling.TestGen\CommunityToolkit.Tooling.TestGen.csproj"
+    <ProjectReference Include="$(ToolingDirectory)\CommunityToolkit.Tooling.TestGen\CommunityToolkit.Tooling.TestGen.csproj"
                       OutputItemType="Analyzer" ReferenceOutputAssembly="True" />
   </ItemGroup>
 
   <!-- Global Usings -->
   <ItemGroup>
-    <Compile Include="$(RepositoryDirectory)common\GlobalUsings_WinUI.cs" />
-    <Compile Include="$(RepositoryDirectory)common\GlobalUsings_Tests.cs" />
+    <Compile Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
+    <Compile Include="$(ToolingDirectory)\GlobalUsings_Tests.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\LockScreenLogo.png" Link="Assets\LockScreenLogo.png" />
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\SplashScreen.png" Link="Assets\SplashScreen.png" />
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\Square150x150Logo.png" Link="Assets\Square150x150Logo.png" />
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\Square44x44Logo.png" Link="Assets\Square44x44Logo.png" />
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" Link="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\StoreLogo.png" Link="Assets\StoreLogo.png" />
-    <Content Include="$(RepositoryDirectory)common\CommunityToolkit.App.Shared\Assets\Wide310x150Logo.png" Link="Assets\Wide310x150Logo.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\LockScreenLogo.png" Link="Assets\LockScreenLogo.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\SplashScreen.png" Link="Assets\SplashScreen.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\Square150x150Logo.png" Link="Assets\Square150x150Logo.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\Square44x44Logo.png" Link="Assets\Square44x44Logo.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" Link="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\StoreLogo.png" Link="Assets\StoreLogo.png" />
+    <Content Include="$(ToolingDirectory)\CommunityToolkit.App.Shared\Assets\Wide310x150Logo.png" Link="Assets\Wide310x150Logo.png" />
   </ItemGroup>
 </Project>
diff --git a/ProjectTemplate/OpenSolution.bat b/ProjectTemplate/OpenSolution.bat
@@ -1,3 +1,3 @@
 @ECHO OFF
 
-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
diff --git a/ProjectTemplate/README.md b/ProjectTemplate/README.md
@@ -7,7 +7,7 @@ This directory includes the template for creating new labs experiments.
 To use the template to create a new experiment, open a command prompt in the **root directory** and run the following commands:
 
 ```ascii
-dotnet new --install .\common\ProjectTemplate\
+dotnet new --install .\tooling\ProjectTemplate\
 
 cd components
 
diff --git a/ProjectTemplate/samples/ProjectTemplate.Samples.csproj b/ProjectTemplate/samples/ProjectTemplate.Samples.csproj
diff --git a/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj b/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
diff --git a/ToolkitComponent.SampleProject.props b/ToolkitComponent.SampleProject.props
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private ImmutableArray<ToolkitFrontMatter> GatherDocumentFrontMatter(SourceProdu`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`// Get the filepath we need to be able to load the markdown file in sample app.`
`151`		`- var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\common\", "/common/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();`
	`151`	`+ var filepath = file.Path.Split(new string[] { @"\components\", "/components/", @"\tooling\", "/tooling/" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();`
`152`	`152`
`153`	`153`	`// Look for sample id tags`
`154`	`154`	`var matches = MarkdownRegexSampleTag.Matches(content);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ Param (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`# Generate required props for "All" solution.`
`32`		`-& ./common/MultiTarget/GenerateAllProjectReferences.ps1`
	`32`	`+& ./tooling/MultiTarget/GenerateAllProjectReferences.ps1`
`33`	`33`
`34`	`34`	`# Set up constant values`
`35`	`35`	`$generatedSolutionFilePath = 'CommunityToolkit.AllComponents.sln'`
`@@ -47,20 +47,20 @@ if (Test-Path -Path $generatedSolutionFilePath)`
`47`	`47`	`$projects = [System.Collections.ArrayList]::new()`
`48`	`48`
`49`	`49`	`# Common/Dependencies for shared infrastructure`
`50`		`-[void]$projects.Add(".\common\CommunityToolkit\.*proj")`
	`50`	`+[void]$projects.Add(".\tooling\CommunityToolkit\.*proj")`
`51`	`51`
`52`	`52`	`# App Head and Test Head`
`53`	`53`	`if ($IncludeHeads -ne 'winappsdk')`
`54`	`54`	`{`
`55`		`- [void]$projects.Add(".\common\ProjectHeads\AllComponents\*\.Uwp.csproj")`
	`55`	`+ [void]$projects.Add(".\tooling\ProjectHeads\AllComponents\*\.Uwp.csproj")`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if ($IncludeHeads -ne 'uwp')`
`59`	`59`	`{`
`60`		`- [void]$projects.Add(".\common\ProjectHeads\AllComponents\*\.WinAppSdk.csproj")`
	`60`	`+ [void]$projects.Add(".\tooling\ProjectHeads\AllComponents\*\.WinAppSdk.csproj")`
`61`	`61`	`}`
`62`	`62`
`63`		`-[void]$projects.Add(".\common\ProjectHeads\AllComponents\*\.Wasm.csproj")`
	`63`	`+[void]$projects.Add(".\tooling\ProjectHeads\AllComponents\*\.Wasm.csproj")`
`64`	`64`
`65`	`65`	`# Individual projects`
`66`	`66`	`[void]$projects.Add(".\components\*\src\.csproj")`