From 26d2af988bcce5a03b6583043825ecef4ae675e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Tue, 4 Sep 2018 18:55:35 +0100
Subject: [PATCH] Added InternalsVisibleTo build target.

---
 build/Targets/Import.targets              |  2 ++
 build/Targets/InternalsVisibleTo.targets  | 24 +++++++++++++++++++++++
 source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj |  4 +---
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 build/Targets/InternalsVisibleTo.targets

diff --git a/build/Targets/Import.targets b/build/Targets/Import.targets
index d856a50cc..6806676e5 100644
--- a/build/Targets/Import.targets
+++ b/build/Targets/Import.targets
@@ -1,5 +1,7 @@
 <Project>
 
+    <Import Project="InternalsVisibleTo.targets" />
+
     <Import Project="PackageProperties.targets" />
 
     <Import Project="StrongName.targets" />
diff --git a/build/Targets/InternalsVisibleTo.targets b/build/Targets/InternalsVisibleTo.targets
new file mode 100644
index 000000000..ed2b81995
--- /dev/null
+++ b/build/Targets/InternalsVisibleTo.targets
@@ -0,0 +1,24 @@
+<Project>
+
+    <PropertyGroup>
+        <IL2CPUPublicKey>0024000004800000940000000602000000240000525341310004000001000100f539d415816bc35bdc6e0fdba2be8fe3ba85eb86b6dd0f9eb134cc3c4513c64227f18ae08069c9456c23b87b49cb4a14838037d5d4154adc033dcba263d60cb26e04afd13d09f850e4df25746d0aa49681bd960912a16a1dccb5e92c3abf954a10a1e5daafa6625f18223a32f0211591437820d8a1c9f1beb41e8e2819b1c1bb</IL2CPUPublicKey>
+    </PropertyGroup>
+
+    <Target Name="GenerateInternalsVisibleTo" BeforeTargets="GetAssemblyAttributes" Condition="'@(InternalsVisibleTo)' != ''">
+
+        <ItemGroup>
+            <InternalsVisibleTo Update="@(InternalsVisibleTo)" PublicKey="$(IL2CPUPublicKey)" Condition="'%(InternalsVisibleTo.Key)' == 'IL2CPU'" />
+        </ItemGroup>
+
+        <Error Text="Unknown public key '%(InternalsVisibleTo.Key)'!" Condition="'%(InternalsVisibleTo.Key)' != '' AND '%(InternalsVisibleTo.PublicKey)' == ''" />
+
+        <ItemGroup>
+            <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+                <_Parameter1 Condition="'%(InternalsVisibleTo.PublicKey)' == ''">%(InternalsVisibleTo.Identity)</_Parameter1>
+                <_Parameter1 Condition="'%(InternalsVisibleTo.PublicKey)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.PublicKey)</_Parameter1>
+            </AssemblyAttribute>
+        </ItemGroup>
+
+    </Target>
+
+</Project>
diff --git a/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj b/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
index a1dede29c..6bf335bf4 100644
--- a/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
+++ b/source/Cosmos.IL2CPU/Cosmos.IL2CPU.csproj
@@ -6,9 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-            <_Parameter1>IL2CPU.Compiler.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f539d415816bc35bdc6e0fdba2be8fe3ba85eb86b6dd0f9eb134cc3c4513c64227f18ae08069c9456c23b87b49cb4a14838037d5d4154adc033dcba263d60cb26e04afd13d09f850e4df25746d0aa49681bd960912a16a1dccb5e92c3abf954a10a1e5daafa6625f18223a32f0211591437820d8a1c9f1beb41e8e2819b1c1bb</_Parameter1>
-        </AssemblyAttribute>
+        <InternalsVisibleTo Include="IL2CPU.Compiler.Tests" Key="IL2CPU" />
     </ItemGroup>
 
     <ItemGroup>