Update all `common` folder references to `tooling`

Add a ToolingDirectory property for simplifying naming in future Abstract a few directories in build.yml to make simpler to change later too
2023-03-13 14:04:22 -07:00 · 2023-03-13 14:04:22 -07:00 · e127f3195e
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -57,6 +57,7 @@ jobs:
        platform: [WinUI2, WinUI3]

    env:
+      MULTI_TARGET_DIRECTORY: tooling/MultiTarget
      # faux-ternary expression to select which platforms to build for each platform vs. duplicating step below.
      TARGET_PLATFORMS: ${{ matrix.platform != 'WinUI3' && 'all' || 'all-uwp' }}
      TEST_PLATFORM: ${{ matrix.platform != 'WinUI3' && 'UWP' || 'WinAppSdk' }}
@ -87,15 +88,15 @@ jobs:
        uses: microsoft/setup-msbuild@v1.3.1

      - name: Enable ${{ env.TARGET_PLATFORMS }} TargetFrameworks
-        working-directory: ./common/MultiTarget/
+        working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }}
        run: powershell -version 5.1 -command "./UseTargetFrameworks.ps1 ${{ env.TARGET_PLATFORMS }}" -ErrorAction Stop

      - name: Generate solution w/ ${{ env.TEST_PLATFORM }} Tests
        working-directory: ./
-        run: powershell -version 5.1 -command "./common/GenerateAllSolution.ps1 -IncludeHeads ${{ env.TEST_PLATFORM }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}" -ErrorAction Stop
+        run: powershell -version 5.1 -command "./tooling/GenerateAllSolution.ps1 -IncludeHeads ${{ env.TEST_PLATFORM }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}" -ErrorAction Stop

      - name: Enable Uno.WinUI (in WinUI3 matrix only)
-        working-directory: ./common/MultiTarget/
+        working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }}
        run: powershell -version 5.1 -command "./UseUnoWinUI.ps1 3" -ErrorAction Stop
        if: ${{ matrix.platform == 'WinUI3' }}

@ -104,7 +105,7 @@ jobs:

      # Build All Packages
      - name: pack experiments
-        working-directory: ./common/Scripts/
+        working-directory: ./tooling/Scripts/
        run: ./PackEachExperiment.ps1 all

      # Push Packages to our DevOps Artifacts Feed
@ -127,11 +128,11 @@ jobs:

      - name: Run SourceGenerators tests
        id: test-generator
-        run: vstest.console.exe ./common/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net6.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx"
+        run: vstest.console.exe ./tooling/CommunityToolkit.Tooling.SampleGen.Tests/bin/Release/net6.0/CommunityToolkit.Tooling.SampleGen.Tests.dll /logger:"trx;LogFileName=SourceGenerators.trx"

      - name: Run experiment tests against ${{ env.TEST_PLATFORM }}
        id: test-platform
-        run:  vstest.console.exe ./common/**/CommunityToolkit.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx"
+        run:  vstest.console.exe ./tooling/**/CommunityToolkit.Tests.${{ env.TEST_PLATFORM }}.build.appxrecipe /Framework:FrameworkUap10 /logger:"trx;LogFileName=${{ env.TEST_PLATFORM }}.trx"

      - name: Create test reports
        run: |
@ -150,7 +151,8 @@ jobs:
    # TODO: We should only run this if something in the common or template folder changed...
    runs-on: windows-latest
    env:
-      PROJECT_DIRECTORY: common/ProjectTemplate
+      HEADS_DIRECTORY: tooling/ProjectHeads
+      PROJECT_DIRECTORY: tooling/ProjectTemplate
      TEST_PROJECT_NAME: CiTestExp
      TEST_PROJECT_DIRECTORY: components/CiTestExp

@ -176,7 +178,7 @@ jobs:

      - name: Add project heads to ProjectTemplate
        working-directory: ./${{ env.PROJECT_DIRECTORY }}
-        run: ${{ github.workspace }}/common/ProjectHeads/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
+        run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}

      # Build and use template for creating new experiments
      - name: Build ProjectTemplate
@ -198,7 +200,7 @@ jobs:

      - name: Add project heads to ${{ env.TEST_PROJECT_NAME }}
        working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
-        run: ${{ github.workspace }}/common/ProjectHeads/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
+        run: ${{ github.workspace }}/${{ env.HEADS_DIRECTORY }}/GenerateSingleSampleHeads.ps1 -componentPath ${{ github.workspace }}/${{ env.TEST_PROJECT_DIRECTORY }}${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}

      - name: MSBuild
        working-directory: ./${{ env.TEST_PROJECT_DIRECTORY }}
@ -235,6 +237,8 @@ jobs:

  wasm-linux:
    runs-on: ubuntu-latest
+    env:
+      HEADS_DIRECTORY: tooling/ProjectHeads

    steps:
      - name: Install .NET SDK v${{ env.DOTNET_VERSION }}
@ -257,7 +261,7 @@ jobs:
      - name: Generate solution
        shell: pwsh
        working-directory: ./
-        run: ./common/GenerateAllSolution.ps1${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}
+        run: ./tooling/GenerateAllSolution.ps1${{ env.ENABLE_DIAGNOSTICS == 'true' && ' -UseDiagnostics' || '' }}

      - name: Install ninja for WASM native dependencies
        run: sudo apt-get install ninja-build
@ -265,7 +269,7 @@ jobs:
      # Issue with Comment Links currently, see: https://github.com/mrlacey/CommentLinks/issues/38
      # See launch.json configuration file for analogous command we're emulating here to build LINK: ../../.vscode/launch.json:CommunityToolkit.App.Wasm.csproj
      - name: dotnet build
-        working-directory: ./common/ProjectHeads/AllComponents/Wasm/
+        working-directory: ./${{ env.HEADS_DIRECTORY }}/AllComponents/Wasm/
        run: dotnet build /r /bl /p:UnoSourceGeneratorUseGenerationHost=true /p:UnoSourceGeneratorUseGenerationController=false
  
      # TODO: Do we want to run tests here? Can we do that on linux easily?
--- a/.gitignore
+++ b/.gitignore
@ -357,7 +357,7 @@ MigrationBackup/

 # Community Toolkit Labs generated files
 CommunityToolkit.AllComponents.sln
-common/MultiTarget/Generated/**
+tooling/MultiTarget/Generated/**
 heads/

 # We use slngen to generate solutions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -14,20 +14,20 @@
        "/p:UnoSourceGeneratorUseGenerationHost=true",
        "/p:UnoSourceGeneratorUseGenerationController=false",
        "/p:UnoRemoteControlPort=443",
-        "--project=${workspaceFolder}/common/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj"
+        "--project=${workspaceFolder}/tooling/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj"
      ],
      "presentation": {
        "group": "1",
        "order": 1
      },
-      "cwd": "${workspaceFolder}/common/ProjectHeads/AllComponents/Wasm",
+      "cwd": "${workspaceFolder}/tooling/ProjectHeads/AllComponents/Wasm",
      "preLaunchTask": "generateAllSolution"
    },
    {
      "type": "PowerShell",
      "request": "launch",
      "name": "Discover samples",
-      "script": "foreach ($component in Get-ChildItem -Directory -Depth 0 -Path './components/*') { ${workspaceFolder}/common/ProjectHeads/GenerateSingleSampleHeads.ps1 -ComponentPath $component } ; ${workspaceFolder}/common/GenerateVSCodeLaunchConfig.ps1; ",
+      "script": "foreach ($component in Get-ChildItem -Directory -Depth 0 -Path './components/*') { ${workspaceFolder}/tooling/ProjectHeads/GenerateSingleSampleHeads.ps1 -ComponentPath $component } ; ${workspaceFolder}/tooling/GenerateVSCodeLaunchConfig.ps1; ",
      "presentation": {
        "group": "2",
        "order": 2
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -6,7 +6,7 @@
        {
            "label": "generateAllSolution",
            "type": "shell",
-            "command": "pwsh ./common/GenerateAllSolution.ps1",
+            "command": "pwsh ./tooling/GenerateAllSolution.ps1",
            "group": "build"
        }
    ]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -2,6 +2,7 @@
  <PropertyGroup>
    <PackageIdPrefix>CommunityToolkit.Labs</PackageIdPrefix>
    <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
+    <ToolingDirectory>$(RepositoryDirectory)\tooling</ToolingDirectory>
    <EnableNETAnalyzers>true</EnableNETAnalyzers>
  </PropertyGroup>

--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -22,7 +22,7 @@
    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory).editorconfig" />
    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)settings.xamlstyler" />
    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)*.md" />
-    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)common\GlobalUsings*.cs" />
+    <SlnGenSolutionItem Include="$(MSBuildThisFileDirectory)tooling\GlobalUsings*.cs" />
  </ItemGroup>

 </Project>
--- a/GenerateAllSolution.bat
+++ b/GenerateAllSolution.bat
@ -2,4 +2,4 @@
 SET "IncludeHeads=%1"
 IF "%IncludeHeads%"=="" SET "IncludeHeads=all"

-powershell .\common\GenerateAllSolution.ps1 -IncludeHeads %IncludeHeads%
+powershell .\tooling\GenerateAllSolution.ps1 -IncludeHeads %IncludeHeads%
--- a/ReadMe.md
+++ b/ReadMe.md
@ -1,7 +1,7 @@

 # 🧪 Windows Community Toolkit Labs (Preview) 🧪

-![Windows Community Toolkit Labs Social Image](common/ToolkitLabsSocial.png)
+![Windows Community Toolkit Labs Social Image](tooling/ToolkitLabsSocial.png)

 Welcome to the home of Windows Community Toolkit Labs. A place for all new components to be developed in 'experiments' for the [Windows Community Toolkit](https://aka.ms/windowstoolkitdocs) (built on top of WinUI 2, [WinUI 3](https://aka.ms/winui3), and [Uno Platform](https://platform.uno))! Find out more about Toolkit Labs in our [blog post here](https://devblogs.microsoft.com/ifdef-windows/announcing-the-windows-community-toolkit-labs/). It includes more about our motivations for having this space as well as how to setup the NuGet feed required to easily use experiments found in this repo.

@ -39,14 +39,14 @@ Once there is traction and your idea is approved, an issue will be created to tr
 Then you can fork the Labs repo, create a new branch, and start working on your feature (or porting over your existing prototype).

 ```ascii
-dotnet new --install .\common\ProjectTemplate\
+dotnet new --install .\tooling\ProjectTemplate\

 cd components

 dotnet new labexp -n MyExperimentNameHere
 ```

-[Read more about creating a new experiment from the template folder here.](https://github.com/CommunityToolkit/Labs-Windows/tree/main/common/ProjectTemplate)
+[Read more about creating a new experiment from the template folder here.](https://github.com/CommunityToolkit/Labs-Windows/tree/main/tooling/ProjectTemplate)

 Then open a PR, not everything needs to be done in your initial PR, but some basically functionality and a usage example should exist. The Labs space is a great place to work on something over time, get feedback from the community, and collaborate with others. However, your initial PR should compile and have enough content for folks to understand how to leverage your component.

@ -70,7 +70,7 @@ Open up an issue on the main Toolkit repo using the `Toolkit Labs Transfer` Issu

 You can build the main Sample App solution to see all the experiments currently available in this repository by running the `GenerateAllSolution.bat` script in the repo root. Then just open the `CommunityToolkit.AllComponents.sln` solution in Visual Studio. You can run one of the project heads such as `CommunityToolkit.App.WinAppSdk` to run the sample app for that platform.

-If you'd like to run a head beyond UWP, Wasm, or the WinAppSDK, you'll need to run the `UseTargetFrameworks.ps1` script first in the `common/Scripts` directory. e.g. `.\UseTargetFrameworks.ps1 -targets all`
+If you'd like to run a head beyond UWP, Wasm, or the WinAppSDK, you'll need to run the `UseTargetFrameworks.ps1` script first in the `tooling/MultiTarget` directory. e.g. `.\UseTargetFrameworks.ps1 -targets all`

 If you'd like to test on Uno + Windows App SDK over Uno + UWP, run the `UseUnoWinUI.ps1` script. e.g. `.\UseUnoWinUI.ps1 -targets 3`

--- a/Windows.Toolkit.Common.props
+++ b/Windows.Toolkit.Common.props
@ -31,6 +31,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <Compile Include="$(RepositoryDirectory)common\GlobalUsings.cs" />
+    <Compile Include="$(RepositoryDirectory)tooling\GlobalUsings.cs" />
  </ItemGroup>
 </Project>
--- a/components/CanvasLayout/OpenSolution.bat
+++ b/components/CanvasLayout/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/CanvasLayout/samples/CanvasLayout.Samples.csproj
+++ b/components/CanvasLayout/samples/CanvasLayout.Samples.csproj
@ -4,5 +4,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
+++ b/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/CanvasView/OpenSolution.bat
+++ b/components/CanvasView/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/CanvasView/samples/CanvasView.Samples.csproj
+++ b/components/CanvasView/samples/CanvasView.Samples.csproj
@ -4,5 +4,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj
+++ b/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/MarqueeText/OpenSolution.bat
+++ b/components/MarqueeText/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/MarqueeText/samples/MarqueeText.Samples.csproj
+++ b/components/MarqueeText/samples/MarqueeText.Samples.csproj
@ -12,5 +12,5 @@
  </ItemGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj
+++ b/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj
@ -13,5 +13,5 @@
  </ItemGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/RivePlayer/OpenSolution.bat
+++ b/components/RivePlayer/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/RivePlayer/samples/RivePlayer.Samples.csproj
+++ b/components/RivePlayer/samples/RivePlayer.Samples.csproj
@ -10,5 +10,5 @@
  </ItemGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj
+++ b/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/SegmentedControl/OpenSolution.bat
+++ b/components/SegmentedControl/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/SegmentedControl/samples/SegmentedControl.Samples.csproj
+++ b/components/SegmentedControl/samples/SegmentedControl.Samples.csproj
@ -4,5 +4,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
+++ b/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/SettingsControls/OpenSolution.bat
+++ b/components/SettingsControls/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/SettingsControls/samples/SettingsControls.Samples.csproj
+++ b/components/SettingsControls/samples/SettingsControls.Samples.csproj
@ -5,5 +5,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj
+++ b/components/SettingsControls/src/CommunityToolkit.Labs.WinUI.SettingsControls.csproj
@ -16,5 +16,5 @@
  </ItemGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/Shimmer/OpenSolution.bat
+++ b/components/Shimmer/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/Shimmer/samples/Shimmer.Samples.csproj
+++ b/components/Shimmer/samples/Shimmer.Samples.csproj
@ -4,7 +4,7 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
  <ItemGroup>
    <None Remove="Assets\Owl.jpg" />
  </ItemGroup>
--- a/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj
+++ b/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj
@ -9,7 +9,7 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
  <ItemGroup>
    <UpToDateCheckInput Remove="Shimmer\Shimmer.xaml" />
  </ItemGroup>
--- a/components/SizerBase/OpenSolution.bat
+++ b/components/SizerBase/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/SizerBase/samples/SizerBase.Samples.csproj
+++ b/components/SizerBase/samples/SizerBase.Samples.csproj
@ -4,5 +4,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj
+++ b/components/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/components/StackedNotificationsBehavior/OpenSolution.bat
+++ b/components/StackedNotificationsBehavior/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/components/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj
+++ b/components/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Samples.csproj
@ -5,5 +5,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj
+++ b/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/tooling/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
+++ b/tooling/CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs
@ -148,7 +148,7 @@ public partial class ToolkitSampleMetadataGenerator
                }

                // 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);
--- a/tooling/GenerateAllSolution.ps1
+++ b/tooling/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")
--- a/tooling/MultiTarget/MultiTarget.props
+++ b/tooling/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) -->
--- a/tooling/ProjectHeads/AllComponents/Tests.Head.AllComponents.props
+++ b/tooling/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>
--- a/tooling/ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj
+++ b/tooling/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>
--- a/tooling/ProjectHeads/AllComponents/Tests.WinAppSdk/CommunityToolkit.Tests.WinAppSdk.csproj
+++ b/tooling/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>
--- a/tooling/ProjectHeads/AllComponents/Uwp/CommunityToolkit.App.Uwp.csproj
+++ b/tooling/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>
--- a/tooling/ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
+++ b/tooling/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" />
--- a/tooling/ProjectHeads/AllComponents/WinAppSdk/CommunityToolkit.App.WinAppSdk.csproj
+++ b/tooling/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>
--- a/tooling/ProjectHeads/App.Head.Wasm.props
+++ b/tooling/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>
--- a/tooling/ProjectHeads/App.Head.props
+++ b/tooling/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>
--- a/tooling/ProjectHeads/GenerateSingleSampleHeads.ps1
+++ b/tooling/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)
 {
--- a/tooling/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
+++ b/tooling/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" />
--- a/tooling/ProjectHeads/SingleComponent/Tests.WinAppSdk/ProjectTemplate.Tests.WinAppSdk.csproj
+++ b/tooling/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" />
--- a/tooling/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
+++ b/tooling/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>
--- a/tooling/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
+++ b/tooling/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" />
--- a/tooling/ProjectHeads/SingleComponent/WinAppSdk/ProjectTemplate.WinAppSdk.csproj
+++ b/tooling/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" />
--- a/tooling/ProjectHeads/Tests.Head.props
+++ b/tooling/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>
--- a/tooling/ProjectTemplate/OpenSolution.bat
+++ b/tooling/ProjectTemplate/OpenSolution.bat
@ -1,3 +1,3 @@
@ECHO OFF

-powershell ..\..\common\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
+powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*
--- a/tooling/ProjectTemplate/README.md
+++ b/tooling/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

--- a/tooling/ProjectTemplate/samples/ProjectTemplate.Samples.csproj
+++ b/tooling/ProjectTemplate/samples/ProjectTemplate.Samples.csproj
@ -4,5 +4,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's sample project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SampleProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SampleProject.props" />
 </Project>
--- a/tooling/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
+++ b/tooling/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
@ -9,5 +9,5 @@
  </PropertyGroup>

  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(RepositoryDirectory)common\ToolkitComponent.SourceProject.props" />
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 </Project>
--- a/tooling/ToolkitComponent.SampleProject.props
+++ b/tooling/ToolkitComponent.SampleProject.props
@ -4,10 +4,10 @@
  </Target>

  <!-- Set up the MultiTarget system -->
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\Uno.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\MultiTarget.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\Uno.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\MultiTarget.props" />

  <!-- Include cs and xaml files in compiled output for reference in sample app -->
  <ItemGroup>
@ -19,12 +19,12 @@

  <!-- Source generator props -->
  <ItemGroup>
-    <ProjectReference Include="$(RepositoryDirectory)\common\CommunityToolkit.Tooling.XamlNamedPropertyRelay\CommunityToolkit.Tooling.XamlNamedPropertyRelay.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="True" />
-    <ProjectReference Include="$(RepositoryDirectory)\common\CommunityToolkit.Tooling.SampleGen\CommunityToolkit.Tooling.SampleGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="True" />
+    <ProjectReference Include="$(ToolingDirectory)\CommunityToolkit.Tooling.XamlNamedPropertyRelay\CommunityToolkit.Tooling.XamlNamedPropertyRelay.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_Samples.cs" />
+    <Compile Include="$(ToolingDirectory)\GlobalUsings_Samples.cs" />

    <!-- Needed for Source Generators to find Markdown files -->
    <AdditionalFiles Include="**\*.md" Exclude="bin\**\*.md;obj\**\*.md" />
--- a/tooling/ToolkitComponent.SourceProject.props
+++ b/tooling/ToolkitComponent.SourceProject.props
@ -4,10 +4,10 @@
  </Target>

  <!-- Set up the MultiTarget system -->
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\TargetFrameworks.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\ProjectIdentifiers.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\Uno.props" />
-  <Import Project="$(RepositoryDirectory)common\MultiTarget\MultiTarget.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\TargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\Uno.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\MultiTarget.props" />
  
  <PropertyGroup>
    <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>