Skip to content

Commit 89cee61

Browse files
lukebakkenlukebakken
committed
Ship OAuth2 client version 2
* Add separate project and solution to allow shipping project based on NuGet package reference.
1 parent 970d36d commit 89cee61

File tree

5 files changed

+96
-21
lines changed

5 files changed

+96
-21
lines changed

‎projects/RabbitMQ.Client.OAuth2/README.md ‎projects/RabbitMQ.Client.OAuth2-NuGet/README.md

File renamed without changes.

‎projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.csproj

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
5+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
6+
<NoWarn>$(NoWarn);CS1591</NoWarn>
7+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8+
<AssemblyTitle>RabbitMQ OAuth2 Client Library for .NET</AssemblyTitle>
9+
<Authors>Broadcom</Authors>
10+
<Company>Broadcom, Inc. and/or its subsidiaries.</Company>
11+
<Copyright>Copyright (c) 2007-2025 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.</Copyright>
12+
<Description>The RabbitMQ OAuth2 Client Library for .NET enables OAuth2 token refresh for RabbitMQ.Client</Description>
13+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
<PackageIcon>icon.png</PackageIcon>
15+
<PackageLicenseExpression>Apache-2.0 OR MPL-2.0</PackageLicenseExpression>
16+
<PackageProjectUrl>https://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
17+
<PackageTags>rabbitmq, amqp, oauth2</PackageTags>
18+
<Product>RabbitMQ</Product>
19+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20+
<RepositoryUrl>https://github.com/rabbitmq/rabbitmq-dotnet-client.git</RepositoryUrl>
21+
<IncludeSymbols>true</IncludeSymbols>
22+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
23+
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
24+
<SignAssembly>true</SignAssembly>
25+
<IsPackable>true</IsPackable>
26+
<MinVerTagPrefix>oauth2-</MinVerTagPrefix>
27+
<MinVerVerbosity>minimal</MinVerVerbosity>
28+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
29+
<PackageOutputPath>../../packages</PackageOutputPath>
30+
<PackageReadmeFile>README.md</PackageReadmeFile>
31+
<!--
32+
https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
33+
https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
34+
-->
35+
<LangVersion>12.0</LangVersion>
36+
<Nullable>enable</Nullable>
37+
</PropertyGroup>
38+
39+
<PropertyGroup Condition="'$(Configuration)' == 'Release' And '$(CI)' == 'true'">
40+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
41+
<Deterministic>true</Deterministic>
42+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
43+
</PropertyGroup>
44+
45+
<ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)' == ''">
46+
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
47+
</ItemGroup>
48+
49+
<ItemGroup>
50+
<None Remove="icon.png" />
51+
<Content Include="icon.png" PackagePath="" />
52+
<None Include="README.md" Pack="true" PackagePath="/" />
53+
<Compile Include="..\RabbitMQ.Client.OAuth2\CredentialsRefresher.cs" Link="CredentialsRefresher.cs" />
54+
<Compile Include="..\RabbitMQ.Client.OAuth2\CredentialsRefresherEventSource.cs" Link="CredentialsRefresherEventSource.cs" />
55+
<Compile Include="..\RabbitMQ.Client.OAuth2\IOAuth2Client.cs" Link="IOAuth2Client.cs" />
56+
<Compile Include="..\RabbitMQ.Client.OAuth2\OAuth2Client.cs" Link="OAuth2Client.cs" />
57+
<Compile Include="..\RabbitMQ.Client.OAuth2\OAuth2CredentialsProvider.cs" Link="OAuth2CredentialsProvider.cs" />
58+
<Compile Include="..\RabbitMQ.Client.OAuth2\Token.cs" Link="Token.cs" />
59+
</ItemGroup>
60+
61+
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
62+
<PackageReference Include="System.Net.Http.Json" Version="[8.0.1,)" />
63+
<PackageReference Include="System.Text.Json" Version="[8.0.5,)" />
64+
</ItemGroup>
65+
66+
<ItemGroup>
67+
<PackageReference Include="RabbitMQ.Client" Version="[7.0.0,)" />
68+
</ItemGroup>
69+
70+
</Project>

‎projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.sln

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.13.35913.81 d17.13
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.OAuth2", "RabbitMQ.Client.OAuth2.csproj", "{83E0877E-8286-444B-C7E9-636ACE8B6CD7}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {7E5AE5F5-D9ED-4594-9333-86EE7DF4DC80}
24+
EndGlobalSection
25+
EndGlobal

‎projects/RabbitMQ.Client.OAuth2/icon.png ‎projects/RabbitMQ.Client.OAuth2-NuGet/icon.png

File renamed without changes.

‎projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj

+1-21
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,9 @@
1717
<Product>RabbitMQ</Product>
1818
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1919
<RepositoryUrl>https://github.com/rabbitmq/rabbitmq-dotnet-client.git</RepositoryUrl>
20-
<IncludeSymbols>true</IncludeSymbols>
21-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2220
<AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
2321
<SignAssembly>true</SignAssembly>
24-
<IsPackable>true</IsPackable>
25-
<MinVerTagPrefix>oauth2-</MinVerTagPrefix>
26-
<MinVerVerbosity>minimal</MinVerVerbosity>
27-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
28-
<PackageOutputPath>../../packages</PackageOutputPath>
29-
<PackageReadmeFile>README.md</PackageReadmeFile>
22+
<IsPackable>false</IsPackable>
3023
<!--
3124
https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
3225
https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
@@ -35,20 +28,7 @@
3528
<Nullable>enable</Nullable>
3629
</PropertyGroup>
3730

38-
<PropertyGroup Condition="'$(Configuration)' == 'Release' And '$(CI)' == 'true'">
39-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
40-
<Deterministic>true</Deterministic>
41-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
42-
</PropertyGroup>
43-
44-
<ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)' == ''">
45-
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
46-
</ItemGroup>
47-
4831
<ItemGroup>
49-
<None Remove="icon.png" />
50-
<Content Include="icon.png" PackagePath="" />
51-
<None Include="README.md" Pack="true" PackagePath="/" />
5232
<InternalsVisibleTo Include="Benchmarks" />
5333
<InternalsVisibleTo Include="OAuth2" />
5434
</ItemGroup>

0 commit comments

Comments
 (0)