Skip to content

Commit 028d613

Browse files
jerviscuijerviscui
committed
Update dependencies
1 parent eb712fb commit 028d613

14 files changed

Lines changed: 175 additions & 163 deletions

File tree

‎src/plugins/CAP/CapTest.Depot.Host/CapTest.Depot.Host.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.3.3" />
9-
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.3.3" />
10-
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="8.3.3" />
11-
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="8.3.3" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
8+
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.3.5" />
9+
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.3.5" />
10+
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="8.3.5" />
11+
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="8.3.5" />
12+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5">
1314
<PrivateAssets>all</PrivateAssets>
1415
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1516
</PackageReference>
1617
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
17-
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
18+
<PackageReference Include="Scalar.AspNetCore" Version="2.4.7" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

‎src/plugins/CAP/CapTest.Depot.Host/Properties/launchSettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"IIS Express": {
1212
"commandName": "IISExpress",
1313
"launchBrowser": true,
14-
"launchUrl": "swagger",
14+
"launchUrl": "scalar",
1515
"environmentVariables": {
1616
"ASPNETCORE_ENVIRONMENT": "Development"
1717
}
@@ -20,7 +20,7 @@
2020
"commandName": "Project",
2121
"dotnetRunMessages": "true",
2222
"launchBrowser": true,
23-
"launchUrl": "swagger",
23+
"launchUrl": "scalar",
2424
"applicationUrl": "https://localhost:5011;http://localhost:5010",
2525
"environmentVariables": {
2626
"ASPNETCORE_ENVIRONMENT": "Development"

‎src/plugins/CAP/CapTest.Depot.Host/Startup.cs‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using CapTest.Depot.Service;
22
using CapTest.Shared;
33
using Microsoft.EntityFrameworkCore;
4-
using Microsoft.OpenApi.Models;
4+
using Scalar.AspNetCore;
5+
using StackExchange.Redis;
56

67
namespace CapTest.Depot.Host;
78

@@ -23,19 +24,23 @@ public Startup(IConfiguration configuration)
2324
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
2425
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
2526
{
26-
if (env.IsDevelopment())
27-
{
28-
_ = app.UseDeveloperExceptionPage();
29-
_ = app.UseSwagger();
30-
_ = app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "CapTest.Depot.Host v1"));
31-
}
32-
3327
_ = app.UseHttpsRedirection();
3428

3529
_ = app.UseRouting();
3630

3731
_ = app.UseAuthorization();
3832

33+
if (env.IsDevelopment())
34+
{
35+
_ = app.UseDeveloperExceptionPage();
36+
_ = app.UseEndpoints(
37+
(builder) =>
38+
{
39+
_ = builder.MapOpenApi();
40+
_ = builder.MapScalarApiReference();
41+
});
42+
}
43+
3944
_ = app.UseEndpoints(
4045
endpoints =>
4146
{
@@ -49,11 +54,7 @@ public void ConfigureServices(IServiceCollection services)
4954
_ = services.AddTransient<OrderCreatedEventHandler>();
5055

5156
_ = services.AddControllers();
52-
_ = services.AddSwaggerGen(
53-
c =>
54-
{
55-
c.SwaggerDoc("v1", new OpenApiInfo { Title = "CapTest.Depot.Host", Version = "v1" });
56-
});
57+
_ = services.AddOpenApi();
5758

5859
_ = services.AddDbContextPool<DepotDbContext>(
5960
builder => builder.UseNpgsql(Configuration.GetConnectionString(DepotConsts.DbContextConnName)));
@@ -65,13 +66,20 @@ public void ConfigureServices(IServiceCollection services)
6566

6667
_ = options.UseEntityFramework<DepotDbContext>(efOptions => efOptions.Schema = "cap");
6768

68-
_ = options.UseRabbitMQ(
69-
mqOptions =>
69+
//_ = options.UseRabbitMQ(
70+
// mqOptions =>
71+
// {
72+
// mqOptions.HostName = "localhost";
73+
// //mqOptions.Port = ;
74+
// //mqOptions.UserName = "";
75+
// //mqOptions.Password = "";
76+
// });
77+
78+
options.UseRedis(
79+
(redisOptions) =>
7080
{
71-
mqOptions.HostName = "localhost";
72-
//mqOptions.Port = ;
73-
//mqOptions.UserName = "";
74-
//mqOptions.Password = "";
81+
redisOptions.Configuration = ConfigurationOptions.Parse(
82+
Configuration.GetConnectionString("Redis")!);
7583
});
7684

7785
_ = options.UseDashboard(dashboardOptions => dashboardOptions.PathMatch = "/cap");

‎src/plugins/CAP/CapTest.Depot.Service/CapTest.Depot.Service.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="DotNetCore.CAP" Version="8.3.3" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
8+
<PackageReference Include="DotNetCore.CAP" Version="8.3.5" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/plugins/CAP/CapTest.Order.Host/CapTest.Order.Host.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.3.3" />
9-
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.3.3" />
10-
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="8.3.3" />
11-
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="8.3.3"/>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
8+
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="8.3.5" />
9+
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="8.3.5" />
10+
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="8.3.5" />
11+
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="8.3.5" />
12+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.5" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.5">
1314
<PrivateAssets>all</PrivateAssets>
1415
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1516
</PackageReference>
1617
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
17-
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1" />
18+
<PackageReference Include="Scalar.AspNetCore" Version="2.4.7" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

‎src/plugins/CAP/CapTest.Order.Host/Controllers/OrderController.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,33 @@ public OrderController(OrderService orderService)
1818

1919
[HttpPost]
2020
[Route("{id}")]
21-
public Task<string> CreateAsync(int id)
21+
public Task<string> CreateAsync(int id, CancellationToken cancellationToken)
2222
{
23-
return _orderService.Create(id);
23+
return _orderService.CreateAsync(id, cancellationToken);
2424
}
2525

2626
[HttpPost]
2727
[Route("CreateDelay/{id}")]
28-
public Task<string> CreateDelayAsync(int id)
28+
public Task<string> CreateDelayAsync(int id, CancellationToken cancellationToken)
2929
{
30-
return _orderService.CreateDelay(id);
30+
return _orderService.CreateDelayAsync(id, cancellationToken);
3131
}
3232

3333
[HttpPost]
3434
[Route("CreateMessageWithHeaders")]
3535
// ReSharper disable once InconsistentNaming
36-
public async Task<IActionResult> CreateTTLMessage()
36+
public async Task<IActionResult> CreateMessageWithHeadersAsync(CancellationToken cancellationToken)
3737
{
38-
await _orderService.CreateMessageWithHeaders();
38+
await _orderService.CreateMessageWithHeaders(cancellationToken);
3939

4040
return Ok();
4141
}
4242

4343
[HttpPost]
4444
[Route("CreateWithTransaction/{id}")]
45-
public Task<string> CreateWithTransactionAsync(int id)
45+
public Task<string> CreateWithTransactionAsync(int id, CancellationToken cancellationToken)
4646
{
47-
return _orderService.CreateWithoutCapPgsql(id);
47+
return _orderService.CreateWithoutCapPgsqlAsync(id, cancellationToken);
4848
}
4949

5050
#endregion

‎src/plugins/CAP/CapTest.Order.Host/Controllers/WeatherForecastController.cs‎

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

‎src/plugins/CAP/CapTest.Order.Host/Properties/launchSettings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"IIS Express": {
1313
"commandName": "IISExpress",
1414
"launchBrowser": true,
15-
"launchUrl": "swagger",
15+
"launchUrl": "scalar",
1616
"environmentVariables": {
1717
"ASPNETCORE_ENVIRONMENT": "Development"
1818
}
@@ -21,7 +21,7 @@
2121
"commandName": "Project",
2222
"dotnetRunMessages": "true",
2323
"launchBrowser": true,
24-
"launchUrl": "swagger",
24+
"launchUrl": "scalar",
2525
"applicationUrl": "https://localhost:5001;http://localhost:5000",
2626
"environmentVariables": {
2727
"ASPNETCORE_ENVIRONMENT": "Development"

‎src/plugins/CAP/CapTest.Order.Host/Startup.cs‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
using CapTest.Shared;
33
using DotNetCore.CAP;
44
using Microsoft.EntityFrameworkCore;
5-
using Microsoft.OpenApi.Models;
5+
using Scalar.AspNetCore;
6+
using StackExchange.Redis;
67

78
namespace CapTest.Order.Host;
89

@@ -24,19 +25,23 @@ public Startup(IConfiguration configuration)
2425
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
2526
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
2627
{
27-
if (env.IsDevelopment())
28-
{
29-
_ = app.UseDeveloperExceptionPage();
30-
_ = app.UseSwagger();
31-
_ = app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "CapTest.Order.Host v1"));
32-
}
33-
3428
_ = app.UseHttpsRedirection();
3529

3630
_ = app.UseRouting();
3731

3832
_ = app.UseAuthorization();
3933

34+
if (env.IsDevelopment())
35+
{
36+
_ = app.UseDeveloperExceptionPage();
37+
_ = app.UseEndpoints(
38+
(builder) =>
39+
{
40+
_ = builder.MapOpenApi();
41+
_ = builder.MapScalarApiReference();
42+
});
43+
}
44+
4045
_ = app.UseEndpoints(
4146
endpoints =>
4247
{
@@ -51,11 +56,7 @@ public void ConfigureServices(IServiceCollection services)
5156
_ = services.AddTransient<OrderCreatedEventHandler>();
5257

5358
_ = services.AddControllers();
54-
_ = services.AddSwaggerGen(
55-
c =>
56-
{
57-
c.SwaggerDoc("v1", new OpenApiInfo { Title = "CapTest.Order.Host", Version = "v1" });
58-
});
59+
_ = services.AddOpenApi();
5960

6061
_ = services.AddDbContextPool<OrderDbContext>(
6162
builder => builder.UseNpgsql(Configuration.GetConnectionString(OrderConsts.DbContextConnName)));
@@ -68,14 +69,22 @@ public void ConfigureServices(IServiceCollection services)
6869

6970
_ = options.UseEntityFramework<OrderDbContext>(efOptions => efOptions.Schema = "cap");
7071

71-
_ = options.UseRabbitMQ(
72-
mqOptions =>
72+
//_ = options.UseRabbitMQ(
73+
// mqOptions =>
74+
// {
75+
// mqOptions.HostName = "localhost";
76+
// //mqOptions.Port = ;
77+
// //mqOptions.UserName = "";
78+
// //mqOptions.Password = "";
79+
// });
80+
81+
options.UseRedis(
82+
(redisOptions) =>
7383
{
74-
mqOptions.HostName = "localhost";
75-
//mqOptions.Port = ;
76-
//mqOptions.UserName = "";
77-
//mqOptions.Password = "";
84+
redisOptions.Configuration = ConfigurationOptions.Parse(
85+
Configuration.GetConnectionString("Redis")!);
7886
});
87+
7988
options.DefaultGroupName = OrderConsts.MessageGroupName;
8089

8190
_ = options.UseDashboard(dashboardOptions => dashboardOptions.PathMatch = "/cap");

‎src/plugins/CAP/CapTest.Order.Service/CapTest.Order.Service.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
6-
76
<ItemGroup>
8-
<PackageReference Include="DotNetCore.CAP" Version="8.3.3" />
9-
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="8.3.3" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
7+
<PackageReference Include="DotNetCore.CAP" Version="8.3.5" />
8+
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="8.3.5" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
1110
</ItemGroup>
1211

1312
<ItemGroup>

0 commit comments

Comments
 (0)