Skip to content

Commit 386539b

Browse files
Fixed transitive deps
1 parent 6723600 commit 386539b

File tree

31 files changed

+73
-94
lines changed

31 files changed

+73
-94
lines changed

Shared.slnx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
<File Path=".nuget/publish.ps1" />
99
</Folder>
1010
<Folder Name="/Abstractions/">
11-
<Project Path="TaskHub.Shared.Persistence/TaskHub.Shared.Persistence.csproj" Id="a4b53242-b54d-4470-ab91-e7045a683888" />
11+
<Project Path="TaskHub.Shared.Persistence.Abstractions/TaskHub.Shared.Persistence.Abstractions.csproj" />
1212
<Project Path="TaskHub.Shared.Primitives/TaskHub.Shared.Primitives.csproj" />
1313
<Project Path="TaskHub.Shared.Response/TaskHub.Shared.Response.csproj" />
1414
</Folder>
1515
<Folder Name="/Authorization/">
1616
<Project Path="TaskHub.Shared.Authorization.Abstractions/TaskHub.Shared.Authorization.Abstractions.csproj" Id="f264dfba-c7d1-4ae9-b715-a4ae655a2b94" />
1717
<Project Path="TaskHub.Shared.Authorization.Identity/TaskHub.Shared.Authorization.Identity.csproj" Id="e504d3d9-9465-43fd-a1c8-86b896225084" />
1818
</Folder>
19-
<Folder Name="/Client/">
20-
<Project Path="TaskHub.Shared.Client.WebApi/TaskHub.Shared.Client.WebApi.csproj" />
21-
</Folder>
2219
<Folder Name="/Commands/">
2320
<Project Path="TaskHub.Shared.Commands.Abstractions/TaskHub.Shared.Commands.Abstractions.csproj" Id="6db7c998-24a5-4b97-8aae-a3e725e04d25" />
2421
<Project Path="TaskHub.Shared.Commands.Bus/TaskHub.Shared.Commands.Bus.csproj" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<ProjectReference Include="..\TaskHub.Shared.Primitives\TaskHub.Shared.Primitives.csproj" />
3+
<ProjectReference Include="..\TaskHub.Shared.Primitives\TaskHub.Shared.Primitives.csproj" PrivateAssets="all" />
44
</ItemGroup>
55
</Project>

TaskHub.Shared.Authorization.Identity/TaskHub.Shared.Authorization.Identity.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
</ItemGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10" />
8-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
9-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
7+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" PrivateAssets="all" />
9+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" PrivateAssets="all" />
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="..\TaskHub.Shared.Authorization.Abstractions\TaskHub.Shared.Authorization.Abstractions.csproj" />
14-
<ProjectReference Include="..\TaskHub.Shared.ConfigurationTools\TaskHub.Shared.ConfigurationTools.csproj" />
15-
<ProjectReference Include="..\TaskHub.Shared.Primitives\TaskHub.Shared.Primitives.csproj" />
13+
<ProjectReference Include="..\TaskHub.Shared.Authorization.Abstractions\TaskHub.Shared.Authorization.Abstractions.csproj" PrivateAssets="all" />
14+
<ProjectReference Include="..\TaskHub.Shared.ConfigurationTools\TaskHub.Shared.ConfigurationTools.csproj" PrivateAssets="all" />
15+
<ProjectReference Include="..\TaskHub.Shared.Primitives\TaskHub.Shared.Primitives.csproj" PrivateAssets="all" />
1616
</ItemGroup>
1717
</Project>

TaskHub.Shared.Client.WebApi/AppHostBuilder.cs renamed to TaskHub.Shared.Bootstraper/BasicHostBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
using Microsoft.Extensions.Hosting;
44
using System.Text.Json.Serialization;
55

6-
namespace TaskHub.Shared.Client.WebApi;
6+
namespace TaskHub.Shared.Bootstraper;
77

8-
public class AppHostBuilder(string[] args)
8+
public class BasicHostBuilder(string[] args)
99
{
1010
private readonly WebApplicationBuilder Builder = WebApplication.CreateBuilder(args);
1111

12-
public AppHostBuilder Init(Action<WebApplicationBuilder> action)
12+
public BasicHostBuilder Init(Action<WebApplicationBuilder> action)
1313
{
1414
Builder.Services.AddControllers().AddJsonOptions(o => o.JsonSerializerOptions.PropertyNameCaseInsensitive = true);
1515
Builder.Services.AddEndpointsApiExplorer();
@@ -22,7 +22,7 @@ public AppHostBuilder Init(Action<WebApplicationBuilder> action)
2222
return this;
2323
}
2424

25-
public AppHostBuilder Run(Action<WebApplication> action)
25+
public BasicHostBuilder Run(Action<WebApplication> action)
2626
{
2727
var app = Builder.Build();
2828

TaskHub.Shared.Bootstraper/FullHostBuilder.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using Microsoft.EntityFrameworkCore;
33
using Microsoft.Extensions.DependencyInjection;
44
using TaskHub.Shared.Authorization.Identity.Bootstrap;
5+
using TaskHub.Shared.Bootstraper.Options;
56
using TaskHub.Shared.Bootstraper.Settings;
6-
using TaskHub.Shared.Client.WebApi;
77
using TaskHub.Shared.Commands.Abstractions.Bus;
88
using TaskHub.Shared.Commands.Bus;
99
using TaskHub.Shared.Infrastructure.EfCore.Bootstrap;
@@ -34,10 +34,10 @@ public void StartWith<TContext>(Action<HostOptions> action) where TContext : DbC
3434
{
3535
var options = new HostOptions();
3636
action(options);
37-
new AppHostBuilder(args).Init(builder =>
37+
new BasicHostBuilder(args).Init(builder =>
3838
{
3939
builder.Services.AddScoped<ICommandsBus, CommandsBus>();
40-
builder.AddAppDbContext<TContext>(o => o.ConnectionString = options.ConnectionString);
40+
builder.Services.AddAppDbContext<TContext>(builder.Configuration, o => o.ConnectionString = options.ConnectionString);
4141
builder.AddAppAuthentication();
4242
builder.AddAuthorizationService();
4343
builder.AddAppOpenTelemetry();
@@ -49,10 +49,10 @@ public void StartWith<TContext>(Action<HostOptions> action) where TContext : DbC
4949
});
5050

5151
_initAct(builder);
52-
}).Run(app =>
52+
}).Run(async app =>
5353
{
5454
app.UseOpenTelemetryPrometheusScrapingEndpoint();
55-
app.Migrate<TContext>();
55+
await app.Services.MigrateAsync<TContext>();
5656
_runAct(app);
5757
});
5858
}

TaskHub.Shared.Bootstraper/HostOptions.cs renamed to TaskHub.Shared.Bootstraper/Options/HostOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using TaskHub.Shared.Scrutor;
22

3-
namespace TaskHub.Shared.Bootstraper;
3+
namespace TaskHub.Shared.Bootstraper.Options;
44

55
public class HostOptions
66
{

TaskHub.Shared.Bootstraper/TaskHub.Shared.Bootstraper.csproj

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
</ItemGroup>
66

77
<ItemGroup>
8-
<ProjectReference Include="..\TaskHub.Shared.Authorization.Identity\TaskHub.Shared.Authorization.Identity.csproj" />
9-
<ProjectReference Include="..\TaskHub.Shared.Client.WebApi\TaskHub.Shared.Client.WebApi.csproj" />
10-
<ProjectReference Include="..\TaskHub.Shared.Commands.Abstractions\TaskHub.Shared.Commands.Abstractions.csproj" />
11-
<ProjectReference Include="..\TaskHub.Shared.Commands.Bus\TaskHub.Shared.Commands.Bus.csproj" />
12-
<ProjectReference Include="..\TaskHub.Shared.ConfigurationTools\TaskHub.Shared.ConfigurationTools.csproj" />
13-
<ProjectReference Include="..\TaskHub.Shared.Infrastructure.EfCore\TaskHub.Shared.Infrastructure.EfCore.csproj" />
14-
<ProjectReference Include="..\TaskHub.Shared.OpenTelemetry\TaskHub.Shared.OpenTelemetry.csproj" />
15-
<ProjectReference Include="..\TaskHub.Shared.Redis\TaskHub.Shared.Redis.csproj" />
16-
<ProjectReference Include="..\TaskHub.Shared.Response\TaskHub.Shared.Response.csproj" />
17-
<ProjectReference Include="..\TaskHub.Shared.Swagger\TaskHub.Shared.Swagger.csproj" />
18-
<ProjectReference Include="..\TaskHub.SharedScrutor\TaskHub.Shared.Scrutor.csproj" />
8+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Authorization.Identity\TaskHub.Shared.Authorization.Identity.csproj" />
9+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Commands.Abstractions\TaskHub.Shared.Commands.Abstractions.csproj" />
10+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Commands.Bus\TaskHub.Shared.Commands.Bus.csproj" />
11+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.ConfigurationTools\TaskHub.Shared.ConfigurationTools.csproj" />
12+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Infrastructure.EfCore\TaskHub.Shared.Infrastructure.EfCore.csproj" />
13+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.OpenTelemetry\TaskHub.Shared.OpenTelemetry.csproj" />
14+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Redis\TaskHub.Shared.Redis.csproj" />
15+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Response\TaskHub.Shared.Response.csproj" />
16+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.Shared.Swagger\TaskHub.Shared.Swagger.csproj" />
17+
<ProjectReference PrivateAssets="all" Include="..\TaskHub.SharedScrutor\TaskHub.Shared.Scrutor.csproj" />
1918
</ItemGroup>
2019
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<ProjectReference Include="..\TaskHub.Shared.Response\TaskHub.Shared.Response.csproj" />
3+
<ProjectReference Include="..\TaskHub.Shared.Response\TaskHub.Shared.Response.csproj" PrivateAssets="all" />
44
</ItemGroup>
55
</Project>

TaskHub.Shared.Commands.Bus/TaskHub.Shared.Commands.Bus.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</ItemGroup>
55

66
<ItemGroup>
7-
<ProjectReference Include="..\TaskHub.Shared.Commands.Abstractions\TaskHub.Shared.Commands.Abstractions.csproj" />
8-
<ProjectReference Include="..\TaskHub.Shared.Response\TaskHub.Shared.Response.csproj" />
7+
<ProjectReference Include="..\TaskHub.Shared.Commands.Abstractions\TaskHub.Shared.Commands.Abstractions.csproj" PrivateAssets="all" />
8+
<ProjectReference Include="..\TaskHub.Shared.Response\TaskHub.Shared.Response.csproj" PrivateAssets="all" />
99
</ItemGroup>
1010
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
3+
<PackageReference PrivateAssets="all" Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
44
</ItemGroup>
55
</Project>

0 commit comments

Comments
 (0)