Skip to content

Commit 57a53d1

Browse files
josephdecockjosephdecock
committed
Merge branch 'releases/is/7.4.x' into jmdc/sync-7.4.0
2 parents e72f67b + b8107f8 commit 57a53d1

File tree

31 files changed

+246
-49
lines changed

31 files changed

+246
-49
lines changed

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<PackageVersion Include="AngleSharp" Version="1.1.2" />
37-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.0" />
38-
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.5.0" />
39-
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.0" />
37+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.5.2" />
38+
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.5.2" />
39+
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.5.2" />
4040
<PackageVersion Include="BenchmarkDotNet" Version="0.15.0" />
4141
<PackageVersion Include="BullsEye" Version="5.0.0" />
4242
<PackageVersion Include="coverlet.collector" Version="6.0.2" />

‎bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>

‎identity-server/aspire/AppHosts/All/All.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -58,6 +58,9 @@
5858
<ProjectReference Include="..\..\..\hosts\net9\AspNetIdentity9\Host.AspNetIdentity9.csproj" />
5959
<ProjectReference Include="..\..\..\hosts\net9\EntityFramework9\Host.EntityFramework9.csproj" />
6060
<ProjectReference Include="..\..\..\hosts\net9\Main9\Host.Main9.csproj" />
61+
<ProjectReference Include="..\..\..\hosts\net10\AspNetIdentity10\Host.AspNetIdentity10.csproj" />
62+
<ProjectReference Include="..\..\..\hosts\net10\EntityFramework10\Host.EntityFramework10.csproj" />
63+
<ProjectReference Include="..\..\..\hosts\net10\Main10\Host.Main10.csproj" />
6164
<ProjectReference Include="..\..\..\migrations\AspNetIdentityDb\AspNetIdentityDb.csproj" />
6265
<ProjectReference Include="..\..\..\migrations\IdentityServerDb\IdentityServerDb.csproj" />
6366
<ProjectReference Include="..\..\..\templates\src\IdentityServerAspNetIdentity\IdentityServerAspNetIdentity.csproj" />

‎identity-server/aspire/AppHosts/All/Program.cs‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,25 @@ void ConfigureIdentityServerHosts()
4646
projectRegistry.Add("is-host", hostMain);
4747
}
4848

49+
if (HostIsEnabled(nameof(Projects.Host_Main10)))
50+
{
51+
var hostMain = builder
52+
.AddProject<Projects.Host_Main10>("is-host")
53+
.WithHttpHealthCheck(path: "/.well-known/openid-configuration");
54+
55+
projectRegistry.Add("is-host", hostMain);
56+
}
57+
58+
4959
// These hosts require a database
5060
var dbHosts = new List<string>
5161
{
5262
nameof(Projects.Host_AspNetIdentity8),
5363
nameof(Projects.Host_AspNetIdentity9),
64+
nameof(Projects.Host_AspNetIdentity10),
5465
nameof(Projects.Host_EntityFramework8),
55-
nameof(Projects.Host_EntityFramework9)
66+
nameof(Projects.Host_EntityFramework9),
67+
nameof(Projects.Host_EntityFramework10)
5668
};
5769

5870
if (dbHosts.Any(HostIsEnabled))
@@ -100,6 +112,23 @@ void ConfigureIdentityServerHosts()
100112
projectRegistry.Add("is-host", hostAspNetIdentity);
101113
}
102114

115+
if (HostIsEnabled(nameof(Projects.Host_AspNetIdentity10)))
116+
{
117+
var hostAspNetIdentity = builder.AddProject<Projects.Host_AspNetIdentity10>(name: "is-host")
118+
.WithHttpHealthCheck(path: "/.well-known/openid-configuration")
119+
.WithReference(identityServerDb, connectionName: "DefaultConnection");
120+
121+
if (appConfig.RunDatabaseMigrations)
122+
{
123+
var aspnetMigration = builder.AddProject<Projects.AspNetIdentityDb>(name: "aspnetidentitydb-migrations")
124+
.WithReference(identityServerDb, connectionName: "DefaultConnection")
125+
.WaitFor(identityServerDb);
126+
hostAspNetIdentity.WaitForCompletion(aspnetMigration);
127+
}
128+
129+
projectRegistry.Add("is-host", hostAspNetIdentity);
130+
}
131+
103132
if (HostIsEnabled(nameof(Projects.Host_EntityFramework8)))
104133
{
105134
var hostEntityFramework = builder.AddProject<Projects.Host_EntityFramework8>(name: "is-host")
@@ -133,6 +162,23 @@ void ConfigureIdentityServerHosts()
133162

134163
projectRegistry.Add("is-host", hostEntityFramework);
135164
}
165+
166+
if (HostIsEnabled(nameof(Projects.Host_EntityFramework10)))
167+
{
168+
var hostEntityFramework = builder.AddProject<Projects.Host_EntityFramework10>(name: "is-host")
169+
.WithHttpHealthCheck(path: "/.well-known/openid-configuration")
170+
.WithReference(identityServerDb, connectionName: "DefaultConnection");
171+
172+
if (appConfig.RunDatabaseMigrations)
173+
{
174+
var idSrvMigration = builder.AddProject<Projects.IdentityServerDb>(name: "identityserverdb-migrations")
175+
.WithReference(identityServerDb, connectionName: "DefaultConnection")
176+
.WaitFor(identityServerDb);
177+
hostEntityFramework.WaitForCompletion(idSrvMigration);
178+
}
179+
180+
projectRegistry.Add("is-host", hostEntityFramework);
181+
}
136182
}
137183

138184
bool HostIsEnabled(string name) =>

‎identity-server/aspire/AppHosts/All/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}
88
},
99
"AspireProjectConfiguration": {
10-
"IdentityHost": "Host_Main9",
10+
"IdentityHost": "Host_Main10",
1111
"UseClients": {
1212
"ConsoleCibaClient": false,
1313
"ConsoleClientCredentialsFlow": false,

‎identity-server/aspire/AppHosts/Dev/Dev.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>

‎identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434

3535
var refresh_token = response.RefreshToken;
3636

37-
while (true)
37+
for (var i = 0; i < 10; i++)
3838
{
3939
response = await RefreshTokenAsync(refresh_token);
4040
response.Show();
4141

42-
Thread.Sleep(5000);
42+
Thread.Sleep(50);
4343

4444
await CallServiceAsync(response.AccessToken);
4545

‎identity-server/clients/src/ConsoleScopesResources/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
new() { Enabled = true, Id = "J", Name = "No scope (resource: resource1)", Scope = "", Resource = "urn:resource1" },
3737
new() { Enabled = true, Id = "K", Name = "No scope (resource: resource3)", Scope = "", Resource = "urn:resource3" },
3838
new() { Enabled = true, Id = "L", Name = "Isolated scope without resource parameter", Scope = "resource3.scope1" },
39-
new() { Enabled = true, Id = "M", Name = "Isolated scope without resource parameter", Scope = "resource3.scope1", Resource = "urn:resource3" },
40-
new() { Enabled = true, Id = "N", Name = "Isolated scope without resource parameter", Scope = "resource3.scope1", Resource = "urn:resource2" }
39+
new() { Enabled = true, Id = "M", Name = "Isolated scope with resource parameter", Scope = "resource3.scope1", Resource = "urn:resource3" },
40+
new() { Enabled = true, Id = "N", Name = "Shared scope with resource parameter", Scope = "shared.scope", Resource = "urn:resource2" }
4141
};
4242

4343
// Execute the planned runs

‎identity-server/hosts/Shared/Configuration/TestClients.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Duende.IdentityServer.Hosts.Shared.Configuration;
77

88
public static class TestClients
99
{
10-
public static IEnumerable<Client> Get()
10+
public static List<Client> Get()
1111
{
1212
var clients = new List<Client>();
1313

‎identity-server/hosts/Shared/Customization/CustomClientRegistrationProcessor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected override async Task<IStepResult> AddClientId(DynamicClientRegistration
2525
var clientId = clientIdParameter.ToString();
2626
if (clientId != null)
2727
{
28-
var existingClient = clientStore.FindClientByIdAsync(clientId);
28+
var existingClient = await clientStore.FindClientByIdAsync(clientId);
2929
if (existingClient is not null)
3030
{
3131
return new DynamicClientRegistrationError(

0 commit comments

Comments
 (0)