From 951c6deba5e2b03d82411fdcb0816d3e16dfe173 Mon Sep 17 00:00:00 2001 From: Roland Guijt Date: Thu, 30 Apr 2026 14:53:03 +0200 Subject: [PATCH] Aspire for MvcBackChannelLogout sample --- .../MvcBackChannelLogout.AppHost/AppHost.cs | 11 ++++++ .../MvcBackChannelLogout.AppHost.csproj | 20 +++++++++++ .../Properties/launchSettings.json | 27 +++++++++++++++ .../appsettings.development.json | 9 +++++ .../appsettings.json | 9 +++++ .../MvcBackChannelLogout.sln | 34 ++++++++++--------- .../MvcBackChannelLogout/src/Client.csproj | 4 +++ .../MvcBackChannelLogout/src/Program.cs | 5 +++ .../v7/Basics/MvcPar/src/Client.csproj | 1 - .../v7/Basics/MvcPar/src/Program.cs | 8 ----- .../MvcBackChannelLogout.AppHost/AppHost.cs | 11 ++++++ .../MvcBackChannelLogout.AppHost.csproj | 20 +++++++++++ .../Properties/launchSettings.json | 27 +++++++++++++++ .../appsettings.development.json | 9 +++++ .../appsettings.json | 9 +++++ .../MvcBackChannelLogout.sln | 34 ++++++++++--------- .../MvcBackChannelLogout/src/Client.csproj | 4 +++ .../MvcBackChannelLogout/src/Program.cs | 5 +++ .../v8/Basics/MvcPar/src/Client.csproj | 1 - .../v8/Basics/MvcPar/src/Program.cs | 8 ----- samples.slnx | 2 ++ 21 files changed, 208 insertions(+), 50 deletions(-) create mode 100644 IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs create mode 100644 IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj create mode 100644 IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json create mode 100644 IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json create mode 100644 IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json create mode 100644 IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs create mode 100644 IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj create mode 100644 IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json create mode 100644 IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json create mode 100644 IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs new file mode 100644 index 00000000..38888efa --- /dev/null +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs @@ -0,0 +1,11 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var idp = builder.AddProject("identityserverhost"); + +builder.AddProject("simple-api") + .WaitFor(idp); + +builder.AddProject("client") + .WaitFor(idp); + +builder.Build().Run(); diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj new file mode 100644 index 00000000..9d1cdbb7 --- /dev/null +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj @@ -0,0 +1,20 @@ + + + + Exe + net10.0 + enable + enable + + + + + + + + + + + + + diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..79e7ad7e --- /dev/null +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15236", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:21136", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:22136" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17236;http://localhost:15236", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21136", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22136" + } + } + } +} diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.DistributedApplication": "Information" + } + } +} diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.DistributedApplication": "Information" + } + } +} diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln index 753cac24..3e2fe507 100755 --- a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{131A8C1E-C9F0-46FA-9B44-C234E2173429}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBackChannelLogout.AppHost", "MvcBackChannelLogout.AppHost\MvcBackChannelLogout.AppHost.csproj", "{D91E7A1F-6907-4441-ADBD-21F5130699D8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -18,22 +22,7 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.Build.0 = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.Build.0 = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.Build.0 = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.ActiveCfg = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU {62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -70,7 +59,20 @@ Global {131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x64.Build.0 = Release|Any CPU {131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x86.ActiveCfg = Release|Any CPU {131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x86.Build.0 = Release|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Debug|x64.ActiveCfg = Debug|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Debug|x64.Build.0 = Debug|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Debug|x86.ActiveCfg = Debug|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Debug|x86.Build.0 = Debug|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|Any CPU.Build.0 = Release|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x64.ActiveCfg = Release|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x64.Build.0 = Release|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x86.ActiveCfg = Release|Any CPU + {D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(NestedProjects) = preSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj index 6c0b9db9..419e86ff 100755 --- a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj @@ -9,6 +9,10 @@ + + + + diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Program.cs b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Program.cs index 151eb0ff..7ee7bde7 100755 --- a/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Program.cs +++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/src/Program.cs @@ -6,10 +6,13 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); + builder.Services.AddControllersWithViews(); builder.Services.AddHttpClient(); @@ -62,6 +65,8 @@ var app = builder.Build(); +app.MapDefaultEndpoints(); + app.UseDeveloperExceptionPage(); app.UseStaticFiles(); diff --git a/IdentityServer/v7/Basics/MvcPar/src/Client.csproj b/IdentityServer/v7/Basics/MvcPar/src/Client.csproj index ae97200d..fe6b0b91 100644 --- a/IdentityServer/v7/Basics/MvcPar/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcPar/src/Client.csproj @@ -8,7 +8,6 @@ - diff --git a/IdentityServer/v7/Basics/MvcPar/src/Program.cs b/IdentityServer/v7/Basics/MvcPar/src/Program.cs index a36802a7..208739d5 100644 --- a/IdentityServer/v7/Basics/MvcPar/src/Program.cs +++ b/IdentityServer/v7/Basics/MvcPar/src/Program.cs @@ -9,19 +9,11 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using Serilog; Console.Title = "MvcPar"; -Log.Logger = new LoggerConfiguration() - .MinimumLevel.Information() - .Enrich.FromLogContext() - .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}") - .CreateLogger(); - var builder = WebApplication.CreateBuilder(args); -builder.Services.AddSerilog(); builder.Services.AddTransient(); builder.Services.AddSingleton(_ => new DiscoveryCache(Urls.IdentityServer)); diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs new file mode 100644 index 00000000..38888efa --- /dev/null +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/AppHost.cs @@ -0,0 +1,11 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var idp = builder.AddProject("identityserverhost"); + +builder.AddProject("simple-api") + .WaitFor(idp); + +builder.AddProject("client") + .WaitFor(idp); + +builder.Build().Run(); diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj new file mode 100644 index 00000000..9d1cdbb7 --- /dev/null +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/MvcBackChannelLogout.AppHost.csproj @@ -0,0 +1,20 @@ + + + + Exe + net10.0 + enable + enable + + + + + + + + + + + + + diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..69a2a867 --- /dev/null +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15235", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:21135", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:22135" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17235;http://localhost:15235", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21135", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22135" + } + } + } +} diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.development.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.DistributedApplication": "Information" + } + } +} diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.DistributedApplication": "Information" + } + } +} diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln index 753cac24..c9f9bd80 100755 --- a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..\IdentityServerHost\src\IdentityServerHost.csproj", "{131A8C1E-C9F0-46FA-9B44-C234E2173429}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBackChannelLogout.AppHost", "MvcBackChannelLogout.AppHost\MvcBackChannelLogout.AppHost.csproj", "{282D6679-D2C7-4259-9734-7C911D391B21}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -18,22 +22,7 @@ Global Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.Build.0 = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.Build.0 = Debug|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.Build.0 = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.ActiveCfg = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU - {1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU {62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -70,7 +59,20 @@ Global {131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x64.Build.0 = Release|Any CPU {131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x86.ActiveCfg = Release|Any CPU {131A8C1E-C9F0-46FA-9B44-C234E2173429}.Release|x86.Build.0 = Release|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Debug|x64.ActiveCfg = Debug|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Debug|x64.Build.0 = Debug|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Debug|x86.ActiveCfg = Debug|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Debug|x86.Build.0 = Debug|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Release|Any CPU.Build.0 = Release|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Release|x64.ActiveCfg = Release|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Release|x64.Build.0 = Release|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Release|x86.ActiveCfg = Release|Any CPU + {282D6679-D2C7-4259-9734-7C911D391B21}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(NestedProjects) = preSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Client.csproj b/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Client.csproj index 6c0b9db9..419e86ff 100755 --- a/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Client.csproj +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Client.csproj @@ -9,6 +9,10 @@ + + + + diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Program.cs b/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Program.cs index 151eb0ff..7ee7bde7 100755 --- a/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Program.cs +++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/src/Program.cs @@ -6,10 +6,13 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); + builder.Services.AddControllersWithViews(); builder.Services.AddHttpClient(); @@ -62,6 +65,8 @@ var app = builder.Build(); +app.MapDefaultEndpoints(); + app.UseDeveloperExceptionPage(); app.UseStaticFiles(); diff --git a/IdentityServer/v8/Basics/MvcPar/src/Client.csproj b/IdentityServer/v8/Basics/MvcPar/src/Client.csproj index c5f829e1..313610da 100644 --- a/IdentityServer/v8/Basics/MvcPar/src/Client.csproj +++ b/IdentityServer/v8/Basics/MvcPar/src/Client.csproj @@ -8,7 +8,6 @@ - diff --git a/IdentityServer/v8/Basics/MvcPar/src/Program.cs b/IdentityServer/v8/Basics/MvcPar/src/Program.cs index a36802a7..208739d5 100644 --- a/IdentityServer/v8/Basics/MvcPar/src/Program.cs +++ b/IdentityServer/v8/Basics/MvcPar/src/Program.cs @@ -9,19 +9,11 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; -using Serilog; Console.Title = "MvcPar"; -Log.Logger = new LoggerConfiguration() - .MinimumLevel.Information() - .Enrich.FromLogContext() - .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}") - .CreateLogger(); - var builder = WebApplication.CreateBuilder(args); -builder.Services.AddSerilog(); builder.Services.AddTransient(); builder.Services.AddSingleton(_ => new DiscoveryCache(Urls.IdentityServer)); diff --git a/samples.slnx b/samples.slnx index e455363d..38f0a973 100644 --- a/samples.slnx +++ b/samples.slnx @@ -214,6 +214,7 @@ + @@ -439,6 +440,7 @@ +