Use PackageIdVariant in InternalsVisibleTo

CommunityToolkit · May 6, 2024 · 6b54da1 · 6b54da1
1 parent 913675b
commit 6b54da1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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