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] 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