Skip to content

Commit b56f252

Browse files
meysamhadelimeysamhadeli
authored
Merge pull request #285 from meysamhadeli/feature/update-all-nuget-packages-to-last-versions
Feature/update all nuget packages to last versions
2 parents 43b6653 + c49bdfa commit b56f252

File tree

30 files changed

+150
-175
lines changed

30 files changed

+150
-175
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,4 +436,4 @@ fabric.properties
436436
*.jwk
437437

438438
# Monitoring
439-
.grafana-data
439+
**/grafana-data

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
- :sparkle: Using `Health Check` for `reporting` the `health` of app infrastructure components.
4848
- :sparkle: Using `Docker-Compose` and `Kubernetes` for our deployment mechanism.
4949
- :sparkle: Using `Kibana` on top of `Serilog` for `logging`.
50-
- :sparkle: Using `OpenTelemetry` for distributed tracing top of `Jaeger`.
51-
- :sparkle: Using `OpenTelemetry` for monitoring top of `Prometteuse` and `Grafana`.
50+
- :sparkle: Using `OpenTelemetry` for distributed tracing on top of `Jaeger`.
51+
- :sparkle: Using `OpenTelemetry` for monitoring on top of `Prometheus` and `Grafana`.
5252
- :sparkle: Using `IdentityServer` for authentication and authorization base on `OpenID-Connect` and `OAuth2`.
5353
- :sparkle: Using `Yarp` as a microservices `gateway`.
5454
- :sparkle: Using `Kubernetes` to achieve efficient `scaling` and ensure `high availability` for each of our microservices.

‎src/ApiGateway/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /src
33

44
# Setup working directory for the project
@@ -26,7 +26,7 @@ WORKDIR /src/ApiGateway/src
2626
# and no build, as we did it already
2727
RUN dotnet publish -c Release --no-build -o out
2828

29-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
29+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3030

3131
# Setup working directory for the project
3232
WORKDIR /app

‎src/ApiGateway/dev.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /src
33

44
# Setup working directory for the project
@@ -29,7 +29,7 @@ WORKDIR /src/ApiGateway/src
2929
RUN --mount=type=cache,id=gateway_nuget,target=/root/.nuget/packages \
3030
dotnet publish -c Release --no-build -o out
3131

32-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
32+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3333

3434
# Setup working directory for the project
3535
WORKDIR /app

‎src/ApiGateway/src/ApiGateway.csproj

-9
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,4 @@
99
<ProjectReference Include="..\..\BuildingBlocks\BuildingBlocks.csproj" />
1010
</ItemGroup>
1111

12-
<ItemGroup>
13-
<PackageReference Update="AsyncFixer" Version="1.6.0" />
14-
<PackageReference Update="Meziantou.Analyzer" Version="1.0.747" />
15-
<PackageReference Update="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27" />
16-
<PackageReference Update="Roslynator.Analyzers" Version="4.1.2" />
17-
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.2.0" />
18-
<PackageReference Update="Roslynator.CodeAnalysis.Analyzers" Version="4.1.2" />
19-
</ItemGroup>
20-
2112
</Project>

‎src/BuildingBlocks/BuildingBlocks.csproj

+93-106
Large diffs are not rendered by default.

‎src/BuildingBlocks/Web/BaseController.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using Asp.Versioning;
2-
using AutoMapper;
32
using MediatR;
43
using Microsoft.AspNetCore.Mvc;
54
using Microsoft.Extensions.DependencyInjection;
65

76
namespace BuildingBlocks.Web;
87

8+
using MapsterMapper;
9+
910
[Route(BaseApiPath)]
1011
[ApiController]
1112
[ApiVersion("1.0")]

‎src/Services/Booking/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /
33

44
# Setup working directory for the project
@@ -27,7 +27,7 @@ WORKDIR /Services/Booking/src/Booking.Api
2727
# and no build, as we did it already
2828
RUN dotnet publish -c Release --no-build -o out
2929

30-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
30+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3131

3232
# Setup working directory for the project
3333
WORKDIR /

‎src/Services/Booking/dev.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /
33

44
# Setup working directory for the project
@@ -30,7 +30,7 @@ WORKDIR /Services/Booking/src/Booking.Api
3030
RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages\
3131
dotnet publish -c Release --no-build -o out
3232

33-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
33+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3434

3535
# Setup working directory for the project
3636
WORKDIR /

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Grpc.Tools" Version="2.51.0">
10+
<PackageReference Include="Grpc.Tools" Version="2.62.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

‎src/Services/Booking/src/Booking/Extensions/Infrastructure/MediatRExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static class MediatRExtensions
99
{
1010
public static IServiceCollection AddCustomMediatR(this IServiceCollection services)
1111
{
12-
services.AddMediatR(typeof(BookingRoot).Assembly);
12+
services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(typeof(BookingRoot).Assembly));
1313
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
1414
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));
1515

‎src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="xunit" Version="2.7.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Services/Flight/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /
33

44
# Setup working directory for the project
@@ -27,7 +27,7 @@ WORKDIR /Services/Flight/src/Flight.Api
2727
# and no build, as we did it already
2828
RUN dotnet publish -c Release --no-build -o out
2929

30-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
30+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3131

3232
# Setup working directory for the project
3333
WORKDIR /

‎src/Services/Flight/dev.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /
33

44
# Setup working directory for the project
@@ -30,7 +30,7 @@ WORKDIR /Services/Flight/src/Flight.Api
3030
RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
3131
dotnet publish -c Release --no-build -o out
3232

33-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
33+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3434

3535
# Setup working directory for the project
3636
WORKDIR /

‎src/Services/Flight/src/Flight/Extensions/Infrastructure/MediatRExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class MediatRExtensions
1111
{
1212
public static IServiceCollection AddCustomMediatR(this IServiceCollection services)
1313
{
14-
services.AddMediatR(typeof(FlightRoot).Assembly);
14+
services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(typeof(FlightRoot).Assembly));
1515
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
1616
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));
1717
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(EfTxBehavior<,>));

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
10-
<PackageReference Include="Grpc.Net.Client" Version="2.51.0" />
11-
<PackageReference Include="Grpc.Tools" Version="2.51.0">
9+
<PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
10+
<PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
11+
<PackageReference Include="Grpc.Tools" Version="2.62.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

‎src/Services/Flight/tests/EndToEndTest/EndToEnd.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
18-
<PackageReference Include="xunit" Version="2.4.2" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
18+
<PackageReference Include="xunit" Version="2.7.0" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="xunit" Version="2.7.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="xunit" Version="2.7.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Services/Identity/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22

33
# Setup working directory for the project
44
WORKDIR /
@@ -26,7 +26,7 @@ WORKDIR /Services/Identity/src/Identity.Api
2626
# and no build, as we did it already
2727
RUN dotnet publish -c Release --no-build -o out
2828

29-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
29+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3030

3131
# Setup working directory for the project
3232
WORKDIR /

‎src/Services/Identity/dev.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22

33
# Setup working directory for the project
44
WORKDIR /
@@ -29,7 +29,7 @@ WORKDIR /Services/Identity/src/Identity.Api
2929
RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
3030
dotnet publish -c Release --no-build -o out
3131

32-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
32+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3333

3434
# Setup working directory for the project
3535
WORKDIR /

‎src/Services/Identity/src/Identity.Api/Identity.Api.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="..\Identity\Identity.csproj" />
11-
</ItemGroup>
12-
13-
<ItemGroup>
14-
<_ContentIncludedByDefault Remove="keys\is-signing-key-C01EF7C986B61650360AFA59291E65BC.json" />
10+
<ProjectReference Include="..\Identity\Identity.csproj"/>
1511
</ItemGroup>
1612

1713
</Project>

‎src/Services/Identity/src/Identity/Extensions/Infrastructure/MediatRExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class MediatRExtensions
1111
{
1212
public static IServiceCollection AddCustomMediatR(this IServiceCollection services)
1313
{
14-
services.AddMediatR(typeof(IdentityRoot).Assembly);
14+
services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(typeof(IdentityRoot).Assembly));
1515
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
1616
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));
1717

‎src/Services/Identity/src/Identity/Identity.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>

‎src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="xunit" Version="2.7.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Services/Passenger/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /
33

44
# Setup working directory for the project
@@ -27,7 +27,7 @@ WORKDIR /Services/Passenger/src/Passenger.Api
2727
# and no build, as we did it already
2828
RUN dotnet publish -c Release --no-build -o out
2929

30-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
30+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3131

3232
# Setup working directory for the project
3333
WORKDIR /

‎src/Services/Passenger/dev.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview AS builder
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
22
WORKDIR /
33

44
# Setup working directory for the project
@@ -30,7 +30,7 @@ WORKDIR /Services/Passenger/src/Passenger.Api
3030
RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
3131
dotnet publish -c Release --no-build -o out
3232

33-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview
33+
FROM mcr.microsoft.com/dotnet/aspnet:8.0
3434

3535
# Setup working directory for the project
3636
WORKDIR /

‎src/Services/Passenger/src/Passenger/Extensions/Infrastructure/MediatRExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class MediatRExtensions
1010
{
1111
public static IServiceCollection AddCustomMediatR(this IServiceCollection services)
1212
{
13-
services.AddMediatR(typeof(PassengerRoot).Assembly);
13+
services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(typeof(PassengerRoot).Assembly));
1414
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
1515
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(LoggingBehavior<,>));
1616
services.AddTransient(typeof(IPipelineBehavior<,>), typeof(EfTxBehavior<,>));

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
10+
<PackageReference Include="Grpc.AspNetCore" Version="2.62.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>

‎src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17-
<PackageReference Include="xunit" Version="2.4.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageReference Include="xunit" Version="2.7.0" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

0 commit comments

Comments
 (0)