Merge pull request #1082 from ably/provide-satellite-public-key-when-…

…exposing-internals Missing PublicKey when exposing internals to strongly named assemblies
ably · Jan 7, 2022 · c60bc1a · c60bc1a
2 parents 085144d + 7014498
commit c60bc1a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/src/IO.Ably.NETStandard20/Properties/AssemblyInfo.cs b/src/IO.Ably.NETStandard20/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: InternalsVisibleTo("IO.Ably.Push.Android")]
-[assembly: InternalsVisibleTo("IO.Ably.Push.iOS")]
+[assembly: InternalsVisibleTo("IO.Ably.Push.Android, PublicKey=002400000480000094000000060200000024000052534131000400000100010001394bb0af9eb8e04f43676c91691de20f2137847e153e27bb96cf2dedf43bce3073f699ca136fb7f9eea0d9b9c6748e9c0be5543761945e101062f8770129512c4c397a08c1b459357e7a49a4dfd7e16ac9c84d1ab3fe1177b3e7741ea10eba746433691bbf1ad643bdf25bcf397a384f96e8d138b129bdb663189200d33dcf")]
+[assembly: InternalsVisibleTo("IO.Ably.Push.iOS,     PublicKey=002400000480000094000000060200000024000052534131000400000100010001394bb0af9eb8e04f43676c91691de20f2137847e153e27bb96cf2dedf43bce3073f699ca136fb7f9eea0d9b9c6748e9c0be5543761945e101062f8770129512c4c397a08c1b459357e7a49a4dfd7e16ac9c84d1ab3fe1177b3e7741ea10eba746433691bbf1ad643bdf25bcf397a384f96e8d138b129bdb663189200d33dcf")]
 #if !PACKAGE
 [assembly: InternalsVisibleTo("IO.Ably.Tests.DotNetCore20")]
 #endif
diff --git a/src/IO.Ably.Push.Android/IO.Ably.Push.Android.csproj b/src/IO.Ably.Push.Android/IO.Ably.Push.Android.csproj
@@ -38,6 +38,12 @@
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
+    <PropertyGroup>
+        <SignAssembly>true</SignAssembly>
+    </PropertyGroup>
+    <PropertyGroup>
+        <AssemblyOriginatorKeyFile>IO.Ably.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
     <ItemGroup>
         <Reference Include="Java.Interop" />
         <Reference Include="Mono.Android" />
@@ -317,6 +323,7 @@
         <Compile Include="Properties\AssemblyInfo.cs" />
     </ItemGroup>
     <ItemGroup>
+        <None Include="IO.Ably.snk" />
         <None Include="packages.config" />
         <None Include="Resources\AboutResources.txt" />
     </ItemGroup>

diff --git a/src/IO.Ably.Push.Android/IO.Ably.snk b/src/IO.Ably.Push.Android/IO.Ably.snk
diff --git a/src/IO.Ably.Push.iOS/IO.Ably.Push.iOS.csproj b/src/IO.Ably.Push.iOS/IO.Ably.Push.iOS.csproj
@@ -33,6 +33,12 @@
         <WarningLevel>4</WarningLevel>
         <ConsolePause>false</ConsolePause>
     </PropertyGroup>
+    <PropertyGroup>
+        <SignAssembly>true</SignAssembly>
+    </PropertyGroup>
+    <PropertyGroup>
+        <AssemblyOriginatorKeyFile>IO.Ably.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
     <ItemGroup>
         <Reference Include="OpenTK-1.0" />
         <Reference Include="System" />
@@ -54,6 +60,7 @@
         <Compile Include="Properties\AssemblyInfo.cs" />
     </ItemGroup>
     <ItemGroup>
+        <None Include="IO.Ably.snk" />
         <None Include="packages.config" />
         <AdditionalFiles Include="..\stylecop.json" />
     </ItemGroup>

diff --git a/src/IO.Ably.Push.iOS/IO.Ably.snk b/src/IO.Ably.Push.iOS/IO.Ably.snk