Skip to content

Commit da177e3

Browse files
authored
Merge pull request #318 from DuendeSoftware/roland/sesapi
Session Management sample: use centralized API
2 parents 2a7ded8 + 32c3ad4 commit da177e3

15 files changed

Lines changed: 22 additions & 218 deletions

File tree

IdentityServer/v7/SessionManagement/Api/Api.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

IdentityServer/v7/SessionManagement/Api/IdentityController.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

IdentityServer/v7/SessionManagement/Api/Program.cs

Lines changed: 0 additions & 43 deletions
This file was deleted.

IdentityServer/v7/SessionManagement/Api/Properties/launchSettings.json

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
var builder = DistributedApplication.CreateBuilder(args);
22

3-
builder.AddProject<Projects.Api>("api");
3+
builder.AddProject<Projects.SimpleApi>("api");
44

5-
builder.AddProject<Projects.Client>("client");
5+
var idsrv = builder.AddProject<Projects.IdentityServerHost>("identityserverhost");
66

7-
builder.AddProject<Projects.IdentityServerHost>("identityserverhost");
7+
builder.AddProject<Projects.Client>("client")
8+
.WaitFor(idsrv);
89

910
builder.Build().Run();

IdentityServer/v7/SessionManagement/SessionManagement.AppHost/SessionManagement.AppHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<ProjectReference Include="..\Api\Api.csproj" />
12+
<ProjectReference Include="..\..\Apis\SimpleApi\SimpleApi.csproj" />
1313
<ProjectReference Include="..\Client\Client.csproj" />
1414
<ProjectReference Include="..\IdentityServerHost\IdentityServerHost.csproj" />
1515
</ItemGroup>

IdentityServer/v7/SessionManagement/SessionManagement.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ VisualStudioVersion = 17.1.32319.34
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{559CD9B9-3756-41D8-BDC5-1EAC8AAFBF9A}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{D2931C0F-E591-4CBA-B487-3EE5A350F218}"
9-
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "IdentityServerHost\IdentityServerHost.csproj", "{2880B5FF-9B88-476B-9869-E8A76FE65CB8}"
119
EndProject
1210
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionManagement.AppHost", "SessionManagement.AppHost\SessionManagement.AppHost.csproj", "{BD383672-7EF5-4737-91A9-92918CF2BBA7}"
1311
EndProject
1412
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{BE3015AC-8269-4D94-AB27-E835CBFC3AFC}"
1513
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{3186E5A3-F3D3-45F4-9915-96E531AA1A62}"
15+
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Any CPU = Debug|Any CPU
@@ -23,10 +23,6 @@ Global
2323
{559CD9B9-3756-41D8-BDC5-1EAC8AAFBF9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
2424
{559CD9B9-3756-41D8-BDC5-1EAC8AAFBF9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
2525
{559CD9B9-3756-41D8-BDC5-1EAC8AAFBF9A}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{D2931C0F-E591-4CBA-B487-3EE5A350F218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{D2931C0F-E591-4CBA-B487-3EE5A350F218}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{D2931C0F-E591-4CBA-B487-3EE5A350F218}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{D2931C0F-E591-4CBA-B487-3EE5A350F218}.Release|Any CPU.Build.0 = Release|Any CPU
3026
{2880B5FF-9B88-476B-9869-E8A76FE65CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3127
{2880B5FF-9B88-476B-9869-E8A76FE65CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
3228
{2880B5FF-9B88-476B-9869-E8A76FE65CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,6 +35,10 @@ Global
3935
{BE3015AC-8269-4D94-AB27-E835CBFC3AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
4036
{BE3015AC-8269-4D94-AB27-E835CBFC3AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
4137
{BE3015AC-8269-4D94-AB27-E835CBFC3AFC}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{3186E5A3-F3D3-45F4-9915-96E531AA1A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{3186E5A3-F3D3-45F4-9915-96E531AA1A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{3186E5A3-F3D3-45F4-9915-96E531AA1A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{3186E5A3-F3D3-45F4-9915-96E531AA1A62}.Release|Any CPU.Build.0 = Release|Any CPU
4242
EndGlobalSection
4343
GlobalSection(SolutionProperties) = preSolution
4444
HideSolutionNode = FALSE

IdentityServer/v8/SessionManagement/Api/Api.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

IdentityServer/v8/SessionManagement/Api/IdentityController.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

IdentityServer/v8/SessionManagement/Api/Program.cs

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)