Skip to content

Commit a6dea68

Browse files
davidfowldavidfowl
authored
Update everything! (#105)
- Aspire 9.4 - Latest .NET 9 patches - Packages
1 parent 1d4e043 commit a6dea68

File tree

5 files changed

+46
-36
lines changed

5 files changed

+46
-36
lines changed

‎.aspire/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"appHostPath": "../TodoApp.AppHost/TodoApp.AppHost.csproj"
3+
}

‎Directory.Packages.props

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
7-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
8-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
9-
<PackageVersion Include="xunit" Version="2.9.2" />
10-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
11-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
6+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.8" />
7+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.8" />
8+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
9+
<PackageVersion Include="xunit" Version="2.9.3" />
10+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
11+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
15-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
16-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
17-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
18-
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.17" />
19-
<PackageVersion Include="MiniValidation" Version="0.9.0" />
20-
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="9.0.0" />
21-
<PackageVersion Include="Auth0.AspNetCore.Authentication" Version="1.4.1" />
22-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0" />
23-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0" />
24-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
25-
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
26-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
14+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
15+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
16+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8" />
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
18+
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.22" />
19+
<PackageVersion Include="MiniValidation" Version="0.9.2" />
20+
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="9.4.0" />
21+
<PackageVersion Include="Auth0.AspNetCore.Authentication" Version="1.5.0" />
22+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.8" />
23+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.8" />
24+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
25+
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
26+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
2727
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
28-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
31-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
32-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
33-
<PackageVersion Include="Scalar.AspNetCore" Version="1.2.37" />
28+
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.8" />
29+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
30+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.0" />
31+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.4.0" />
32+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.0" />
33+
<PackageVersion Include="Scalar.AspNetCore" Version="2.6.8" />
3434
</ItemGroup>
3535
<!-- OpenTelemetry -->
3636
<ItemGroup>
37-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
38-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
39-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
40-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
41-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
37+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
38+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
39+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
40+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
41+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
4242
</ItemGroup>
4343
</Project>

‎Todo.Api/Extensions/OpenApiOptionsExtensions.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,34 @@ public static OpenApiOptions AddBearerTokenAuthentication(this OpenApiOptions op
1111
{
1212
Type = SecuritySchemeType.Http,
1313
Name = IdentityConstants.BearerScheme,
14-
Scheme = "Bearer",
15-
Reference = new()
14+
Scheme = "Bearer"
15+
};
16+
17+
var reference = new OpenApiSecurityScheme()
18+
{
19+
Reference = new OpenApiReference
1620
{
1721
Type = ReferenceType.SecurityScheme,
1822
Id = IdentityConstants.BearerScheme
1923
}
2024
};
25+
2126
options.AddDocumentTransformer((document, context, cancellationToken) =>
2227
{
23-
document.Components ??= new();
28+
document.Components ??= new OpenApiComponents();
2429
document.Components.SecuritySchemes.Add(IdentityConstants.BearerScheme, scheme);
2530
return Task.CompletedTask;
2631
});
32+
2733
options.AddOperationTransformer((operation, context, cancellationToken) =>
2834
{
2935
if (context.Description.ActionDescriptor.EndpointMetadata.OfType<IAuthorizeData>().Any())
3036
{
31-
operation.Security = [new() { [scheme] = [] }];
37+
operation.Security = [new OpenApiSecurityRequirement { [reference] = [] }];
3238
}
3339
return Task.CompletedTask;
3440
});
41+
3542
return options;
3643
}
3744
}

‎Todo.Api/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
app.MapScalarApiReference(options =>
5252
{
5353
options.Servers = [];
54-
options.Authentication = new() { PreferredSecurityScheme = IdentityConstants.BearerScheme };
54+
options.Authentication = new() { PreferredSecuritySchemes = [IdentityConstants.BearerScheme] };
5555
});
5656
}
5757

‎TodoApp.AppHost/TodoApp.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.0.0" />
3+
<Sdk Name="Aspire.AppHost.Sdk" Version="9.4.0" />
44

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

0 commit comments

Comments
 (0)