From e1f0ecbeed4788dfdd3bb5c814d34ccfcf763e61 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 18 Apr 2024 11:15:17 -0500
Subject: [PATCH 1/3] Use package Id as assembly name

---
 tooling | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling b/tooling
index bf45e14d..3cf0f05b 160000
--- a/tooling
+++ b/tooling
@@ -1 +1 @@
-Subproject commit bf45e14d737a1132031673faf5ed8952f08dc508
+Subproject commit 3cf0f05bf67c5f361fa9343c1274c01ed336eebb

From 913675b489381e81c54ab77866e87bacfaf4761a Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Thu, 18 Apr 2024 11:16:05 -0500
Subject: [PATCH 2/3] Fix using PackageId as AssemblyName for custom PackageIds

---
 ...mmunityToolkit.WinUI.Controls.CameraPreview.csproj | 11 +++++++----
 ...CommunityToolkit.WinUI.Controls.ColorPicker.csproj |  7 +++++--
 ...nityToolkit.WinUI.Controls.HeaderedControls.csproj | 11 +++++++----
 ...ommunityToolkit.WinUI.Controls.ImageCropper.csproj | 11 +++++++----
 ...olkit.WinUI.Controls.LayoutTransformControl.csproj | 11 +++++++----
 ...unityToolkit.WinUI.Controls.MetadataControl.csproj | 11 +++++++----
 .../CommunityToolkit.WinUI.Controls.Primitives.csproj | 11 +++++++----
 ...CommunityToolkit.WinUI.Controls.RadialGauge.csproj | 11 +++++++----
 ...mmunityToolkit.WinUI.Controls.RangeSelector.csproj | 11 +++++++----
 ...munityToolkit.WinUI.Controls.RichSuggestBox.csproj | 11 +++++++----
 .../CommunityToolkit.WinUI.Controls.Segmented.csproj  | 11 +++++++----
 ...nityToolkit.WinUI.Controls.SettingsControls.csproj | 11 +++++++----
 .../src/CommunityToolkit.WinUI.Controls.Sizers.csproj | 11 +++++++----
 ...nityToolkit.WinUI.Controls.TabbedCommandBar.csproj | 11 +++++++----
 ...ityToolkit.WinUI.Controls.TokenizingTextBox.csproj | 11 +++++++----
 15 files changed, 103 insertions(+), 58 deletions(-)

diff --git a/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj b/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj
index c5df5361..6f3cc06b 100644
--- a/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj
+++ b/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj
@@ -14,6 +14,13 @@
     <ProjectReference Include="$(ToolkitHelpersSourceProject)"/>
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-   <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/ColorPicker/src/CommunityToolkit.WinUI.Controls.ColorPicker.csproj b/components/ColorPicker/src/CommunityToolkit.WinUI.Controls.ColorPicker.csproj
index 87f7d0e3..dc765d28 100644
--- a/components/ColorPicker/src/CommunityToolkit.WinUI.Controls.ColorPicker.csproj
+++ b/components/ColorPicker/src/CommunityToolkit.WinUI.Controls.ColorPicker.csproj
@@ -17,13 +17,16 @@
     <ProjectReference Include="$(ToolkitAnimationsSourceProject)" />
   </ItemGroup>
 
-  <!-- Sets this up as a toolkit component's source project -->
-  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
 
   <PropertyGroup>
     <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
   </PropertyGroup>
 
+  <!-- Sets this up as a toolkit component's source project -->
+  <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
+
   <Target Name="BeforeGenerateProjectPriFile">
     <ItemGroup>
       <_LayoutFile Remove="@(_LayoutFile)" Condition="$([System.String]::Copy(&quot;%(_LayoutFile.TargetPath)&quot;).StartsWith('CommunityToolkit.WinUI.Controls.Segmented\'))" />
diff --git a/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj b/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj
index 9fde5d02..c92af839 100644
--- a/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj
+++ b/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj
@@ -10,6 +10,13 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -19,8 +26,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj b/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
index bcfcd96f..933bb40c 100644
--- a/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
+++ b/components/ImageCropper/src/CommunityToolkit.WinUI.Controls.ImageCropper.csproj
@@ -14,6 +14,13 @@
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj b/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj
index 233e2e4d..def17761 100644
--- a/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj
+++ b/components/LayoutTransformControl/src/CommunityToolkit.WinUI.Controls.LayoutTransformControl.csproj
@@ -13,6 +13,13 @@
   <ItemGroup>
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
   </ItemGroup>
+
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
   
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj b/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj
index 2b2b589c..3c67fbf8 100644
--- a/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj
+++ b/components/MetadataControl/src/CommunityToolkit.WinUI.Controls.MetadataControl.csproj
@@ -10,6 +10,13 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -19,8 +26,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-   <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj b/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj
index 18c64107..435cc8e1 100644
--- a/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj
+++ b/components/Primitives/src/CommunityToolkit.WinUI.Controls.Primitives.csproj
@@ -14,6 +14,13 @@
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)"></ProjectReference>
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj b/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj
index b6ecb9af..3f4c36e2 100644
--- a/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj
+++ b/components/RadialGauge/src/CommunityToolkit.WinUI.Controls.RadialGauge.csproj
@@ -15,6 +15,13 @@
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -24,8 +31,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj b/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj
index 7e709773..e47e5f29 100644
--- a/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj
+++ b/components/RangeSelector/src/CommunityToolkit.WinUI.Controls.RangeSelector.csproj
@@ -14,6 +14,13 @@
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj b/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj
index f50bf0ff..6c5bfb4c 100644
--- a/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj
+++ b/components/RichSuggestBox/src/CommunityToolkit.WinUI.Controls.RichSuggestBox.csproj
@@ -14,6 +14,13 @@
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/Segmented/src/CommunityToolkit.WinUI.Controls.Segmented.csproj b/components/Segmented/src/CommunityToolkit.WinUI.Controls.Segmented.csproj
index b52c14d8..b20476ec 100644
--- a/components/Segmented/src/CommunityToolkit.WinUI.Controls.Segmented.csproj
+++ b/components/Segmented/src/CommunityToolkit.WinUI.Controls.Segmented.csproj
@@ -14,6 +14,13 @@
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj b/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj
index 86b9a3a9..9756f767 100644
--- a/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj
+++ b/components/SettingsControls/src/CommunityToolkit.WinUI.Controls.SettingsControls.csproj
@@ -10,6 +10,13 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
   <ItemGroup>
     <ProjectReference Include="$(ToolkitTriggersSourceProject)"></ProjectReference>
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj b/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj
index 93100175..e1ab0b11 100644
--- a/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj
+++ b/components/Sizers/src/CommunityToolkit.WinUI.Controls.Sizers.csproj
@@ -10,6 +10,13 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -23,8 +30,4 @@
   <ItemGroup>
     <ProjectReference Include="$(ToolkitExtensionsSourceProject)" />
   </ItemGroup>
-
-  <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/TabbedCommandBar/src/CommunityToolkit.WinUI.Controls.TabbedCommandBar.csproj b/components/TabbedCommandBar/src/CommunityToolkit.WinUI.Controls.TabbedCommandBar.csproj
index f97cd6e1..e15066ab 100644
--- a/components/TabbedCommandBar/src/CommunityToolkit.WinUI.Controls.TabbedCommandBar.csproj
+++ b/components/TabbedCommandBar/src/CommunityToolkit.WinUI.Controls.TabbedCommandBar.csproj
@@ -7,10 +7,13 @@
     <RootNamespace>CommunityToolkit.WinUI.Controls.TabbedCommandBarRns</RootNamespace>
   </PropertyGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
-  
-  <PropertyGroup>
-      <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>
diff --git a/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj b/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj
index 572d6a05..f7d85e18 100644
--- a/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj
+++ b/components/TokenizingTextBox/src/CommunityToolkit.WinUI.Controls.TokenizingTextBox.csproj
@@ -16,6 +16,13 @@
     <ProjectReference Include="$(ToolkitPrimitivesSourceProject)" />    
   </ItemGroup>
 
+  <!-- Import PackageIdVariant for custom package id -->
+  <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
+
+   <PropertyGroup>
+    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
+  </PropertyGroup>
+
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
 
@@ -25,8 +32,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-
-   <PropertyGroup>
-    <PackageId>$(PackageIdPrefix).$(PackageIdVariant).Controls.$(ToolkitComponentName)</PackageId>
-  </PropertyGroup>
 </Project>

From 6b54da16764f1bba12d3d1ed1280b703b2490f53 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Mon, 6 May 2024 09:31:00 -0500
Subject: [PATCH 3/3] Use PackageIdVariant in InternalsVisibleTo

---
 .../src/CommunityToolkit.WinUI.Animations.csproj       | 10 ++++++----
 .../src/CommunityToolkit.WinUI.Extensions.csproj       |  4 ++--
 tooling                                                |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
index 48b2672b..bc0ccca2 100644
--- a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
+++ b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
@@ -11,10 +11,7 @@
     <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="CommunityToolkit.WinUI.Media" />
-    <InternalsVisibleTo Include="CommunityToolkit.WinUI.Behaviors" />
-    
+  <ItemGroup>    
     <PackageReference Include="PolySharp" Version="1.13.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -34,4 +31,9 @@
 
   <!-- Sets this up as a toolkit component's source project -->
   <Import Project="$(ToolingDirectory)\ToolkitComponent.SourceProject.props" />
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Media" />
+    <InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Behaviors" />
+  </ItemGroup>
 </Project>
diff --git a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj
index 84092b31..ba4c6092 100644
--- a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj
+++ b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj
@@ -31,7 +31,7 @@
 
     <!-- TODO: We should figure out a better way to share internal helpers without duplication -->
     <!-- e.g. Animations is using ThrowIfNull helper... -->
-    <InternalsVisibleTo Include="CommunityToolkit.WinUI.Animations" />
-    <InternalsVisibleTo Include="CommunityToolkit.WinUI.Media" />
+    <InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Animations" />
+    <InternalsVisibleTo Include="CommunityToolkit.$(PackageIdVariant).Media" />
   </ItemGroup>
 </Project>
diff --git a/tooling b/tooling
index 3cf0f05b..065959a6 160000
--- a/tooling
+++ b/tooling
@@ -1 +1 @@
-Subproject commit 3cf0f05bf67c5f361fa9343c1274c01ed336eebb
+Subproject commit 065959a6382d661e1d27308c24a8394a966959d1