Skip to content

Commit 006ad9f

Browse files
meysamhadelimeysamhadeli
authored
Merge pull request #289 from meysamhadeli/develop
Develop
2 parents ccd6fcc + 965eb55 commit 006ad9f

File tree

8 files changed

+26
-67
lines changed

8 files changed

+26
-67
lines changed

‎deployments/docker-compose/docker-compose.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
#######################################################
4444
rabbitmq:
4545
container_name: rabbitmq
46-
image: rabbitmq:3-management
46+
image: rabbitmq:management
4747
restart: unless-stopped
4848
ports:
4949
- 5672:5672
@@ -76,7 +76,7 @@ services:
7676
#######################################################
7777
eventstore:
7878
container_name: eventstore
79-
image: eventstore/eventstore:21.2.0-buster-slim
79+
image: eventstore/eventstore:latest
8080
restart: unless-stopped
8181
environment:
8282
- EVENTSTORE_CLUSTER_SIZE=1
@@ -98,7 +98,7 @@ services:
9898
# Mongo
9999
#######################################################
100100
mongo:
101-
image: mongo:5
101+
image: mongo:latest
102102
container_name: mongo
103103
restart: unless-stopped
104104
# environment:
@@ -114,7 +114,7 @@ services:
114114
#######################################################
115115
elasticsearch:
116116
container_name: elasticsearch
117-
image: elasticsearch:7.17.9
117+
image: elasticsearch:latest
118118
restart: unless-stopped
119119
ports:
120120
- 9200:9200
@@ -133,7 +133,7 @@ services:
133133
#######################################################
134134
kibana:
135135
container_name: kibana
136-
image: kibana:7.17.9
136+
image: kibana:latest
137137
restart: unless-stopped
138138
ports:
139139
- 5601:5601

‎deployments/docker-compose/infrastructure.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
#######################################################
77
rabbitmq:
88
container_name: rabbitmq
9-
image: rabbitmq:3-management
9+
image: rabbitmq:management
1010
restart: unless-stopped
1111
ports:
1212
- 5672:5672
@@ -77,7 +77,7 @@ services:
7777

7878
eventstore:
7979
container_name: eventstore
80-
image: eventstore/eventstore:21.2.0-buster-slim
80+
image: eventstore/eventstore:latest
8181
restart: unless-stopped
8282
environment:
8383
- EVENTSTORE_CLUSTER_SIZE=1
@@ -99,7 +99,7 @@ services:
9999
# Mongo
100100
#######################################################
101101
mongo:
102-
image: mongo:5
102+
image: mongo:latest
103103
container_name: mongo
104104
restart: unless-stopped
105105
# environment:
@@ -116,7 +116,7 @@ services:
116116
#######################################################
117117
elasticsearch:
118118
container_name: elasticsearch
119-
image: elasticsearch:7.17.9
119+
image: elasticsearch:latest
120120
restart: unless-stopped
121121
ports:
122122
- 9200:9200
@@ -135,7 +135,7 @@ services:
135135
#######################################################
136136
kibana:
137137
container_name: kibana
138-
image: kibana:7.17.9
138+
image: kibana:latest
139139
restart: unless-stopped
140140
ports:
141141
- 5601:5601

‎src/BuildingBlocks/BuildingBlocks.csproj

+9-35
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,24 @@
1212
<PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
1313
<PackageReference Include="Asp.Versioning.Mvc" Version="8.1.0" />
1414
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
15+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
16+
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.1" />
17+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
18+
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
1519
<PackageReference Include="AspNetCore.HealthChecks.Elasticsearch" Version="8.0.1" />
1620
<PackageReference Include="AspNetCore.HealthChecks.EventStore" Version="8.0.1" />
1721
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.1" />
1822
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="8.0.1" />
1923
<PackageReference Include="AspNetCore.HealthChecks.UI.SQLite.Storage" Version="8.0.1" />
24+
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.1" />
25+
<PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
2026
<PackageReference Include="EasyCaching.Core" Version="1.9.2" />
2127
<PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
2228
<PackageReference Include="EasyNetQ.Management.Client" Version="2.0.0" />
2329
<PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
24-
<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.2" />
2530
<PackageReference Include="Figgle" Version="0.5.1" />
2631
<PackageReference Include="FluentValidation" Version="11.9.0" />
2732
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
28-
<PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
2933
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
3034
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
3135
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
@@ -34,18 +38,12 @@
3438
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
3539
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
3640
<PackageReference Include="Polly" Version="8.3.1" />
37-
<PackageReference Include="protobuf-net.BuildTools" Version="3.2.33">
38-
<PrivateAssets>all</PrivateAssets>
39-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
40-
</PackageReference>
4141
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
4242
<PackageReference Include="IdGen" Version="3.0.5" />
4343
<PackageReference Include="Mapster" Version="7.4.0" />
4444
<PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />
4545
<PackageReference Include="MediatR" Version="12.2.0" />
46-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
4746
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.3" />
48-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
4947
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
5048
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3" />
5149
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
@@ -55,12 +53,11 @@
5553
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
5654
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.3" />
5755
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
58-
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
56+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
5957
<PackageReference Include="MongoDB.Driver" Version="2.24.0" />
6058
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
6159
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.MassTransit" Version="1.0.0-beta2" />
6260
<PackageReference Include="Scrutor" Version="4.2.2" />
63-
<PackageReference Include="Scrutor.AspNetCore" Version="3.3.0" />
6461
<PackageReference Include="Sentry.Serilog" Version="4.2.1" />
6562
<PackageReference Include="Serilog" Version="3.1.1" />
6663
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
@@ -76,12 +73,6 @@
7673
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
7774
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
7875
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
79-
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.1" />
80-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
81-
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.1" />
82-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3" />
83-
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.1" />
84-
<PackageReference Include="System.Interactive.Async" Version="6.0.1" />
8576
<PackageReference Include="MassTransit" Version="8.2.0" />
8677
<PackageReference Include="MassTransit.RabbitMQ" Version="8.2.0" />
8778
<PackageReference Include="Duende.IdentityServer" Version="7.0.3" />
@@ -97,12 +88,8 @@
9788
<PackageReference Include="Testcontainers.PostgreSql" Version="3.8.0" />
9889
<PackageReference Include="Testcontainers.RabbitMq" Version="3.8.0" />
9990
<PackageReference Include="Unchase.Swashbuckle.AspNetCore.Extensions" Version="2.7.1" />
100-
<PackageReference Include="WebMotions.Fake.Authentication.JwtBearer" Version="8.0.1" />
10191
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
102-
<PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
10392

104-
<PackageReference Include="Jaeger" Version="1.0.3" />
105-
<PackageReference Include="OpenTracing" Version="0.12.1" />
10693
<PackageReference Include="prometheus-net" Version="8.2.1" />
10794
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
10895

@@ -112,26 +99,21 @@
11299
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
113100
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
114101

115-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
116-
<PrivateAssets>all</PrivateAssets>
117-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
118-
</PackageReference>
119-
120102
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.2.1" />
121-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
122103
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
123104

124-
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
125105
<PackageReference Include="AutoBogus" Version="2.13.1" />
126106
<PackageReference Include="Bogus" Version="35.5.0" />
127107
<PackageReference Include="FluentAssertions" Version="6.12.0" />
128108
<PackageReference Include="Respawn" Version="6.2.1" />
129109
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.3" />
130110
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
111+
<PackageReference Include="WebMotions.Fake.Authentication.JwtBearer" Version="8.0.1" />
131112

132113
<PackageReference Include="Google.Protobuf" Version="3.26.1" />
133114
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.62.0" />
134115

116+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28" />
135117
<PackageReference Update="Meziantou.Analyzer" Version="2.0.146" />
136118
<PackageReference Update="AsyncFixer" Version="1.6.0" />
137119
<PackageReference Update="Roslynator.Analyzers" Version="4.12.0" />
@@ -140,12 +122,4 @@
140122

141123
</ItemGroup>
142124

143-
144-
<ItemGroup>
145-
<Folder Include="Contracts" />
146-
<Folder Include="Core\Pagination" />
147-
<Folder Include="EventStoreDB\BackgroundWorkers" />
148-
<Folder Include="PersistMessageProcessor\Data\Configurations" />
149-
</ItemGroup>
150-
151125
</Project>

‎src/BuildingBlocks/TestBase/TestContainers.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public sealed class RabbitMqContainerOptions
114114
public string Name { get; set; } = "rabbitmq_" + Guid.NewGuid();
115115
public int Port { get; set; } = 5672;
116116
public int ApiPort { get; set; } = 15672;
117-
public string ImageName { get; set; } = "rabbitmq:3-management";
117+
public string ImageName { get; set; } = "rabbitmq:management";
118118
public string UserName { get; set; } = "guest";
119119
public string Password { get; set; } = "guest";
120120
}
@@ -141,7 +141,7 @@ public sealed class MongoContainerOptions
141141
{
142142
public string Name { get; set; } = "mongo_" + Guid.NewGuid().ToString("D");
143143
public int Port { get; set; } = 27017;
144-
public string ImageName { get; set; } = "mongo:5";
144+
public string ImageName { get; set; } = "mongo:latest";
145145
public string UserName { get; set; } = Guid.NewGuid().ToString("D");
146146
public string Password { get; set; } = Guid.NewGuid().ToString("D");
147147
}
@@ -150,6 +150,6 @@ public sealed class EventStoreContainerOptions
150150
{
151151
public string Name { get; set; } = "event_store_" + Guid.NewGuid().ToString("D");
152152
public int Port { get; set; } = 2113;
153-
public string ImageName { get; set; } = "eventstore/eventstore:21.2.0-buster-slim";
153+
public string ImageName { get; set; } = "eventstore/eventstore:latest";
154154
}
155155
}

‎src/Services/Booking/src/Booking/Booking.csproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

9+
<ItemGroup>
10+
<ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
11+
</ItemGroup>
12+
913
<ItemGroup>
1014
<PackageReference Include="Grpc.Tools" Version="2.62.0">
1115
<PrivateAssets>all</PrivateAssets>
@@ -17,17 +21,9 @@
1721
</PackageReference>
1822
</ItemGroup>
1923

20-
21-
<ItemGroup>
22-
<ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
23-
</ItemGroup>
24-
2524
<ItemGroup>
2625
<Protobuf Include="GrpcClient\Protos\flight.proto" GrpcServices="Both" />
2726
<Protobuf Include="GrpcClient\Protos\passenger.proto" GrpcServices="Both" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
3127
<Folder Include="GrpcClient\Protos" />
3228
</ItemGroup>
3329

‎src/Services/Flight/src/Flight.Api/Flight.Api.csproj

-6
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,4 @@
1010
<ProjectReference Include="..\Flight\Flight.csproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup>
14-
<Content Update="appsettings.test.json">
15-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
16-
</Content>
17-
</ItemGroup>
18-
1913
</Project>

‎src/Services/Flight/tests/UnitTest/Unit.Test.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,4 @@
2222
<ProjectReference Include="..\..\src\Flight.Api\Flight.Api.csproj" />
2323
</ItemGroup>
2424

25-
<ItemGroup>
26-
<InternalsVisibleTo Include="Flight" />
27-
</ItemGroup>
28-
2925
</Project>

‎src/Services/Passenger/src/Passenger/Passenger.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
<ItemGroup>
1818
<Folder Include="Data\Migrations" />
19-
<Folder Include="Identity\Consumers" />
2019
</ItemGroup>
2120

2221
<ItemGroup>

0 commit comments

Comments
 (0)