diff --git a/IdentityServer/v7/MTLS/Api/Api.csproj b/IdentityServer/v7/MTLS/Api/Api.csproj
index 6ff5700c..17f2292c 100644
--- a/IdentityServer/v7/MTLS/Api/Api.csproj
+++ b/IdentityServer/v7/MTLS/Api/Api.csproj
@@ -7,7 +7,10 @@
-
+
+
+
+
diff --git a/IdentityServer/v7/MTLS/Api/Program.cs b/IdentityServer/v7/MTLS/Api/Program.cs
index b909f5fb..267fd7c9 100644
--- a/IdentityServer/v7/MTLS/Api/Program.cs
+++ b/IdentityServer/v7/MTLS/Api/Program.cs
@@ -3,20 +3,12 @@
using Api;
using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Serilog;
-using Serilog.Sinks.SystemConsole.Themes;
Console.Title = "API";
-Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Information()
- .Enrich.FromLogContext()
- .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
- .CreateLogger();
-
var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddSerilog();
+builder.AddServiceDefaults();
builder.Services.AddControllers();
@@ -45,6 +37,8 @@
var app = builder.Build();
+app.MapDefaultEndpoints();
+
app.UseRouting();
app.UseAuthentication();
diff --git a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj
index 5dc0a46b..9d055a7f 100644
--- a/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj
+++ b/IdentityServer/v7/MTLS/IdentityServerHost/IdentityServerHost.csproj
@@ -8,7 +8,10 @@
-
+
+
+
+
diff --git a/IdentityServer/v7/MTLS/IdentityServerHost/Program.cs b/IdentityServer/v7/MTLS/IdentityServerHost/Program.cs
index dfad54e1..30107087 100644
--- a/IdentityServer/v7/MTLS/IdentityServerHost/Program.cs
+++ b/IdentityServer/v7/MTLS/IdentityServerHost/Program.cs
@@ -6,32 +6,19 @@
using IdentityServerHost;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Serilog;
-using Serilog.Events;
-using Serilog.Sinks.SystemConsole.Themes;
Console.Title = "IdentityServer";
-Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Debug()
- .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
- .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
- .MinimumLevel.Override("System", LogEventLevel.Warning)
- .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
- .Enrich.FromLogContext()
- .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
- .CreateLogger();
-
var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddSerilog();
+builder.AddServiceDefaults();
builder.Services.AddRazorPages();
builder.Services.AddAuthentication()
.AddCertificate(opt =>
{
- // Revocation check disabled for mkcert certificate.
+ // Revocation check disabled for mkcert certificate.
// In production, revocation should be checked.
opt.RevocationMode = X509RevocationMode.NoCheck;
});
@@ -43,11 +30,6 @@
var idsvrBuilder = builder.Services.AddIdentityServer(options =>
{
- options.Events.RaiseErrorEvents = true;
- options.Events.RaiseInformationEvents = true;
- options.Events.RaiseFailureEvents = true;
- options.Events.RaiseSuccessEvents = true;
-
// MTLS Configuration
options.MutualTls.Enabled = true;
});
@@ -75,6 +57,8 @@
var app = builder.Build();
+app.MapDefaultEndpoints();
+
if (app.Environment.IsDevelopment())
{
app.UseDeveloperExceptionPage();
diff --git a/IdentityServer/v7/MTLS/MTLS.AppHost/AppHost.cs b/IdentityServer/v7/MTLS/MTLS.AppHost/AppHost.cs
new file mode 100644
index 00000000..85eb75d5
--- /dev/null
+++ b/IdentityServer/v7/MTLS/MTLS.AppHost/AppHost.cs
@@ -0,0 +1,11 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var idp = builder.AddProject("identityserverhost");
+
+var api = builder.AddProject("api");
+
+builder.AddProject("clientcredentials")
+ .WaitFor(idp)
+ .WaitFor(api);
+
+builder.Build().Run();
diff --git a/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj b/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj
new file mode 100644
index 00000000..fbb1dd4c
--- /dev/null
+++ b/IdentityServer/v7/MTLS/MTLS.AppHost/MTLS.AppHost.csproj
@@ -0,0 +1,20 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IdentityServer/v7/MTLS/MTLS.AppHost/Properties/launchSettings.json b/IdentityServer/v7/MTLS/MTLS.AppHost/Properties/launchSettings.json
new file mode 100644
index 00000000..2fd7abcd
--- /dev/null
+++ b/IdentityServer/v7/MTLS/MTLS.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:17050;http://localhost:15293",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "DOTNET_ENVIRONMENT": "Development",
+ "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21177",
+ "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23178",
+ "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22126"
+ }
+ },
+ "http": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "applicationUrl": "http://localhost:15293",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "DOTNET_ENVIRONMENT": "Development",
+ "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19222",
+ "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18151",
+ "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20036"
+ }
+ }
+ }
+}
diff --git a/IdentityServer/v7/MTLS/MTLS.AppHost/appsettings.Development.json b/IdentityServer/v7/MTLS/MTLS.AppHost/appsettings.Development.json
new file mode 100644
index 00000000..0c208ae9
--- /dev/null
+++ b/IdentityServer/v7/MTLS/MTLS.AppHost/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ }
+}
diff --git a/IdentityServer/v7/MTLS/MTLS.AppHost/appsettings.json b/IdentityServer/v7/MTLS/MTLS.AppHost/appsettings.json
new file mode 100644
index 00000000..31c092aa
--- /dev/null
+++ b/IdentityServer/v7/MTLS/MTLS.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning",
+ "Aspire.Hosting.Dcp": "Warning"
+ }
+ }
+}
diff --git a/IdentityServer/v7/MTLS/MTLS.sln b/IdentityServer/v7/MTLS/MTLS.sln
index e549feba..260308a4 100644
--- a/IdentityServer/v7/MTLS/MTLS.sln
+++ b/IdentityServer/v7/MTLS/MTLS.sln
@@ -9,24 +9,80 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientCredentials", "Client
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{36079801-4BD2-4B7B-B44C-0B8169A7CB12}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTLS.AppHost", "MTLS.AppHost\MTLS.AppHost.csproj", "{EF54DD3B-E0F0-48A0-AD3F-402E8C034268}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{50EA55FE-6891-4DBC-AE20-48450C2C3FD1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x64.Build.0 = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x86.Build.0 = Debug|Any CPU
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x64.ActiveCfg = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x64.Build.0 = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x86.ActiveCfg = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x86.Build.0 = Release|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x64.Build.0 = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x86.Build.0 = Debug|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x64.ActiveCfg = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x64.Build.0 = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x86.ActiveCfg = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x86.Build.0 = Release|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x64.Build.0 = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x86.Build.0 = Debug|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|Any CPU.Build.0 = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x64.ActiveCfg = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x64.Build.0 = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x86.ActiveCfg = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x86.Build.0 = Release|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Debug|x64.Build.0 = Debug|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Debug|x86.Build.0 = Debug|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Release|x64.ActiveCfg = Release|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Release|x64.Build.0 = Release|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Release|x86.ActiveCfg = Release|Any CPU
+ {EF54DD3B-E0F0-48A0-AD3F-402E8C034268}.Release|x86.Build.0 = Release|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Debug|x64.Build.0 = Debug|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Debug|x86.Build.0 = Debug|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Release|x64.ActiveCfg = Release|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Release|x64.Build.0 = Release|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Release|x86.ActiveCfg = Release|Any CPU
+ {50EA55FE-6891-4DBC-AE20-48450C2C3FD1}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/MTLS/Api/Api.csproj b/IdentityServer/v8/MTLS/Api/Api.csproj
index 6ff5700c..17f2292c 100644
--- a/IdentityServer/v8/MTLS/Api/Api.csproj
+++ b/IdentityServer/v8/MTLS/Api/Api.csproj
@@ -7,7 +7,10 @@
-
+
+
+
+
diff --git a/IdentityServer/v8/MTLS/Api/Program.cs b/IdentityServer/v8/MTLS/Api/Program.cs
index b909f5fb..267fd7c9 100644
--- a/IdentityServer/v8/MTLS/Api/Program.cs
+++ b/IdentityServer/v8/MTLS/Api/Program.cs
@@ -3,20 +3,12 @@
using Api;
using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Serilog;
-using Serilog.Sinks.SystemConsole.Themes;
Console.Title = "API";
-Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Information()
- .Enrich.FromLogContext()
- .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
- .CreateLogger();
-
var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddSerilog();
+builder.AddServiceDefaults();
builder.Services.AddControllers();
@@ -45,6 +37,8 @@
var app = builder.Build();
+app.MapDefaultEndpoints();
+
app.UseRouting();
app.UseAuthentication();
diff --git a/IdentityServer/v8/MTLS/IdentityServerHost/IdentityServerHost.csproj b/IdentityServer/v8/MTLS/IdentityServerHost/IdentityServerHost.csproj
index 5dc0a46b..9d055a7f 100644
--- a/IdentityServer/v8/MTLS/IdentityServerHost/IdentityServerHost.csproj
+++ b/IdentityServer/v8/MTLS/IdentityServerHost/IdentityServerHost.csproj
@@ -8,7 +8,10 @@
-
+
+
+
+
diff --git a/IdentityServer/v8/MTLS/IdentityServerHost/Program.cs b/IdentityServer/v8/MTLS/IdentityServerHost/Program.cs
index dfad54e1..30107087 100644
--- a/IdentityServer/v8/MTLS/IdentityServerHost/Program.cs
+++ b/IdentityServer/v8/MTLS/IdentityServerHost/Program.cs
@@ -6,32 +6,19 @@
using IdentityServerHost;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Serilog;
-using Serilog.Events;
-using Serilog.Sinks.SystemConsole.Themes;
Console.Title = "IdentityServer";
-Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Debug()
- .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
- .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
- .MinimumLevel.Override("System", LogEventLevel.Warning)
- .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
- .Enrich.FromLogContext()
- .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
- .CreateLogger();
-
var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddSerilog();
+builder.AddServiceDefaults();
builder.Services.AddRazorPages();
builder.Services.AddAuthentication()
.AddCertificate(opt =>
{
- // Revocation check disabled for mkcert certificate.
+ // Revocation check disabled for mkcert certificate.
// In production, revocation should be checked.
opt.RevocationMode = X509RevocationMode.NoCheck;
});
@@ -43,11 +30,6 @@
var idsvrBuilder = builder.Services.AddIdentityServer(options =>
{
- options.Events.RaiseErrorEvents = true;
- options.Events.RaiseInformationEvents = true;
- options.Events.RaiseFailureEvents = true;
- options.Events.RaiseSuccessEvents = true;
-
// MTLS Configuration
options.MutualTls.Enabled = true;
});
@@ -75,6 +57,8 @@
var app = builder.Build();
+app.MapDefaultEndpoints();
+
if (app.Environment.IsDevelopment())
{
app.UseDeveloperExceptionPage();
diff --git a/IdentityServer/v8/MTLS/MTLS.AppHost/AppHost.cs b/IdentityServer/v8/MTLS/MTLS.AppHost/AppHost.cs
new file mode 100644
index 00000000..85eb75d5
--- /dev/null
+++ b/IdentityServer/v8/MTLS/MTLS.AppHost/AppHost.cs
@@ -0,0 +1,11 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var idp = builder.AddProject("identityserverhost");
+
+var api = builder.AddProject("api");
+
+builder.AddProject("clientcredentials")
+ .WaitFor(idp)
+ .WaitFor(api);
+
+builder.Build().Run();
diff --git a/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj b/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj
new file mode 100644
index 00000000..fbb1dd4c
--- /dev/null
+++ b/IdentityServer/v8/MTLS/MTLS.AppHost/MTLS.AppHost.csproj
@@ -0,0 +1,20 @@
+
+
+
+ Exe
+ net10.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/IdentityServer/v8/MTLS/MTLS.AppHost/Properties/launchSettings.json b/IdentityServer/v8/MTLS/MTLS.AppHost/Properties/launchSettings.json
new file mode 100644
index 00000000..415172a6
--- /dev/null
+++ b/IdentityServer/v8/MTLS/MTLS.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:17049;http://localhost:15292",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "DOTNET_ENVIRONMENT": "Development",
+ "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21176",
+ "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23177",
+ "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22125"
+ }
+ },
+ "http": {
+ "commandName": "Project",
+ "dotnetRunMessages": true,
+ "launchBrowser": true,
+ "applicationUrl": "http://localhost:15292",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "DOTNET_ENVIRONMENT": "Development",
+ "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19221",
+ "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18150",
+ "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20035"
+ }
+ }
+ }
+}
diff --git a/IdentityServer/v8/MTLS/MTLS.AppHost/appsettings.Development.json b/IdentityServer/v8/MTLS/MTLS.AppHost/appsettings.Development.json
new file mode 100644
index 00000000..0c208ae9
--- /dev/null
+++ b/IdentityServer/v8/MTLS/MTLS.AppHost/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ }
+}
diff --git a/IdentityServer/v8/MTLS/MTLS.AppHost/appsettings.json b/IdentityServer/v8/MTLS/MTLS.AppHost/appsettings.json
new file mode 100644
index 00000000..31c092aa
--- /dev/null
+++ b/IdentityServer/v8/MTLS/MTLS.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning",
+ "Aspire.Hosting.Dcp": "Warning"
+ }
+ }
+}
diff --git a/IdentityServer/v8/MTLS/MTLS.sln b/IdentityServer/v8/MTLS/MTLS.sln
index e549feba..954db23f 100644
--- a/IdentityServer/v8/MTLS/MTLS.sln
+++ b/IdentityServer/v8/MTLS/MTLS.sln
@@ -9,24 +9,80 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientCredentials", "Client
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{36079801-4BD2-4B7B-B44C-0B8169A7CB12}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTLS.AppHost", "MTLS.AppHost\MTLS.AppHost.csproj", "{E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x64.Build.0 = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Debug|x86.Build.0 = Debug|Any CPU
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x64.ActiveCfg = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x64.Build.0 = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x86.ActiveCfg = Release|Any CPU
+ {7F49863A-08F1-4A9B-9740-C05CF679384F}.Release|x86.Build.0 = Release|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x64.Build.0 = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Debug|x86.Build.0 = Debug|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x64.ActiveCfg = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x64.Build.0 = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x86.ActiveCfg = Release|Any CPU
+ {78C79458-4CCF-4CD0-8AF9-DCE6D1D8F9B2}.Release|x86.Build.0 = Release|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x64.Build.0 = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Debug|x86.Build.0 = Debug|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|Any CPU.Build.0 = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x64.ActiveCfg = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x64.Build.0 = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x86.ActiveCfg = Release|Any CPU
+ {36079801-4BD2-4B7B-B44C-0B8169A7CB12}.Release|x86.Build.0 = Release|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Debug|x64.Build.0 = Debug|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Debug|x86.Build.0 = Debug|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x64.ActiveCfg = Release|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x64.Build.0 = Release|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x86.ActiveCfg = Release|Any CPU
+ {E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x86.Build.0 = Release|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x64.Build.0 = Debug|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x86.Build.0 = Debug|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x64.ActiveCfg = Release|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x64.Build.0 = Release|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x86.ActiveCfg = Release|Any CPU
+ {155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/samples.slnx b/samples.slnx
index c569acea..8bbe1f90 100644
--- a/samples.slnx
+++ b/samples.slnx
@@ -272,6 +272,7 @@
+
@@ -486,6 +487,7 @@
+