DuendeArchive · josephdecock · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# MacOS
+.DS_Store
+
 # Rider
 .idea
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0'">
-        <FrameworkVersion>8.0.3</FrameworkVersion>
+        <FrameworkVersion>8.0.1</FrameworkVersion>
         <ExtensionsVersion>8.0.0</ExtensionsVersion>
         <WilsonVersion>7.1.2</WilsonVersion>
-        <IdentityServerVersion>7.0.5</IdentityServerVersion>
+        <IdentityServerVersion>7.0.6</IdentityServerVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/README.md b/README.md
@@ -1,4 +1,25 @@
-# Duende.AccessTokenManagement
-Automatic access token management for machine to machine and user-centric OAuth and OIDC flows
+## About Duende.AccessTokenManagement
+This is the repository for a set of .NET libraries that manage OAuth and OpenId
+Connect access tokens. These tools automatically acquire new tokens when old
+tokens are about to expire, provide conveniences for using the current token
+with HTTP clients, and can revoke tokens that are no longer needed.
 
-[Documentation](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/wiki)
+## Packages
+The libraries in this repository are distributed as NuGet packages.
+
+- [Duende.AccessTokenManagement](https://www.nuget.org/packages/Duende.AccessTokenManagement) manages tokens acquired in machine-to-machine flows in 
+[.NET workers](https://learn.microsoft.com/en-us/dotnet/core/extensions/workers) and [ASP.NET worker services](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/host/hosted-services).
+- [Duende.AccessTokenManagement.OpenIdConnect](https://www.nuget.org/packages/Duende.AccessTokenManagement.OpenIdConnect)
+manages tokens acquired in user-centric flows in [ASP.NET Core](https://dotnet.microsoft.com/en-us/apps/aspnet)
+applications.
+
+## Documentation
+Documentation is available [here](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/wiki).
+
+## License and Feedback
+Duende.AccessTokenManagement is released as open source under the 
+[Apache 2.0 license](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/blob/main/LICENSE). 
+[Bug reports, feature requests](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/issues) and 
+[contributions](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/pulls) are welcome. 
+If you have an idea for a new feature or significant code change you'd like to propose, please start with a 
+GitHub issue so that we can discuss it. Thanks in advance!
diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.3" />
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/samples/Web/Web.csproj b/samples/Web/Web.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.3" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/WebJarJwt/WebJarJwt.csproj b/samples/WebJarJwt/WebJarJwt.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.3" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Worker/Worker.csproj b/samples/Worker/Worker.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.1.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/WorkerDI/WorkerDI.csproj b/samples/WorkerDI/WorkerDI.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.1.2" />
   </ItemGroup>
 

diff --git a/...nde.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj b/...nde.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj
@@ -4,11 +4,15 @@
         <TargetFrameworks>net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
+        <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageId>Duende.AccessTokenManagement.OpenIdConnect</PackageId>
         <Description>Automatic access token management for interactive OpenIdConnect-based ASP.NET Core applications</Description>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath=""/>
+    </ItemGroup>
+
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
 

diff --git a/src/Duende.AccessTokenManagement.OpenIdConnect/README.md b/src/Duende.AccessTokenManagement.OpenIdConnect/README.md
@@ -0,0 +1,20 @@
+## About Duende.AccessTokenManagement.OpenIdConnect
+Duende.AccessTokenManagement.OpenIdConnect is a .NET library that manages OpenId
+Connect access tokens in [ASP.NET Core](https://dotnet.microsoft.com/en-us/apps/aspnet)
+applications. It will acquire new tokens when old tokens are about to expire, provides conveniences to 
+automatically use the current token with HTTP clients, and can revoke refresh tokens that are no longer needed.
+
+## Documentation
+Documentation is available [here](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/wiki/web-applications).
+
+## Related Packages
+- Foundational library for claims-based identity, OAuth 2.0 and OpenId Connect: [IdentityModel](https://www.nuget.org/packages/IdentityModel)
+- Token management for machine-to-machine workflows in .NET workers: [Duende.AccessTokenManagement](https://www.nuget.org/packages/Duende.AccessTokenManagement)
+
+## License and Feedback
+Duende.AccessTokenManagement.OpenIdConnect is released as open source under the 
+[Apache 2.0 license](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/blob/main/LICENSE). 
+[Bug reports, feature requests](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/issues) and 
+[contributions](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/pulls) are welcome. 
+If you have an idea for a new feature or significant code change you'd like to propose, please start with a 
+GitHub issue so that we can discuss it. Thanks in advance!
diff --git a/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj b/src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj
@@ -4,12 +4,15 @@
         <TargetFrameworks>net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
+        <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageId>Duende.AccessTokenManagement</PackageId>
         <Description>Automatic access token management for OAuth client credential flows</Description>
     </PropertyGroup>
 
-
+    <ItemGroup>
+        <None Include="README.md" Pack="true" PackagePath=""/>
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="IdentityModel" Version="7.0.0" />
 

diff --git a/src/Duende.AccessTokenManagement/README.md b/src/Duende.AccessTokenManagement/README.md
@@ -0,0 +1,23 @@
+## About Duende.AccessTokenManagement
+Duende.AccessTokenManagement is a .NET library that manages OAuth
+access tokens in [.NET workers](https://learn.microsoft.com/en-us/dotnet/core/extensions/workers) 
+and [ASP.NET worker services](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/host/hosted-services).
+It will acquire new tokens when old tokens are about to expire and provides conveniences to 
+automatically use the current token with HTTP clients.
+
+## Documentation
+Documentation is available [here](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/wiki).
+
+## Related Packages
+- Foundational library for claims-based identity, OAuth 2.0 and OpenId Connect: [IdentityModel](https://www.nuget.org/packages/IdentityModel)
+- Token management for user-centric flows in [ASP.NET Core](https://dotnet.microsoft.com/en-us/apps/aspnet)
+applications: [Duende.AccessTokenManagement.OpenIdConnect](https://www.nuget.org/packages/Duende.AccessTokenManagement.OpenIdConnect)
+
+## License and Feedback
+Duende.AccessTokenManagement is released as open source under the 
+[Apache 2.0 license](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/blob/main/LICENSE). 
+[Bug reports, feature requests](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/issues) and 
+[contributions](https://github.com/DuendeSoftware/Duende.AccessTokenManagement/pulls) are welcome. 
+If you have an idea for a new feature or significant code change you'd like to propose, please start with a 
+GitHub issue so that we can discuss it. Thanks in advance!
+
diff --git a/test/Tests/Tests.csproj b/test/Tests/Tests.csproj
@@ -17,8 +17,8 @@
         <PackageReference Include="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
 
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="xunit" Version="2.8.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
@@ -29,7 +29,18 @@
 
         <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
         <PackageReference Include="Shouldly" Version="4.2.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <!-- TODO - Replace CsQuery with AngleSharp -->
         <PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
+
+        <!-- TODO - The rest of the packages in this group are transitive
+        dependencies of CsQuery. We should remove them when we replace CsQuery
+        with AngleSharp. -->
+        <PackageReference Include="Microsoft.NETCore.Jit" Version="1.1.13" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2"/>
     </ItemGroup>
 
     <ItemGroup>
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    # MacOS
+    .DS_Store
     # Rider
     .idea
@@ Expand Down @@