Skip to content

Commit 03c4627

Browse files
committed
Generate assembly attributes using MinVer and csproj
Fixes #768
1 parent 1186f3f commit 03c4627

File tree

4 files changed

+24
-64
lines changed

4 files changed

+24
-64
lines changed
Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<VersionPrefix>6.0.0</VersionPrefix>
54
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);CS1591</NoWarn>
76
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
<PackageTags>RabbitMQ</PackageTags>
10-
<PackageIcon>icon.png</PackageIcon>
11-
<PackageProjectUrl>https://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
12-
<PackageLicense>https://www.rabbitmq.com/dotnet.html</PackageLicense>
137
<AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
14-
<Description>The RabbitMQ .NET client is the official client library for C# (and, implicitly, other .NET languages)</Description>
8+
<Authors>VMware</Authors>
159
<Company>VMware, Inc. or its affiliates.</Company>
16-
<Product>RabbitMQ</Product>
1710
<Copyright>Copyright © 2007-2020 VMware, Inc. or its affiliates.</Copyright>
11+
<Description>The RabbitMQ .NET client is the official client library for C# (and, implicitly, other .NET languages)</Description>
12+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
13+
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
1814
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
15+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
16+
<PackageIcon>icon.png</PackageIcon>
17+
<PackageLicense>https://www.rabbitmq.com/dotnet.html</PackageLicense>
18+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
19+
<PackageProjectUrl>https://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
20+
<PackageTags>rabbitmq, amqp</PackageTags>
21+
<Product>RabbitMQ</Product>
1922
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
23+
<RepositoryUrl>https://github.com/rabbitmq/rabbitmq-dotnet-client</RepositoryUrl>
24+
<RepositoryType>Git</RepositoryType>
2125
<IncludeSymbols>true</IncludeSymbols>
2226
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2327
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
2428
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
2529
<SignAssembly>true</SignAssembly>
30+
<MinVerTagPrefix>v</MinVerTagPrefix>
31+
<MinVerVerbosity>minimal</MinVerVerbosity>
32+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
33+
<Copyright>Copyright © 2007-2020 VMware, Inc. or its affiliates.</Copyright>
2634
</PropertyGroup>
27-
2835
<ItemGroup>
2936
<Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
3337
<None Remove="icon.png" />
3438
<Content Include="icon.png" PackagePath="" />
35-
</ItemGroup>
36-
37-
<ItemGroup>
39+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
40+
<_Parameter1>Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
41+
</AssemblyAttribute>
3842
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
3943
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
44+
<PackageReference Include="MinVer" Version="2.2.0">
45+
<PrivateAssets>all</PrivateAssets>
46+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
47+
</PackageReference>
4048
<PackageReference Include="System.Memory" Version="4.5.3" />
4149
</ItemGroup>
42-
4350
</Project>
-1.25 KB
Loading

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

projects/client/RabbitMQ.Client/src/util/BlockingCell.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class BlockingCell<T>
5757
{
5858
private readonly ManualResetEventSlim _manualResetEventSlim = new ManualResetEventSlim(false);
5959
private T _value = default;
60-
public EventHandler<T> ContinueUsingValue;
6160

6261
public void ContinueWithValue(T value)
6362
{
@@ -84,7 +83,6 @@ public T WaitForValue(TimeSpan timeout)
8483
{
8584
if (_manualResetEventSlim.Wait(timeout))
8685
{
87-
ContinueUsingValue?.Invoke(this, _value);
8886
return _value;
8987
}
9088
throw new TimeoutException();

0 commit comments

Comments
 (0)