From d86305f67ffe110fffec749776388438f7e221f6 Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Mon, 7 Apr 2025 10:18:54 -0700
Subject: [PATCH] Ship OAuth2 client version 2

* Add separate project and solution to allow shipping project based on NuGet package reference.
---
 .../README.md                                 |   0
 .../RabbitMQ.Client.OAuth2.csproj             |  71 ++++++++++++++++++
 .../RabbitMQ.Client.OAuth2.sln                |  25 ++++++
 .../icon.png                                  | Bin
 .../RabbitMQ.Client.OAuth2.csproj             |  22 +-----
 5 files changed, 97 insertions(+), 21 deletions(-)
 rename projects/{RabbitMQ.Client.OAuth2 => RabbitMQ.Client.OAuth2-NuGet}/README.md (100%)
 create mode 100644 projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.csproj
 create mode 100644 projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.sln
 rename projects/{RabbitMQ.Client.OAuth2 => RabbitMQ.Client.OAuth2-NuGet}/icon.png (100%)

diff --git a/projects/RabbitMQ.Client.OAuth2/README.md b/projects/RabbitMQ.Client.OAuth2-NuGet/README.md
similarity index 100%
rename from projects/RabbitMQ.Client.OAuth2/README.md
rename to projects/RabbitMQ.Client.OAuth2-NuGet/README.md
diff --git a/projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.csproj b/projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.csproj
new file mode 100644
index 0000000000..788aaa355c
--- /dev/null
+++ b/projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.csproj
@@ -0,0 +1,71 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AssemblyTitle>RabbitMQ OAuth2 Client Library for .NET</AssemblyTitle>
+    <Authors>Broadcom</Authors>
+    <Company>Broadcom, Inc. and/or its subsidiaries.</Company>
+    <Copyright>Copyright (c) 2007-2025 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.</Copyright>
+    <Description>The RabbitMQ OAuth2 Client Library for .NET enables OAuth2 token refresh for RabbitMQ.Client</Description>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0 OR MPL-2.0</PackageLicenseExpression>
+    <PackageProjectUrl>https://www.rabbitmq.com/dotnet.html</PackageProjectUrl>
+    <PackageTags>rabbitmq, amqp, oauth2</PackageTags>
+    <Product>RabbitMQ</Product>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <RepositoryUrl>https://github.com/rabbitmq/rabbitmq-dotnet-client.git</RepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <IsPackable>true</IsPackable>
+    <MinVerTagPrefix>oauth2-</MinVerTagPrefix>
+    <MinVerVerbosity>normal</MinVerVerbosity>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageOutputPath>../../packages</PackageOutputPath>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <!--
+      https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
+      https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
+    -->
+    <LangVersion>12.0</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Deterministic>true</Deterministic>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)' == ''">
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="icon.png" />
+    <Content Include="icon.png" PackagePath="" />
+    <None Include="README.md" Pack="true" PackagePath="/" />
+    <Compile Include="..\RabbitMQ.Client.OAuth2\CredentialsRefresher.cs" Link="CredentialsRefresher.cs" />
+    <Compile Include="..\RabbitMQ.Client.OAuth2\CredentialsRefresherEventSource.cs" Link="CredentialsRefresherEventSource.cs" />
+    <Compile Include="..\RabbitMQ.Client.OAuth2\IOAuth2Client.cs" Link="IOAuth2Client.cs" />
+    <Compile Include="..\RabbitMQ.Client.OAuth2\OAuth2Client.cs" Link="OAuth2Client.cs" />
+    <Compile Include="..\RabbitMQ.Client.OAuth2\OAuth2CredentialsProvider.cs" Link="OAuth2CredentialsProvider.cs" />
+    <Compile Include="..\RabbitMQ.Client.OAuth2\Token.cs" Link="Token.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
+    <PackageReference Include="System.Net.Http.Json" Version="[8.0.1,)" />
+    <PackageReference Include="System.Text.Json" Version="[8.0.5,)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MinVer" Version="[6.0.0,)" />
+    <PackageReference Include="RabbitMQ.Client" Version="[7.0.0,)" />
+  </ItemGroup>
+
+</Project>
diff --git a/projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.sln b/projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.sln
new file mode 100644
index 0000000000..4cce705264
--- /dev/null
+++ b/projects/RabbitMQ.Client.OAuth2-NuGet/RabbitMQ.Client.OAuth2.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35913.81 d17.13
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.OAuth2", "RabbitMQ.Client.OAuth2.csproj", "{83E0877E-8286-444B-C7E9-636ACE8B6CD7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83E0877E-8286-444B-C7E9-636ACE8B6CD7}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7E5AE5F5-D9ED-4594-9333-86EE7DF4DC80}
+	EndGlobalSection
+EndGlobal
diff --git a/projects/RabbitMQ.Client.OAuth2/icon.png b/projects/RabbitMQ.Client.OAuth2-NuGet/icon.png
similarity index 100%
rename from projects/RabbitMQ.Client.OAuth2/icon.png
rename to projects/RabbitMQ.Client.OAuth2-NuGet/icon.png
diff --git a/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj b/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
index e262aa5ead..236a27d962 100644
--- a/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
+++ b/projects/RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj
@@ -17,16 +17,9 @@
     <Product>RabbitMQ</Product>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/rabbitmq/rabbitmq-dotnet-client.git</RepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <AssemblyOriginatorKeyFile>../rabbit.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <IsPackable>true</IsPackable>
-    <MinVerTagPrefix>oauth2-</MinVerTagPrefix>
-    <MinVerVerbosity>minimal</MinVerVerbosity>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageOutputPath>../../packages</PackageOutputPath>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <IsPackable>false</IsPackable>
     <!--
       https://learn.microsoft.com/en-us/answers/questions/1371494/for-net-standard-2-0-library-why-add-net-core-3-1
       https://devblogs.microsoft.com/dotnet/embracing-nullable-reference-types/#what-should-library-authors-do
@@ -35,20 +28,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release' And '$(CI)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <Deterministic>true</Deterministic>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(Configuration)' == 'Release' and '$(SourceRoot)' == ''">
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
-  </ItemGroup>
-
   <ItemGroup>
-    <None Remove="icon.png" />
-    <Content Include="icon.png" PackagePath="" />
-    <None Include="README.md" Pack="true" PackagePath="/" />
     <InternalsVisibleTo Include="Benchmarks" />
     <InternalsVisibleTo Include="OAuth2" />
   </ItemGroup>