From 96209052ecab302ab56dbfb0b0dc34c3577436d8 Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Wed, 3 May 2023 13:21:39 -0700
Subject: [PATCH] Add file for strong naming assembly

If you use `sn -T` on the version 1.3.0 RabbitMQ dll, you get this:

```
lib\net6.0> sn -T .\RabbitMQ.Stream.Client.dll

Microsoft (R) .NET Framework Strong Name Utility  Version 4.0.30319.0
Copyright (c) Microsoft Corporation.  All rights reserved.

.\RabbitMQ.Stream.Client.dll does not represent a strongly named assembly
```

Actually do the signing correctly. Thanks for double-checking @Zerpet

Add `AltCoverStrongNameKey` to fix builds using AltCover
---
 .github/workflows/build-test.yaml                 |   2 +-
 Directory.Build.targets                           |   4 ++++
 Makefile                                          |   2 +-
 .../RabbitMQ.Stream.Client.csproj                 |   8 ++------
 Tests/Tests.csproj                                |   2 ++
 rabbit.snk                                        | Bin 0 -> 596 bytes
 6 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 rabbit.snk

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 4b469b16..ab14872a 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -79,6 +79,6 @@ jobs:
       - name: Verify
         run: dotnet format ./rabbitmq-stream-dotnet-client.sln --no-restore --verbosity=diagnostic --verify-no-changes
       - name: Test
-        run: dotnet test ./Build.csproj --no-build --logger "console;verbosity=detailed" /p:AltCover=true
+        run: dotnet test ./Build.csproj --no-build --logger "console;verbosity=detailed" /p:AltCover=true /p:AltCoverStrongNameKey=${{github.workspace}}/rabbit.snk
       - name: Upload code coverage to Codecov
         run: bash <(curl -s https://codecov.io/bash)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index bfd2b722..f13352d8 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,9 @@
 <!-- vim: set ft=xml: -->
 <Project>
+  <PropertyGroup>
+    <PublicKey>0024000004800000940000000602000000240000525341310004000001000100e5f75a5f3e8c9cf8151b55c3460da0f58823b3139dd0672f7aae5d875416c363cfdbee2d98a09ee53157213447a128893225a56871be16aba8aa57ac7ceb7824f03131c7c9028a8050660652b26ab7568eaeebf022948e496e00e35e01e5f56d67351278ec90b6c0bfc965610281e7bdf25b0c9e625fdde89f2ed5f3f5757bbc</PublicKey>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>    
+  </PropertyGroup>
   <ItemGroup>
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
   </ItemGroup>
diff --git a/Makefile b/Makefile
index 788b8838..712aa68a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ build:
 	dotnet build $(CURDIR)/Build.csproj
 
 test: build
-	dotnet test -c Debug $(CURDIR)/Tests/Tests.csproj --no-build --logger:"console;verbosity=detailed" /p:AltCover=true
+	dotnet test --configuration Debug $(CURDIR)/Tests/Tests.csproj --no-build --logger:"console;verbosity=detailed" /p:AltCover=true /p:AltCoverStrongNameKey=$(CURDIR)/rabbit.snk
 
 rabbitmq-server:
 	docker run -it --rm --name rabbitmq-stream-docker \
diff --git a/RabbitMQ.Stream.Client/RabbitMQ.Stream.Client.csproj b/RabbitMQ.Stream.Client/RabbitMQ.Stream.Client.csproj
index df82f82e..1eae6b17 100644
--- a/RabbitMQ.Stream.Client/RabbitMQ.Stream.Client.csproj
+++ b/RabbitMQ.Stream.Client/RabbitMQ.Stream.Client.csproj
@@ -16,6 +16,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageOutputPath>..\packages</PackageOutputPath>
     <RootNamespace>RabbitMQ.Stream.Client</RootNamespace>
+    <SignAssembly>True</SignAssembly>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <Title>RabbitMQ Stream Client Library for .NET</Title>
     <Copyright>Copyright (c) 2017-2023 Broadcom. All Rights Reserved. The term Broadcom refers to Broadcom Inc. and/or its subsidiaries.</Copyright>
@@ -28,12 +29,7 @@
     <None Remove="icon.png" />
     <Content Include="icon.png" PackagePath="icon.png" />
     <None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" Visible="false" PackagePath="" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-    <_Parameter1>Tests</_Parameter1>
-    </AssemblyAttribute>
+    <InternalsVisibleTo Include="Tests" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 5f563522..54d39454 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>
     <MinVerSkip>true</MinVerSkip>
     <Copyright>Copyright (c) 2017-2023 Broadcom. All Rights Reserved. The term Broadcom refers to Broadcom Inc. and/or its subsidiaries.</Copyright>
     <Authors>Broadcom</Authors>
     <Company>Broadcom Inc. and/or its subsidiaries.</Company>
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <SignAssembly>True</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/rabbit.snk b/rabbit.snk
new file mode 100644
index 0000000000000000000000000000000000000000..c50e96748514cdd8fa79c33d842cf823da201882
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098y_gY^*jGXut8&$(b4WRXiBeN5o&}T1t
zu3d*z7Q<uD+wLuxpq}M1S0OY<p(u$mC8cO_z80&fs#mOh>v$yaF)_!<0*Zi8W(HES
zYPVL7uIun3l#WSm0OMW(<@If6H4=F2khZ|T$z@>zf#<#QTMV9JU)|`RF4gn(b$h(C
zD-5>B-4fm|yL%IWAf&g1O2s#>Tu^63VCodtvcv8t*jm2|pGlf5HK)pU71TTI`#0bZ
z8d$8CBTF~jyL;{jBIuu0^RVF@!QpP1m*k7KK1G_y;ZrUHyVe#bf2T@_VuR+tMYoZ{
z^rwW1nYgG!N7ri=z!@`)e}-Wpi&M%4iu>)8qNfV7A0Rcs{XttMragqlOxf{LesaWy
zQ6MPtM}K#|Y05u~*lDIF(W4<tkdu>c&G`39s7H`Gg70`s8D%L|>&wzn7xSx*I0hIw
zJkA&asrX1gU(s1IBjv&t!|>H`T3aP9;;pd0uSs96W3$-@V9Jse02+B`?>AoJt;WVd
zVAznFlt<u?F%tu0`&cO^ge3+-gSqqnd|2Ac8pbq4)U7s|EZ-R7?YcwVs(3-E#XURU
zs17v9MPBLk%#!?joFOgcwxCAzjNI(+_ITMlooc*)4XM{ZfQ7%+rs1p8dpa{usQ}La
zPX+LK%B#}$5AyOP7vAiEPO6EOsA<RI#R@OA6V7sEUv^yTU;(`8{wtWkuC#u$Q$VxI
im@;r@pYMY|UhS`?;=<as!b|Q9BYf8kFh-GhI5CMS(J0yg

literal 0
HcmV?d00001