Merge branch 'main' into ev/solution-filters-2

DuendeSoftware · Feb 7, 2025 · 70edb66 · 70edb66
2 parents 29a9633 + 8c115b5
commit 70edb66
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 33 deletions.
diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs
@@ -351,7 +351,7 @@ public static void StepTest(this Job job, string solution)
             .Name("Test report")
             .WorkingDirectory("test")
             .Uses("dorny/test-reporter@31a54ee7ebcacc03a09ea97a7e5465a47b84aea5") // v1.9.1
-            .If("success() || failure()")
+            .If("github.event == 'push' && (success() || failure())")
             .With(
                 ("name", "Test Report"),
                 ("path", "**/Tests.trx"),

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -34,6 +34,7 @@
     <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="3.1.1" />
     <PackageVersion Include="Duende.AspNetCore.Authentication.JwtBearer" Version="0.1.3" />
     <PackageVersion Include="Duende.IdentityModel" Version="7.0.0" />
+    <PackageVersion Include="Duende.IdentityModel.OidcClient" Version="6.0.0-rc.1" />
     <PackageVersion Include="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
     <PackageVersion Include="FluentAssertions" Version="6.5.1" />
     <PackageVersion Include="FluentAssertions.Web" Version="1.5.0" />

diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...sFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/...sFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...rver/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj b/...rver/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...ents/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/...ents/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 

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

diff --git a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <OutputType>Exe</OutputType>
     </PropertyGroup>

diff --git a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/...server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleResourceIndicators/SystemBrowser.cs b/identity-server/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/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...y-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/...y-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...er/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/...er/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...ents/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/...ents/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/...rver/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/...rver/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;</TargetFrameworks>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 

diff --git a/identity-server/clients/src/JsOidc/JsOidc.csproj b/identity-server/clients/src/JsOidc/JsOidc.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/MvcCode/MvcCode.csproj b/identity-server/clients/src/MvcCode/MvcCode.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0</TargetFrameworks>
         <UserSecretsId>fe28de52-854d-4c0f-a6b5-20f8dea1f70d</UserSecretsId>
     </PropertyGroup>
 

diff --git a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net9.0;</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>