diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/AppHost.cs b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/AppHost.cs new file mode 100644 index 00000000..16c47d96 --- /dev/null +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/AppHost.cs @@ -0,0 +1,11 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var idp = builder.AddProject("identityserverhost"); + +var api = builder.AddProject("simple-api"); + +builder.AddProject("client") + .WaitFor(idp) + .WaitFor(api); + +builder.Build().Run(); diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj new file mode 100644 index 00000000..24b935cc --- /dev/null +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj @@ -0,0 +1,16 @@ + + + Exe + net10.0 + enable + enable + + + + + + + + + + diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/Properties/launchSettings.json b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..878381cd --- /dev/null +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.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:15237", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:21137", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:22137" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17237;http://localhost:15237", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21137", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22137" + } + } + } +} diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.development.json b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.development.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.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/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.json b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.DistributedApplication": "Information" + } + } +} diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln index a9370699..25feb211 100755 --- a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln +++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.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", "{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcTokenManagement.AppHost", "MvcTokenManagement.AppHost\MvcTokenManagement.AppHost.csproj", "{7A6C0E4E-6722-48C9-9178-AC0822FE1534}" +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 {A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x64.Build.0 = Release|Any CPU {A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x86.ActiveCfg = Release|Any CPU {A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x86.Build.0 = Release|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Debug|x64.ActiveCfg = Debug|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Debug|x64.Build.0 = Debug|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Debug|x86.ActiveCfg = Debug|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Debug|x86.Build.0 = Debug|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|Any CPU.Build.0 = Release|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x64.ActiveCfg = Release|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x64.Build.0 = Release|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x86.ActiveCfg = Release|Any CPU + {7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(NestedProjects) = preSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj b/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj index ad90312d..79049b4e 100755 --- a/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj +++ b/IdentityServer/v7/Basics/MvcTokenManagement/src/Client.csproj @@ -2,6 +2,7 @@ net10.0 + enable @@ -9,6 +10,10 @@ + + + + diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs b/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs index e9994bd6..5110ba0e 100755 --- a/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs +++ b/IdentityServer/v7/Basics/MvcTokenManagement/src/Program.cs @@ -12,6 +12,8 @@ var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); + builder.Services.AddControllersWithViews(); builder.Services.AddHttpClient(); @@ -75,6 +77,8 @@ var app = builder.Build(); +app.MapDefaultEndpoints(); + app.UseDeveloperExceptionPage(); app.UseStaticFiles(); diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/AppHost.cs b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/AppHost.cs new file mode 100644 index 00000000..16c47d96 --- /dev/null +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/AppHost.cs @@ -0,0 +1,11 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var idp = builder.AddProject("identityserverhost"); + +var api = builder.AddProject("simple-api"); + +builder.AddProject("client") + .WaitFor(idp) + .WaitFor(api); + +builder.Build().Run(); diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj new file mode 100644 index 00000000..24b935cc --- /dev/null +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/MvcTokenManagement.AppHost.csproj @@ -0,0 +1,16 @@ + + + Exe + net10.0 + enable + enable + + + + + + + + + + diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/Properties/launchSettings.json b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..79e7ad7e --- /dev/null +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.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/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.development.json b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.development.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.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/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.json b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.json new file mode 100644 index 00000000..c06aa74a --- /dev/null +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.DistributedApplication": "Information" + } + } +} diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln index a9370699..637b244b 100755 --- a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln +++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.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", "{A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcTokenManagement.AppHost", "MvcTokenManagement.AppHost\MvcTokenManagement.AppHost.csproj", "{F17FBB6C-7C0D-445F-BD13-26F94A134D5B}" +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 {A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x64.Build.0 = Release|Any CPU {A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x86.ActiveCfg = Release|Any CPU {A56F0F1A-D4F5-43B3-8685-C0E5677AFA37}.Release|x86.Build.0 = Release|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Debug|x64.ActiveCfg = Debug|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Debug|x64.Build.0 = Debug|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Debug|x86.ActiveCfg = Debug|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Debug|x86.Build.0 = Debug|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Release|Any CPU.Build.0 = Release|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Release|x64.ActiveCfg = Release|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Release|x64.Build.0 = Release|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Release|x86.ActiveCfg = Release|Any CPU + {F17FBB6C-7C0D-445F-BD13-26F94A134D5B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(NestedProjects) = preSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/src/Client.csproj b/IdentityServer/v8/Basics/MvcTokenManagement/src/Client.csproj index ad90312d..79049b4e 100755 --- a/IdentityServer/v8/Basics/MvcTokenManagement/src/Client.csproj +++ b/IdentityServer/v8/Basics/MvcTokenManagement/src/Client.csproj @@ -2,6 +2,7 @@ net10.0 + enable @@ -9,6 +10,10 @@ + + + + diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/src/Program.cs b/IdentityServer/v8/Basics/MvcTokenManagement/src/Program.cs index e9994bd6..5110ba0e 100755 --- a/IdentityServer/v8/Basics/MvcTokenManagement/src/Program.cs +++ b/IdentityServer/v8/Basics/MvcTokenManagement/src/Program.cs @@ -12,6 +12,8 @@ var builder = WebApplication.CreateBuilder(args); +builder.AddServiceDefaults(); + builder.Services.AddControllersWithViews(); builder.Services.AddHttpClient(); @@ -75,6 +77,8 @@ var app = builder.Build(); +app.MapDefaultEndpoints(); + app.UseDeveloperExceptionPage(); app.UseStaticFiles(); diff --git a/samples.slnx b/samples.slnx index 1a98e7b5..effd182d 100644 --- a/samples.slnx +++ b/samples.slnx @@ -231,6 +231,7 @@ + @@ -460,6 +461,7 @@ +