Skip to content

Commit c6ad6b0

Browse files
committed
Merge pull request #779 from rabbitmq/rabbitmq-dotnet-client-768
Generate assembly attributes using MinVer and csproj (cherry picked from commit ca93809)
1 parent bcfc454 commit c6ad6b0

File tree

3 files changed

+28
-68
lines changed

3 files changed

+28
-68
lines changed

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

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<Description>The RabbitMQ .NET client is the official client library for C# (and, implicitly, other .NET languages)</Description>
4-
<VersionPrefix>5.2.0</VersionPrefix>
55
<TargetFrameworks>net451;netstandard1.5;netstandard2.0</TargetFrameworks>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8+
<AssemblyTitle>RabbitMQ Client Library for .NET</AssemblyTitle>
9+
<Authors>VMware</Authors>
10+
<Company>VMware, Inc. or its affiliates.</Company>
11+
<Copyright>Copyright © 2007-2020 VMware, Inc. or its affiliates.</Copyright>
12+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
813
<GenerateDocumentationFile>true</GenerateDocumentationFile>
914
<AssemblyName>RabbitMQ.Client</AssemblyName>
1015
<PackageId>RabbitMQ.Client</PackageId>
1116
<PackageTags>RabbitMQ</PackageTags>
1217
<PackageIconUrl>https://en.gravatar.com/userimage/10048884/0ea8846e080980f705da081be53599ce.png?size=100</PackageIconUrl>
1318
<PackageProjectUrl>http://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
14-
<PackageLicenseUrl>http://www.rabbitmq.com/dotnet.html</PackageLicenseUrl>
1519
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
16-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
17-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
18-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
19-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
20-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
21-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
22-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
20+
<PackageIcon>icon.png</PackageIcon>
21+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
22+
<PackageProjectUrl>https://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
23+
<PackageTags>rabbitmq, amqp</PackageTags>
24+
<Product>RabbitMQ</Product>
2325
<PublishRepositoryUrl>true</PublishRepositoryUrl>
24-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2526
<IncludeSymbols>true</IncludeSymbols>
2627
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2728
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
2829
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
2930
<SignAssembly>true</SignAssembly>
31+
<MinVerTagPrefix>v</MinVerTagPrefix>
32+
<MinVerVerbosity>detailed</MinVerVerbosity>
33+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
34+
<PackageOutputPath>..\..\..\packages</PackageOutputPath>
3035
</PropertyGroup>
31-
<ItemGroup>
32-
<Compile Remove="build\**\*" />
33-
<Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" Exclude="build\**\*;bin\**;obj\**;**\*.xproj;packages\**" />
34-
</ItemGroup>
3536

3637
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
3738
<PackageReference Include="Microsoft.Diagnostics.Tracing.EventSource.Redist" Version="1.1.*" />
@@ -42,6 +43,17 @@
4243
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'netstandard2.0' ">
4344
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
4445
</PropertyGroup>
46+
47+
<ItemGroup>
48+
<Compile Include="..\..\..\gensrc\autogenerated-api-0-9-1.cs" />
49+
<None Remove="icon.png" />
50+
<Content Include="icon.png" PackagePath="" />
51+
<None Include="..\..\..\LICENSE" Pack="true" PackagePath="" />
52+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
53+
<_Parameter1>Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
54+
</AssemblyAttribute>
55+
</ItemGroup>
56+
4557
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
4658
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
4759
<PackageReference Include="System.Console" Version="4.3.0" />
@@ -65,5 +77,7 @@
6577
<ItemGroup>
6678
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
6779
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
80+
<PackageReference Include="MinVer" Version="2.2.0" PrivateAssets="All" />
6881
</ItemGroup>
82+
6983
</Project>
369 Bytes
Loading

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

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

0 commit comments

Comments
 (0)