Merge pull request #397 from SergeySvirsky/poc/ext-logging

use Ext.Logging.Abstraction instead of Ext.Logging

Author: brockallen

clients/ConsoleClientWithBrowser/Program.cs

@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Serilog.Sinks.SystemConsole.Themes;
 
 namespace ConsoleClientWithBrowser
@@ -54,7 +55,7 @@ private static async Task SignIn()
                 .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
                 .CreateLogger();
 
-            options.LoggerFactory.AddSerilog(serilog);
+            options.LoggerFactory = new LoggerFactory().AddSerilog(serilog);
 
             _oidcClient = new OidcClient(options);
             var result = await _oidcClient.LoginAsync(new LoginRequest());

clients/ConsoleClientWithBrowserAndDPoP/Program.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Serilog.Sinks.SystemConsole.Themes;
 using IdentityModel.OidcClient.DPoP;
+using Microsoft.Extensions.Logging;
 
 namespace ConsoleClientWithBrowserAndDPoP
 {
@@ -57,7 +58,7 @@ private static async Task SignIn()
                 .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
                 .CreateLogger();
 
-            options.LoggerFactory.AddSerilog(serilog);
+            options.LoggerFactory = new LoggerFactory().AddSerilog(serilog);
 
             _oidcClient = new OidcClient(options);
 

src/DPoP/DPoP.csproj

@@ -44,7 +44,7 @@
         <PackageReference Include="minver" Version="4.3.0" PrivateAssets="All" />
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.0" />
 
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 

src/IdentityTokenValidator/IdentityTokenValidator.csproj

@@ -39,7 +39,7 @@
         <PackageReference Include="minver" Version="4.3.0" PrivateAssets="All" />
 
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.30.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 

src/OidcClient/OidcClient.csproj

@@ -45,7 +45,7 @@
     <PackageReference Include="IdentityModel" Version="6.2.0" />
     <PackageReference Include="minver" Version="4.3.0" PrivateAssets="All" />
 
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 

src/OidcClient/OidcClientOptions.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text.Json.Serialization;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace IdentityModel.OidcClient
 {
@@ -212,7 +213,7 @@ public class OidcClientOptions
         /// The logger factory.
         /// </value>
         [JsonIgnore]
-        public ILoggerFactory LoggerFactory { get; set; } = new LoggerFactory();
+        public ILoggerFactory LoggerFactory { get; set; } = new NullLoggerFactory();
 
         /// <summary>
         /// Gets or sets the identity token validator.

test/JwtValidationTests/JwtValidationTests.csproj

@@ -20,5 +20,6 @@
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="FluentAssertions" Version="5.10.2" />
+        <PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
     </ItemGroup>
 </Project>

test/OidcClient.Tests/OidcClient.Tests.csproj

@@ -19,6 +19,7 @@
         <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.12.0"/>
 
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>
+        <PackageReference Include="Microsoft.Extensions.Primitives" Version="8.0.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
         <PackageReference Include="xunit" Version="2.4.1"/>
         <PackageReference Include="FluentAssertions" Version="5.10.3"/>