diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj index 57fd075f..d4a81f4e 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Client.csproj @@ -6,6 +6,9 @@ + + + diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Program.cs b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Program.cs index 3a09bffd..5ea654e0 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Program.cs +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/Client/Program.cs @@ -8,6 +8,7 @@ Console.Title = "Client"; var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); builder.Services.AddControllersWithViews(); @@ -62,6 +63,7 @@ app.UseAuthentication(); app.UseAuthorization(); +app.MapDefaultEndpoints(); app.MapDefaultControllerRoute().RequireAuthorization(); app.Run(); diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/DynamicProviders.sln b/IdentityServer/v7/UserInteraction/DynamicProviders/DynamicProviders.sln index 23351b16..a0ebf397 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/DynamicProviders.sln +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/DynamicProviders.sln @@ -7,6 +7,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "Ident EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{85CD36E8-3402-443B-859A-72E4B9390E8B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.AppHost", "IdentityServer.AppHost\IdentityServer.AppHost.csproj", "{E8BA4D90-0AF7-4FA3-9F0D-5A11D98C0640}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{4259ED99-4121-4E62-83C5-CC0699BC389A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +25,14 @@ Global {85CD36E8-3402-443B-859A-72E4B9390E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU {85CD36E8-3402-443B-859A-72E4B9390E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU {85CD36E8-3402-443B-859A-72E4B9390E8B}.Release|Any CPU.Build.0 = Release|Any CPU + {E8BA4D90-0AF7-4FA3-9F0D-5A11D98C0640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8BA4D90-0AF7-4FA3-9F0D-5A11D98C0640}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8BA4D90-0AF7-4FA3-9F0D-5A11D98C0640}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8BA4D90-0AF7-4FA3-9F0D-5A11D98C0640}.Release|Any CPU.Build.0 = Release|Any CPU + {4259ED99-4121-4E62-83C5-CC0699BC389A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4259ED99-4121-4E62-83C5-CC0699BC389A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4259ED99-4121-4E62-83C5-CC0699BC389A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4259ED99-4121-4E62-83C5-CC0699BC389A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs new file mode 100644 index 00000000..5b807133 --- /dev/null +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs @@ -0,0 +1,5 @@ +var builder = DistributedApplication.CreateBuilder(args); +var idsvr = builder.AddProject("identityserverhost"); +builder.AddProject("client") + .WaitFor(idsvr); +builder.Build().Run(); diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj new file mode 100644 index 00000000..b01d1567 --- /dev/null +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -0,0 +1,13 @@ + + + Exe + net10.0 + enable + enable + + + + + + + diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/Properties/launchSettings.json b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..a0d9737d --- /dev/null +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/Properties/launchSettings.json @@ -0,0 +1,31 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17196;http://localhost:15048", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21100", + "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23036", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22230" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15048", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19122", + "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18210", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20059" + } + } + } +} diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.Development.json b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.json b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.json new file mode 100644 index 00000000..31c092aa --- /dev/null +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj index 5d565a15..e49e6421 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj @@ -5,10 +5,11 @@ enable + + + - - diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs index 07ee7cc4..f39afe37 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs @@ -5,16 +5,9 @@ using IdentityServerHost; using Microsoft.AspNetCore.DataProtection; using Microsoft.EntityFrameworkCore; -using Serilog; -using Serilog.Sinks.SystemConsole.Themes; Console.Title = "IdentityServer"; -Log.Logger = new LoggerConfiguration() - .MinimumLevel.Information() - .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code) - .CreateLogger(); - var seed = args.Contains("/seed"); if (seed) { @@ -22,8 +15,7 @@ } var builder = WebApplication.CreateBuilder(args); - -builder.Services.AddSerilog(); +builder.AddServiceDefaults(); builder.Services.AddRazorPages(); @@ -31,19 +23,14 @@ if (seed) { - Log.Information("Seeding database..."); + Console.WriteLine("Seeding database..."); SeedData.EnsureSeedData(connectionString); - Log.Information("Done seeding database."); + Console.WriteLine("Done seeding database."); return; } builder.Services.AddIdentityServer(options => { - options.Events.RaiseErrorEvents = true; - options.Events.RaiseInformationEvents = true; - options.Events.RaiseFailureEvents = true; - options.Events.RaiseSuccessEvents = true; - // see https://docs.duendesoftware.com/identityserver/fundamentals/resources options.EmitStaticAudienceClaim = true; @@ -106,6 +93,7 @@ app.UseRouting(); app.UseIdentityServer(); app.UseAuthorization(); +app.MapDefaultEndpoints(); app.MapRazorPages(); app.Run(); diff --git a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs index fe67b4b5..5c8783b2 100644 --- a/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs +++ b/IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs @@ -6,7 +6,6 @@ using Duende.IdentityServer.EntityFramework.Storage; using Duende.IdentityServer.Models; using Microsoft.EntityFrameworkCore; -using Serilog; namespace IdentityServerHost; @@ -40,7 +39,7 @@ private static void EnsureSeedData(ConfigurationDbContext context) { if (!context.Clients.Any()) { - Log.Debug("Clients being populated"); + Console.WriteLine("Clients being populated"); foreach (var client in Config.Clients.ToList()) { context.Clients.Add(client.ToEntity()); @@ -49,12 +48,12 @@ private static void EnsureSeedData(ConfigurationDbContext context) } else { - Log.Debug("Clients already populated"); + Console.WriteLine("Clients already populated"); } if (!context.IdentityResources.Any()) { - Log.Debug("IdentityResources being populated"); + Console.WriteLine("IdentityResources being populated"); foreach (var resource in Config.IdentityResources.ToList()) { context.IdentityResources.Add(resource.ToEntity()); @@ -63,12 +62,12 @@ private static void EnsureSeedData(ConfigurationDbContext context) } else { - Log.Debug("IdentityResources already populated"); + Console.WriteLine("IdentityResources already populated"); } if (!context.ApiScopes.Any()) { - Log.Debug("ApiScopes being populated"); + Console.WriteLine("ApiScopes being populated"); foreach (var apiScope in Config.ApiScopes.ToList()) { context.ApiScopes.Add(apiScope.ToEntity()); @@ -77,7 +76,7 @@ private static void EnsureSeedData(ConfigurationDbContext context) } else { - Log.Debug("ApiScopes already populated"); + Console.WriteLine("ApiScopes already populated"); } if (!context.IdentityProviders.Any()) diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Client.csproj b/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Client.csproj index 57fd075f..c17435c3 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Client.csproj +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Client.csproj @@ -2,9 +2,13 @@ net10.0 - enable + enable + + + + diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Program.cs b/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Program.cs index 3a09bffd..5ea654e0 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Program.cs +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/Client/Program.cs @@ -8,6 +8,7 @@ Console.Title = "Client"; var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); builder.Services.AddControllersWithViews(); @@ -62,6 +63,7 @@ app.UseAuthentication(); app.UseAuthorization(); +app.MapDefaultEndpoints(); app.MapDefaultControllerRoute().RequireAuthorization(); app.Run(); diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln b/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln index 23351b16..6996ad47 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln @@ -7,6 +7,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "Ident EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{85CD36E8-3402-443B-859A-72E4B9390E8B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.AppHost", "IdentityServer.AppHost\IdentityServer.AppHost.csproj", "{721009DF-B8CB-42BB-8E97-6AF070D9F4DB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{48840739-F37C-4710-B254-9E3BF8B564A8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +25,14 @@ Global {85CD36E8-3402-443B-859A-72E4B9390E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU {85CD36E8-3402-443B-859A-72E4B9390E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU {85CD36E8-3402-443B-859A-72E4B9390E8B}.Release|Any CPU.Build.0 = Release|Any CPU + {721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Release|Any CPU.Build.0 = Release|Any CPU + {48840739-F37C-4710-B254-9E3BF8B564A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48840739-F37C-4710-B254-9E3BF8B564A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48840739-F37C-4710-B254-9E3BF8B564A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48840739-F37C-4710-B254-9E3BF8B564A8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs new file mode 100644 index 00000000..e0bce95a --- /dev/null +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/AppHost.cs @@ -0,0 +1,8 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var idsvr = builder.AddProject("identityserverhost"); + +builder.AddProject("client") + .WaitFor(idsvr); + +builder.Build().Run(); diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj new file mode 100644 index 00000000..c1f2bcf1 --- /dev/null +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/IdentityServer.AppHost.csproj @@ -0,0 +1,13 @@ + + + Exe + net10.0 + enable + enable + + + + + + + diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/Properties/launchSettings.json b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..ef8f5eec --- /dev/null +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/Properties/launchSettings.json @@ -0,0 +1,31 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17197;http://localhost:15148", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21120", + "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23015", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22043" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15148", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19107", + "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18254", + "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20078" + } + } + } +} diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.Development.json b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.json b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.json new file mode 100644 index 00000000..31c092aa --- /dev/null +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServer.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj index 67d15d25..74da49a6 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/IdentityServerHost.csproj @@ -5,10 +5,12 @@ enable + + + + - - diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs index 07ee7cc4..f39afe37 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/Program.cs @@ -5,16 +5,9 @@ using IdentityServerHost; using Microsoft.AspNetCore.DataProtection; using Microsoft.EntityFrameworkCore; -using Serilog; -using Serilog.Sinks.SystemConsole.Themes; Console.Title = "IdentityServer"; -Log.Logger = new LoggerConfiguration() - .MinimumLevel.Information() - .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code) - .CreateLogger(); - var seed = args.Contains("/seed"); if (seed) { @@ -22,8 +15,7 @@ } var builder = WebApplication.CreateBuilder(args); - -builder.Services.AddSerilog(); +builder.AddServiceDefaults(); builder.Services.AddRazorPages(); @@ -31,19 +23,14 @@ if (seed) { - Log.Information("Seeding database..."); + Console.WriteLine("Seeding database..."); SeedData.EnsureSeedData(connectionString); - Log.Information("Done seeding database."); + Console.WriteLine("Done seeding database."); return; } builder.Services.AddIdentityServer(options => { - options.Events.RaiseErrorEvents = true; - options.Events.RaiseInformationEvents = true; - options.Events.RaiseFailureEvents = true; - options.Events.RaiseSuccessEvents = true; - // see https://docs.duendesoftware.com/identityserver/fundamentals/resources options.EmitStaticAudienceClaim = true; @@ -106,6 +93,7 @@ app.UseRouting(); app.UseIdentityServer(); app.UseAuthorization(); +app.MapDefaultEndpoints(); app.MapRazorPages(); app.Run(); diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs index fe67b4b5..5c8783b2 100644 --- a/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs +++ b/IdentityServer/v8/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs @@ -6,7 +6,6 @@ using Duende.IdentityServer.EntityFramework.Storage; using Duende.IdentityServer.Models; using Microsoft.EntityFrameworkCore; -using Serilog; namespace IdentityServerHost; @@ -40,7 +39,7 @@ private static void EnsureSeedData(ConfigurationDbContext context) { if (!context.Clients.Any()) { - Log.Debug("Clients being populated"); + Console.WriteLine("Clients being populated"); foreach (var client in Config.Clients.ToList()) { context.Clients.Add(client.ToEntity()); @@ -49,12 +48,12 @@ private static void EnsureSeedData(ConfigurationDbContext context) } else { - Log.Debug("Clients already populated"); + Console.WriteLine("Clients already populated"); } if (!context.IdentityResources.Any()) { - Log.Debug("IdentityResources being populated"); + Console.WriteLine("IdentityResources being populated"); foreach (var resource in Config.IdentityResources.ToList()) { context.IdentityResources.Add(resource.ToEntity()); @@ -63,12 +62,12 @@ private static void EnsureSeedData(ConfigurationDbContext context) } else { - Log.Debug("IdentityResources already populated"); + Console.WriteLine("IdentityResources already populated"); } if (!context.ApiScopes.Any()) { - Log.Debug("ApiScopes being populated"); + Console.WriteLine("ApiScopes being populated"); foreach (var apiScope in Config.ApiScopes.ToList()) { context.ApiScopes.Add(apiScope.ToEntity()); @@ -77,7 +76,7 @@ private static void EnsureSeedData(ConfigurationDbContext context) } else { - Log.Debug("ApiScopes already populated"); + Console.WriteLine("ApiScopes already populated"); } if (!context.IdentityProviders.Any()) diff --git a/samples.slnx b/samples.slnx index 45eb4024..9055be21 100644 --- a/samples.slnx +++ b/samples.slnx @@ -305,6 +305,7 @@ + @@ -509,6 +510,7 @@ +