Skip to content

Commit 41d8459

Browse files
lukebakkenlukebakken
committed
Merge pull request #746 from rabbitmq/rabbitmq-dotnet-client-745
Always sign builds (cherry picked from commit 20cc528)
1 parent 99fadd4 commit 41d8459

File tree

10 files changed

+17
-106
lines changed

10 files changed

+17
-106
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ TestResult.xml
2222
.paket/paket.exe
2323
/paket-files/*
2424
/NuGet
25-
rabbit-mock.snk
2625
.vscode/
2726
*.lock.json
2827

@@ -124,4 +123,3 @@ projects/client/Unit*/TestResult.xml
124123
# Vim
125124
.sw?
126125
.*.sw?
127-
rabbit.snk

‎RabbitMQDotNetClient.sln‎

Lines changed: 9 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -13,77 +13,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
.editorconfig = .editorconfig
1414
EndProjectSection
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RabbitMQ.Client", "projects\client\RabbitMQ.Client\RabbitMQ.Client.csproj", "{8C554257-5ECC-45DB-873D-560BFBB74EC8}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit", "projects\client\Unit\Unit.csproj", "{B8FAC024-CC03-4067-9FFC-02846FB8AE48}"
1919
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apigen", "projects\client\Apigen\Apigen.csproj", "{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}"
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unit.WinRT", "projects\client\Unit.WinRT\Unit.WinRT.csproj", "{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2626
Debug|Any CPU = Debug|Any CPU
27-
Debug|x64 = Debug|x64
28-
Debug|x86 = Debug|x86
29-
DebugNoTest|Any CPU = DebugNoTest|Any CPU
30-
DebugNoTest|x64 = DebugNoTest|x64
31-
DebugNoTest|x86 = DebugNoTest|x86
3227
Release|Any CPU = Release|Any CPU
33-
Release|x64 = Release|x64
34-
Release|x86 = Release|x86
35-
SignedRelease|Any CPU = SignedRelease|Any CPU
36-
SignedRelease|x64 = SignedRelease|x64
37-
SignedRelease|x86 = SignedRelease|x86
3828
EndGlobalSection
3929
GlobalSection(ProjectConfigurationPlatforms) = postSolution
4030
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4131
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x64.ActiveCfg = Debug|Any CPU
43-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x64.Build.0 = Debug|Any CPU
44-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x86.ActiveCfg = Debug|Any CPU
45-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Debug|x86.Build.0 = Debug|Any CPU
46-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
47-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
48-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
49-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x64.Build.0 = Debug|Any CPU
50-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
51-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.DebugNoTest|x86.Build.0 = Debug|Any CPU
52-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
53-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x64.ActiveCfg = Release|Any CPU
55-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x64.Build.0 = Release|Any CPU
56-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x86.ActiveCfg = Release|Any CPU
57-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|x86.Build.0 = Release|Any CPU
58-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
59-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
60-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x64.ActiveCfg = Release|Any CPU
61-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x64.Build.0 = Release|Any CPU
62-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x86.ActiveCfg = Release|Any CPU
63-
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.SignedRelease|x86.Build.0 = Release|Any CPU
32+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
33+
{8C554257-5ECC-45DB-873D-560BFBB74EC8}.Release|Any CPU.Build.0 = Debug|Any CPU
6434
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6535
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|Any CPU.Build.0 = Debug|Any CPU
66-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x64.ActiveCfg = Debug|Any CPU
67-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x64.Build.0 = Debug|Any CPU
68-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x86.ActiveCfg = Debug|Any CPU
69-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Debug|x86.Build.0 = Debug|Any CPU
70-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
71-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
72-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x64.Build.0 = Debug|Any CPU
73-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
74-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.DebugNoTest|x86.Build.0 = Debug|Any CPU
75-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.ActiveCfg = Release|Any CPU
76-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x64.ActiveCfg = Release|Any CPU
78-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x64.Build.0 = Release|Any CPU
79-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x86.ActiveCfg = Release|Any CPU
80-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|x86.Build.0 = Release|Any CPU
81-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
82-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
83-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x64.ActiveCfg = Release|Any CPU
84-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x64.Build.0 = Release|Any CPU
85-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x86.ActiveCfg = Release|Any CPU
86-
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.SignedRelease|x86.Build.0 = Release|Any CPU
36+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.ActiveCfg = Debug|Any CPU
37+
{B8FAC024-CC03-4067-9FFC-02846FB8AE48}.Release|Any CPU.Build.0 = Debug|Any CPU
8738
{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8839
{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|Any CPU.Build.0 = Debug|Any CPU
8940
{9534956B-60D5-49BA-8179-1382D4E64349}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -110,28 +61,8 @@ Global
11061
{9534956B-60D5-49BA-8179-1382D4E64349}.SignedRelease|x86.Build.0 = Release|Any CPU
11162
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
11263
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
113-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x64.ActiveCfg = Debug|Any CPU
114-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x64.Build.0 = Debug|Any CPU
115-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x86.ActiveCfg = Debug|Any CPU
116-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Debug|x86.Build.0 = Debug|Any CPU
117-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
118-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
119-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x64.ActiveCfg = Debug|Any CPU
120-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x64.Build.0 = Debug|Any CPU
121-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x86.ActiveCfg = Debug|Any CPU
122-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.DebugNoTest|x86.Build.0 = Debug|Any CPU
123-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
124-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.Build.0 = Release|Any CPU
125-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x64.ActiveCfg = Release|Any CPU
126-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x64.Build.0 = Release|Any CPU
127-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x86.ActiveCfg = Release|Any CPU
128-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|x86.Build.0 = Release|Any CPU
129-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|Any CPU.ActiveCfg = Release|Any CPU
130-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|Any CPU.Build.0 = Release|Any CPU
131-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x64.ActiveCfg = Release|Any CPU
132-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x64.Build.0 = Release|Any CPU
133-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x86.ActiveCfg = Release|Any CPU
134-
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.SignedRelease|x86.Build.0 = Release|Any CPU
64+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.ActiveCfg = Debug|Any CPU
65+
{B416DDB7-5E3E-4A20-B5A9-C6E518E203A2}.Release|Any CPU.Build.0 = Debug|Any CPU
13566
{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13667
{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
13768
{D59E9DCD-EED6-4DFC-9FC7-11D56FF021F0}.Debug|x64.ActiveCfg = Debug|Any CPU

‎appveyor.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,13 @@ skip_tags: true
66
skip_branch_with_pr: true
77
image: Visual Studio 2019
88

9-
environment:
10-
SNKSECRET:
11-
secure: C8FL0UTKVN8YcMW1wdssabbkSWMIrpJTqgUNeI2NfQw=
12-
139
cache:
1410
# Note: this must match the $rabbitmq_installer_path and $erlang_installer_path values in
1511
# tools\appveyor\install.ps1
1612
- "%HOMEDRIVE%%HOMEPATH%\\rabbitmq-server-3.8.2.exe"
1713
- "%HOMEDRIVE%%HOMEPATH%\\otp_win64_22.2.exe"
1814

1915
install:
20-
- IF DEFINED SNKSECRET (nuget install secure-file -ExcludeVersion)
21-
- IF DEFINED SNKSECRET (secure-file\tools\secure-file -decrypt %APPVEYOR_BUILD_FOLDER%\rabbit.snk.enc -secret %SNKSECRET%) ELSE (ECHO This Is A Pull Request Build)
22-
- IF NOT DEFINED SNKSECRET (copy "rabbit.snk.prbuilds" "rabbit.snk") ELSE (ECHO Using The Release Key File)
2316
- ps: .\tools\appveyor\install.ps1
2417

2518
build_script:

‎projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<IncludeSymbols>true</IncludeSymbols>
2626
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2727
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28+
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
29+
<SignAssembly>true</SignAssembly>
2830
</PropertyGroup>
2931
<ItemGroup>
3032
<Compile Remove="build\**\*" />
@@ -40,13 +42,6 @@
4042
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'netstandard2.0' ">
4143
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
4244
</PropertyGroup>
43-
<PropertyGroup Condition=" '$(Configuration)' == 'SignedRelease' ">
44-
<DelaySign>true</DelaySign>
45-
<OutputType>Library</OutputType>
46-
<Optimize>true</Optimize>
47-
<AssemblyOriginatorKeyFile>../../../rabbit.snk</AssemblyOriginatorKeyFile>
48-
<SignAssembly>true</SignAssembly>
49-
</PropertyGroup>
5045
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
5146
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
5247
<PackageReference Include="System.Console" Version="4.3.0" />
@@ -71,14 +66,4 @@
7166
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
7267
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
7368
</ItemGroup>
74-
<ItemGroup Condition=" '$(Configuration)' == 'SignedRelease' ">
75-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
76-
<_Parameter1>Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
77-
</AssemblyAttribute>
78-
</ItemGroup>
79-
<ItemGroup Condition=" '$(Configuration)' != 'SignedRelease' ">
80-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
81-
<_Parameter1>Unit</_Parameter1>
82-
</AssemblyAttribute>
83-
</ItemGroup>
8469
</Project>

‎projects/client/RabbitMQ.Client/src/client/properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
//---------------------------------------------------------------------------
4040

4141
using System.Reflection;
42+
using System.Runtime.CompilerServices;
4243

4344
[assembly: AssemblyTitle("RabbitMQ Client Library for .NET")]
4445
[assembly: AssemblyDescription("See http://rabbitmq.com")]
@@ -49,4 +50,5 @@
4950
[assembly: AssemblyTrademark("")]
5051
[assembly: AssemblyCulture("")]
5152

52-
[assembly: AssemblyVersion("4.0.0")]
53+
[assembly: AssemblyVersion("4.0.0")]
54+
[assembly: InternalsVisibleTo("Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]

‎projects/client/Unit/Unit.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1111
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1212
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
13+
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
14+
<SignAssembly>true</SignAssembly>
1315
</PropertyGroup>
1416
<ItemGroup>
1517
<ProjectReference Include="../RabbitMQ.Client/RabbitMQ.Client.csproj" />

‎projects/client/Unit/src/unit/APIApproval.Approve.approved.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Unit")]
1+
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]
22
namespace RabbitMQ.Client
33
{
44
public class AmqpTcpEndpoint

‎projects/client/rabbit.snk‎

596 Bytes
Binary file not shown.

‎rabbit.snk.enc‎

-608 Bytes
Binary file not shown.

‎rabbit.snk.prbuilds‎

-596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)