Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions IdentityServer/v7/Basics/MvcBasic/MvcBasic.AppHost/AppHost.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var builder = DistributedApplication.CreateBuilder(args);

var idp = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");

var api = builder.AddProject<Projects.SimpleApi>("simple-api");

builder.AddProject<Projects.Client>("client")
.WaitFor(idp)
.WaitFor(api);

builder.Build().Run();
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Aspire.AppHost.Sdk/13.2.2">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\IdentityServerHost\src\IdentityServerHost.csproj" />
<ProjectReference Include="..\src\Client.csproj" />
<ProjectReference Include="..\..\..\Apis\SimpleApi\SimpleApi.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Aspire.Hosting.DistributedApplication": "Information"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Aspire.Hosting.DistributedApplication": "Information"
}
}
}
18 changes: 16 additions & 2 deletions IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{4C432499-3659-4D5F-868C-C8273D16462F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBasic.AppHost", "MvcBasic.AppHost\MvcBasic.AppHost.csproj", "{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -69,8 +71,20 @@ Global
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.ActiveCfg = Release|Any CPU
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.Build.0 = Release|Any CPU
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.ActiveCfg = Release|Any CPU
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x64.ActiveCfg = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x64.Build.0 = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x86.ActiveCfg = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x86.Build.0 = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|Any CPU.Build.0 = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x64.ActiveCfg = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x64.Build.0 = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x86.ActiveCfg = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
EndGlobal
3 changes: 3 additions & 0 deletions IdentityServer/v7/Basics/MvcBasic/src/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<PackageReference Include="Duende.IdentityModel" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
</ItemGroup>

<!-- Constants and helpers -->
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions IdentityServer/v7/Basics/MvcBasic/src/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

var builder = WebApplication.CreateBuilder(args);

builder.AddServiceDefaults();

builder.Services.AddControllersWithViews();
builder.Services.AddHttpClient();

Expand Down Expand Up @@ -66,6 +68,8 @@

var app = builder.Build();

app.MapDefaultEndpoints();

app.UseDeveloperExceptionPage();
app.UseStaticFiles();

Expand Down
11 changes: 11 additions & 0 deletions IdentityServer/v8/Basics/MvcBasic/MvcBasic.AppHost/AppHost.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var builder = DistributedApplication.CreateBuilder(args);

var idp = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");

var api = builder.AddProject<Projects.SimpleApi>("simple-api");

builder.AddProject<Projects.Client>("client")
.WaitFor(idp)
.WaitFor(api);

builder.Build().Run();
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Aspire.AppHost.Sdk/13.2.2">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\IdentityServerHost\src\IdentityServerHost.csproj" />
<ProjectReference Include="..\src\Client.csproj" />
<ProjectReference Include="..\..\..\Apis\SimpleApi\SimpleApi.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Aspire.Hosting.DistributedApplication": "Information"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Aspire.Hosting.DistributedApplication": "Information"
}
}
}
18 changes: 16 additions & 2 deletions IdentityServer/v8/Basics/MvcBasic/MvcBasic.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\SimpleApi\SimpleApi.csproj", "{4C432499-3659-4D5F-868C-C8273D16462F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBasic.AppHost", "MvcBasic.AppHost\MvcBasic.AppHost.csproj", "{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -69,8 +71,20 @@ Global
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.ActiveCfg = Release|Any CPU
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.Build.0 = Release|Any CPU
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.ActiveCfg = Release|Any CPU
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Debug|x64.ActiveCfg = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Debug|x64.Build.0 = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Debug|x86.ActiveCfg = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Debug|x86.Build.0 = Debug|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Release|Any CPU.Build.0 = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Release|x64.ActiveCfg = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Release|x64.Build.0 = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Release|x86.ActiveCfg = Release|Any CPU
{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
EndGlobal
3 changes: 3 additions & 0 deletions IdentityServer/v8/Basics/MvcBasic/src/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<PackageReference Include="Duende.IdentityModel" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
</ItemGroup>

<!-- Constants and helpers -->
<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions IdentityServer/v8/Basics/MvcBasic/src/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

var builder = WebApplication.CreateBuilder(args);

builder.AddServiceDefaults();

builder.Services.AddControllersWithViews();
builder.Services.AddHttpClient();

Expand Down Expand Up @@ -66,6 +68,8 @@

var app = builder.Build();

app.MapDefaultEndpoints();

app.UseDeveloperExceptionPage();
app.UseStaticFiles();

Expand Down
2 changes: 2 additions & 0 deletions samples.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
<Project Path="IdentityServer/v7/Basics/MvcBackChannelLogout/src/Client.csproj" />
</Folder>
<Folder Name="/IdentityServer/v7/Basics/MvcBasic/">
<Project Path="IdentityServer/v7/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj" />
<Project Path="IdentityServer/v7/Basics/MvcBasic/src/Client.csproj" />
</Folder>
<Folder Name="/IdentityServer/v7/Basics/MvcJarJwt/">
Expand Down Expand Up @@ -444,6 +445,7 @@
<Project Path="IdentityServer/v8/Basics/MvcBackChannelLogout/src/Client.csproj" />
</Folder>
<Folder Name="/IdentityServer/v8/Basics/MvcBasic/">
<Project Path="IdentityServer/v8/Basics/MvcBasic/MvcBasic.AppHost/MvcBasic.AppHost.csproj" />
<Project Path="IdentityServer/v8/Basics/MvcBasic/src/Client.csproj" />
</Folder>
<Folder Name="/IdentityServer/v8/Basics/MvcJarJwt/">
Expand Down
Loading