Merge pull request #1625 from DuendeSoftware/joe/d-id

Host and Client build Fixes
DuendeSoftware · Nov 18, 2024 · 4c83776 · 4c83776
2 parents 6bd1494 + f8c90c0
commit 4c83776
Show file tree

Hide file tree

Showing 45 changed files with 67 additions and 67 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -68,14 +68,14 @@
         <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All"/>
 
         <!-- open telemetry -->
-        <PackageReference Update="OpenTelemetry" Version="1.8.1" />
-        <PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.8.1" />
-        <PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
-        <PackageReference Update="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-alpha.1" />
-        <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
-        <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
-        <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
-        <PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.8.0-beta.1" />
+        <PackageReference Update="OpenTelemetry" Version="1.10.0" />
+        <PackageReference Update="OpenTelemetry.Exporter.Console" Version="1.10.0" />
+        <PackageReference Update="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
+        <PackageReference Update="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.10.0-beta.1" />
+        <PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
+        <PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+        <PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+        <PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.9.0-beta.1" />
 
         <!-- Transitive Dependencies -->
         <!-- These packages are all transitive dependencies that would

diff --git a/clients/src/APIs/DPoPApi/DPoP/DPoPExtensions.cs b/clients/src/APIs/DPoPApi/DPoP/DPoPExtensions.cs
@@ -1,4 +1,4 @@
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IdentityModel.Tokens;

diff --git a/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs b/clients/src/APIs/DPoPApi/DPoP/DPoPJwtBearerEvents.cs
@@ -1,4 +1,4 @@
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;

diff --git a/clients/src/APIs/DPoPApi/DPoP/DPoPProofValidator.cs b/clients/src/APIs/DPoPApi/DPoP/DPoPProofValidator.cs
@@ -1,4 +1,4 @@
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

diff --git a/clients/src/ConsoleCibaClient/Program.cs b/clients/src/ConsoleCibaClient/Program.cs
@@ -1,6 +1,6 @@
 using Clients;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.IdentityModel.Tokens;
 using System;
 using System.Collections.Generic;

diff --git a/clients/src/ConsoleClientCredentialsFlow/Program.cs b/clients/src/ConsoleClientCredentialsFlow/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/Program.cs b/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleClientCredentialsFlowDPoP/Program.cs b/clients/src/ConsoleClientCredentialsFlowDPoP/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
 using System;

diff --git a/clients/src/ConsoleClientCredentialsFlowPostBody/Program.cs b/clients/src/ConsoleClientCredentialsFlowPostBody/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleCode/Program.cs b/clients/src/ConsoleCode/Program.cs
@@ -1,6 +1,6 @@
 using Clients;
-using IdentityModel.Client;
-using IdentityModel.OidcClient;
+using Duende.IdentityModel.Client;
+using Duende.IdentityModel.OidcClient;
 using Serilog;
 using System;
 using System.Net.Http;

diff --git a/clients/src/ConsoleCode/SystemBrowser.cs b/clients/src/ConsoleCode/SystemBrowser.cs
@@ -1,4 +1,4 @@
-using IdentityModel.OidcClient.Browser;
+using Duende.IdentityModel.OidcClient.Browser;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

diff --git a/clients/src/ConsoleCustomGrant/Program.cs b/clients/src/ConsoleCustomGrant/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleDcrClient/Program.cs b/clients/src/ConsoleDcrClient/Program.cs
@@ -2,7 +2,7 @@
 using System.Net.Http;
 using System.Text.Json;
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 
 

diff --git a/clients/src/ConsoleDeviceFlow/Program.cs b/clients/src/ConsoleDeviceFlow/Program.cs
@@ -1,6 +1,6 @@
 using Clients;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using System;
 using System.Diagnostics;
 using System.Net.Http;

diff --git a/clients/src/ConsoleEphemeralMtlsClient/Program.cs b/clients/src/ConsoleEphemeralMtlsClient/Program.cs
@@ -4,7 +4,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace ConsoleEphemeralMtlsClient
 {

diff --git a/clients/src/ConsoleIntrospectionClient/Program.cs b/clients/src/ConsoleIntrospectionClient/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Linq;
 using System.Net.Http;

diff --git a/clients/src/ConsoleMTLSClient/Program.cs b/clients/src/ConsoleMTLSClient/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Security.Cryptography.X509Certificates;

diff --git a/clients/src/ConsoleParameterizedScopeClient/Program.cs b/clients/src/ConsoleParameterizedScopeClient/Program.cs
@@ -2,7 +2,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace ConsoleParameterizedScopeClient
 {

diff --git a/clients/src/ConsolePrivateKeyJwtClient/Program.cs b/clients/src/ConsolePrivateKeyJwtClient/Program.cs
@@ -1,6 +1,6 @@
 using Clients;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.IdentityModel.Tokens;
 using System;
 using System.Collections.Generic;

diff --git a/clients/src/ConsoleResourceIndicators/Program.cs b/clients/src/ConsoleResourceIndicators/Program.cs
@@ -1,13 +1,13 @@
 using Clients;
-using IdentityModel.OidcClient;
+using Duende.IdentityModel.OidcClient;
 using Serilog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 
 namespace ConsoleResourceIndicators
 {

diff --git a/clients/src/ConsoleResourceIndicators/SystemBrowser.cs b/clients/src/ConsoleResourceIndicators/SystemBrowser.cs
@@ -1,4 +1,4 @@
-using IdentityModel.OidcClient.Browser;
+using Duende.IdentityModel.OidcClient.Browser;
 using System;
 using System.Diagnostics;
 using System.Net;

diff --git a/clients/src/ConsoleResourceOwnerFlow/Program.cs b/clients/src/ConsoleResourceOwnerFlow/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleResourceOwnerFlowPublic/Program.cs b/clients/src/ConsoleResourceOwnerFlowPublic/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleResourceOwnerFlowReference/Program.cs b/clients/src/ConsoleResourceOwnerFlowReference/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs b/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs
@@ -1,6 +1,6 @@
 using Clients;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Text;

diff --git a/clients/src/ConsoleResourceOwnerFlowUserInfo/Program.cs b/clients/src/ConsoleResourceOwnerFlowUserInfo/Program.cs
@@ -1,5 +1,5 @@
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;

diff --git a/clients/src/ConsoleScopesResources/Program.cs b/clients/src/ConsoleScopesResources/Program.cs
@@ -3,7 +3,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace ConsoleScopesResources
 {

diff --git a/clients/src/Constants/Constants.csproj b/clients/src/Constants/Constants.csproj
@@ -5,6 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" />
+    <PackageReference Include="Duende.IdentityModel" />
   </ItemGroup>
 </Project>
diff --git a/clients/src/Constants/TokenResponseExtensions.cs b/clients/src/Constants/TokenResponseExtensions.cs
@@ -1,5 +1,5 @@
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using System;
 using System.Text;
 using System.Text.Json;

diff --git a/clients/src/MvcCode/Controllers/HomeController.cs b/clients/src/MvcCode/Controllers/HomeController.cs
@@ -3,7 +3,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/clients/src/MvcCode/Startup.cs b/clients/src/MvcCode/Startup.cs
@@ -1,14 +1,14 @@
 using System;
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
 using System.IdentityModel.Tokens.Jwt;
 using System.Net.Http;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;

diff --git a/clients/src/MvcHybridBackChannel/Controllers/HomeController.cs b/clients/src/MvcHybridBackChannel/Controllers/HomeController.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using System.Net.Http;
 using Clients;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System.Globalization;
 
 namespace MvcHybrid.Controllers

diff --git a/clients/src/MvcHybridBackChannel/Controllers/LogoutController.cs b/clients/src/MvcHybridBackChannel/Controllers/LogoutController.cs
@@ -1,6 +1,6 @@
 using Clients;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/clients/src/MvcHybridBackChannel/Startup.cs b/clients/src/MvcHybridBackChannel/Startup.cs
@@ -2,12 +2,12 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using System.IdentityModel.Tokens.Jwt;
-using IdentityModel;
+using Duende.IdentityModel;
 using Clients;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using System.Net.Http;
 using Microsoft.Extensions.Configuration;
 using OpenTelemetry.Resources;

diff --git a/clients/src/MvcJarJwt/AssertionService.cs b/clients/src/MvcJarJwt/AssertionService.cs
@@ -3,7 +3,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 

diff --git a/clients/src/MvcJarJwt/ClientAssertionService.cs b/clients/src/MvcJarJwt/ClientAssertionService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Duende.AccessTokenManagement;
 
 namespace MvcJarJwt;

diff --git a/clients/src/MvcJarJwt/OidcEvents.cs b/clients/src/MvcJarJwt/OidcEvents.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
 namespace MvcJarJwt;

diff --git a/clients/src/MvcJarPar/AssertionService.cs b/clients/src/MvcJarPar/AssertionService.cs
@@ -3,7 +3,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 

diff --git a/clients/src/MvcJarPar/OidcEvents.cs b/clients/src/MvcJarPar/OidcEvents.cs
@@ -6,8 +6,8 @@
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
 namespace MvcJarPar;

diff --git a/clients/src/MvcJarUriJwt/AssertionService.cs b/clients/src/MvcJarUriJwt/AssertionService.cs
@@ -3,7 +3,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using Clients;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 

diff --git a/clients/src/MvcJarUriJwt/ClientAssertionService.cs b/clients/src/MvcJarUriJwt/ClientAssertionService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using IdentityModel;
-using IdentityModel.Client;
+using Duende.IdentityModel;
+using Duende.IdentityModel.Client;
 using Duende.AccessTokenManagement;
 
 namespace MvcJarUriJwt;

diff --git a/clients/src/MvcJarUriJwt/OidcEvents.cs b/clients/src/MvcJarUriJwt/OidcEvents.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using IdentityModel;
+using Duende.IdentityModel;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
 namespace MvcJarUriJwt;

diff --git a/clients/src/MvcPar/ParOidcEvents.cs b/clients/src/MvcPar/ParOidcEvents.cs
@@ -5,7 +5,7 @@
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;

diff --git a/clients/src/MvcPar/Startup.cs b/clients/src/MvcPar/Startup.cs
@@ -5,7 +5,7 @@
 using Microsoft.IdentityModel.Tokens;
 using System;
 using Microsoft.Extensions.Configuration;
-using IdentityModel.Client;
+using Duende.IdentityModel.Client;
 
 namespace MvcPar
 {