diff --git a/IdentityServer/v7/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj b/IdentityServer/v7/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj index 48f0d0b9..596c8081 100644 --- a/IdentityServer/v7/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj +++ b/IdentityServer/v7/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v7/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj b/IdentityServer/v7/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj index 50a12dcd..89f723a4 100644 --- a/IdentityServer/v7/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj +++ b/IdentityServer/v7/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v7/AspNetIdentityPasskeys/global.json b/IdentityServer/v7/AspNetIdentityPasskeys/global.json deleted file mode 100644 index 93dd0dd1..00000000 --- a/IdentityServer/v7/AspNetIdentityPasskeys/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "10.0.0", - "rollForward": "latestMinor", - "allowPrerelease": true - } -} \ No newline at end of file diff --git a/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj b/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj index 9d1cdbb7..dee1a258 100644 --- a/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj +++ b/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj b/IdentityServer/v7/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj index 3230450b..e2646820 100644 --- a/IdentityServer/v7/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj +++ b/IdentityServer/v7/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj index 32ecfd57..e8cf09b3 100644 --- a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj +++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj index 9d1cdbb7..dee1a258 100644 --- a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj b/IdentityServer/v7/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj index 24b935cc..b911191d 100644 --- a/IdentityServer/v7/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj +++ b/IdentityServer/v7/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj b/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj index 9d1cdbb7..dee1a258 100644 --- a/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj +++ b/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj b/IdentityServer/v7/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj index 24b935cc..b911191d 100644 --- a/IdentityServer/v7/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj +++ b/IdentityServer/v7/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj index 24b935cc..b911191d 100644 --- a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v7/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj b/IdentityServer/v7/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v7/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj +++ b/IdentityServer/v7/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj b/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj +++ b/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj b/IdentityServer/v7/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v7/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj +++ b/IdentityServer/v7/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj b/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj +++ b/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/DPoP/DPoP.AppHost/DPoP.AppHost.csproj b/IdentityServer/v7/DPoP/DPoP.AppHost/DPoP.AppHost.csproj index fcbf3b3b..03c7aa82 100644 --- a/IdentityServer/v7/DPoP/DPoP.AppHost/DPoP.AppHost.csproj +++ b/IdentityServer/v7/DPoP/DPoP.AppHost/DPoP.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj index df9d4578..0528f816 100644 --- a/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj +++ b/IdentityServer/v7/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj @@ -1,6 +1,6 @@ - + Exe diff --git a/IdentityServer/v7/Directory.Packages.props b/IdentityServer/v7/Directory.Packages.props index 1367afdb..86e8191d 100644 --- a/IdentityServer/v7/Directory.Packages.props +++ b/IdentityServer/v7/Directory.Packages.props @@ -4,7 +4,7 @@ true - + diff --git a/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj b/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj index fbb1dd4c..8171b2fa 100644 --- a/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj +++ b/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj b/IdentityServer/v7/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj index f1e88f47..85897e90 100644 --- a/IdentityServer/v7/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj +++ b/IdentityServer/v7/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/PAT/PAT.AppHost/PAT.AppHost.csproj b/IdentityServer/v7/PAT/PAT.AppHost/PAT.AppHost.csproj index 6620df83..bd049a84 100644 --- a/IdentityServer/v7/PAT/PAT.AppHost/PAT.AppHost.csproj +++ b/IdentityServer/v7/PAT/PAT.AppHost/PAT.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj b/IdentityServer/v7/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v7/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj +++ b/IdentityServer/v7/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj b/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj index 299ad745..a5f4d380 100644 --- a/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj +++ b/IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj b/IdentityServer/v7/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj index 2de1777a..0df7eda1 100644 --- a/IdentityServer/v7/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj +++ b/IdentityServer/v7/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj b/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj index e5ffe706..b3140119 100644 --- a/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj +++ b/IdentityServer/v7/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj index f9ee1c85..67f570ce 100644 --- a/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs index 23343d6b..e166b581 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs @@ -8,7 +8,8 @@ { var projectMetadata = idsvr.Resource.GetProjectMetadata(); var projectPath = projectMetadata.ProjectPath; - var process = new System.Diagnostics.Process + + using var process = new System.Diagnostics.Process { StartInfo = new System.Diagnostics.ProcessStartInfo { @@ -22,7 +23,19 @@ }; process.Start(); - await process.WaitForExitAsync(context.CancellationToken); + + var outputTask = process.StandardOutput.ReadToEndAsync(); + var errorTask = process.StandardError.ReadToEndAsync(); + + try + { + await process.WaitForExitAsync(context.CancellationToken); + } + catch (OperationCanceledException) + { + process.Kill(entireProcessTree: true); + throw; + } if (process.ExitCode == 0) { @@ -30,7 +43,12 @@ } else { - var error = await process.StandardError.ReadToEndAsync(); + var error = await errorTask; + if (string.IsNullOrWhiteSpace(error)) + { + error = await outputTask; + } + return CommandResults.Failure(error); } }, diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj index b01d1567..65c834a8 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v7/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj b/IdentityServer/v7/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj index 967d8ff8..64024547 100644 --- a/IdentityServer/v7/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj b/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj b/IdentityServer/v7/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj index e9967e60..9498f52a 100644 --- a/IdentityServer/v7/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj b/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj +++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v7/global.json b/IdentityServer/v7/global.json index 6a288505..9ba75da8 100755 --- a/IdentityServer/v7/global.json +++ b/IdentityServer/v7/global.json @@ -1,7 +1,10 @@ { "sdk": { "version": "10.0.100", - "rollForward": "latestMajor", + "rollForward": "latestMinor", "allowPrerelease": false + }, + "msbuild-sdks": { + "Aspire.AppHost.Sdk": "13.2.3" } } diff --git a/IdentityServer/v8/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj b/IdentityServer/v8/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj index 48f0d0b9..596c8081 100644 --- a/IdentityServer/v8/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj +++ b/IdentityServer/v8/AspNetIdentity/AspNetIdentity.AppHost/AspNetIdentity.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj b/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj index 50a12dcd..89f723a4 100644 --- a/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj +++ b/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.AppHost/AspNetIdentityPasskeys.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v8/AspNetIdentityPasskeys/global.json b/IdentityServer/v8/AspNetIdentityPasskeys/global.json deleted file mode 100644 index 93dd0dd1..00000000 --- a/IdentityServer/v8/AspNetIdentityPasskeys/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "10.0.0", - "rollForward": "latestMinor", - "allowPrerelease": true - } -} \ No newline at end of file diff --git a/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj b/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj index 9d1cdbb7..dee1a258 100644 --- a/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj +++ b/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.AppHost/ClientCredentials.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj b/IdentityServer/v8/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj index 3230450b..e2646820 100644 --- a/IdentityServer/v8/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj +++ b/IdentityServer/v8/Basics/Introspection/Introspection.AppHost/Introspection.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj index 32ecfd57..e8cf09b3 100644 --- a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj +++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.AppHost/JwtBasedClientAuthentication.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj index 9d1cdbb7..dee1a258 100644 --- a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj b/IdentityServer/v8/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj index 24b935cc..b911191d 100644 --- a/IdentityServer/v8/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj +++ b/IdentityServer/v8/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj b/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj index 9d1cdbb7..dee1a258 100644 --- a/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj +++ b/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.AppHost/MvcJarJwt.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj b/IdentityServer/v8/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj index 24b935cc..b911191d 100644 --- a/IdentityServer/v8/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj +++ b/IdentityServer/v8/Basics/MvcPar/MvcPar.AppHost/MvcPar.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj index 24b935cc..b911191d 100644 --- a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v8/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj b/IdentityServer/v8/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v8/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj +++ b/IdentityServer/v8/Configuration/Permissions/Permissions.AppHost/Permissions.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj b/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj +++ b/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.AppHost/PipelineRegistration.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj b/IdentityServer/v8/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v8/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj +++ b/IdentityServer/v8/Configuration/SimpleDcr/SimpleDcr.AppHost/SimpleDcr.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj b/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj index 34970118..3d29cf32 100644 --- a/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj +++ b/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.AppHost/SoftwareStatement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/DPoP/DPoP.AppHost/DPoP.AppHost.csproj b/IdentityServer/v8/DPoP/DPoP.AppHost/DPoP.AppHost.csproj index fcbf3b3b..03c7aa82 100644 --- a/IdentityServer/v8/DPoP/DPoP.AppHost/DPoP.AppHost.csproj +++ b/IdentityServer/v8/DPoP/DPoP.AppHost/DPoP.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj b/IdentityServer/v8/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj index 54dd981e..0528f816 100644 --- a/IdentityServer/v8/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj +++ b/IdentityServer/v8/Diagnostics/Aspire/Aspire.AppHost/Aspire.AppHost.csproj @@ -1,6 +1,6 @@ - + Exe diff --git a/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj b/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj index fbb1dd4c..8171b2fa 100644 --- a/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj +++ b/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj b/IdentityServer/v8/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj index f1e88f47..85897e90 100644 --- a/IdentityServer/v8/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj +++ b/IdentityServer/v8/McpDemo/McpDemo.AppHost/McpDemo.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/PAT/PAT.AppHost/PAT.AppHost.csproj b/IdentityServer/v8/PAT/PAT.AppHost/PAT.AppHost.csproj index 6620df83..bd049a84 100644 --- a/IdentityServer/v8/PAT/PAT.AppHost/PAT.AppHost.csproj +++ b/IdentityServer/v8/PAT/PAT.AppHost/PAT.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj b/IdentityServer/v8/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v8/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj +++ b/IdentityServer/v8/ScopesAndResources/ScopesAndResources.AppHost/ScopesAndResources.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj b/IdentityServer/v8/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj index bc5bad99..60a08730 100644 --- a/IdentityServer/v8/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj +++ b/IdentityServer/v8/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj b/IdentityServer/v8/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj index 2de1777a..0df7eda1 100644 --- a/IdentityServer/v8/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj +++ b/IdentityServer/v8/SessionMigration/SessionMigration.AppHost/SessionMigration.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj b/IdentityServer/v8/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj index 23ae9243..b3140119 100644 --- a/IdentityServer/v8/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj +++ b/IdentityServer/v8/TokenExchange/TokenExchange.AppHost/TokenExchange.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj index c6e46ffd..0c3ac206 100644 --- a/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj index c1f2bcf1..65c834a8 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe net10.0 diff --git a/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj b/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj index 967d8ff8..64024547 100644 --- a/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.AppHost/ProfileService.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj b/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.AppHost/SpaLoginUi.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj b/IdentityServer/v8/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj index 0a5c3f50..9727d705 100644 --- a/IdentityServer/v8/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/StepUp/StepUp.AppHost/StepUp.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj b/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.AppHost/WindowsAuthentication.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj b/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj index 8355969e..3202e34c 100644 --- a/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj +++ b/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.AppHost/WsFederationDynamicProviders.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/IdentityServer/v8/global.json b/IdentityServer/v8/global.json index 6a288505..9ba75da8 100755 --- a/IdentityServer/v8/global.json +++ b/IdentityServer/v8/global.json @@ -1,7 +1,10 @@ { "sdk": { "version": "10.0.100", - "rollForward": "latestMajor", + "rollForward": "latestMinor", "allowPrerelease": false + }, + "msbuild-sdks": { + "Aspire.AppHost.Sdk": "13.2.3" } } diff --git a/samples.slnx b/samples.slnx index a3e32555..4dd0498c 100644 --- a/samples.slnx +++ b/samples.slnx @@ -182,6 +182,7 @@ + @@ -415,6 +416,7 @@ +