Skip to content

Commit a882b3c

Browse files
meysamhadelimeysamhadeli
authored
Merge pull request #373 from meysamhadeli/fix/fix-ci
fix: fix ci failed
2 parents 0f66c14 + 14cc9e7 commit a882b3c

13 files changed

Lines changed: 35 additions & 24 deletions

File tree

‎Directory.Build.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

9+
<PropertyGroup>
10+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
11+
</PropertyGroup>
12+
913
<ItemGroup>
1014
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Version="1.1.118">
1115
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/ApiGateway/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ COPY ./Directory.Build.props ./
88
# Setup working directory for the project
99
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./building-blocks/
1010
COPY ./src/ApiGateway/src/ApiGateway.csproj ./src/ApiGateway/src/
11-
11+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1212

1313
# Restore nuget packages
1414
RUN dotnet restore ./src/ApiGateway/src/ApiGateway.csproj
1515

1616
# Copy project files
1717
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
1818
COPY ./src/ApiGateway/src ./src/ApiGateway/src/
19+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
1920

2021
# Build project with Release configuration
2122
# and no restore, as we did it already

‎src/Aspire/src/ServiceDefaults/Extensions.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ public static IHostApplicationBuilder AddServiceDefaults(this WebApplicationBuil
1515
builder.Services.AddServiceDiscovery();
1616

1717
builder.Services.ConfigureHttpClientDefaults(http =>
18-
{
19-
http.AddStandardResilienceHandler(options =>
20-
{
21-
var timeSpan = TimeSpan.FromMinutes(1);
22-
options.CircuitBreaker.SamplingDuration = timeSpan * 2;
23-
options.TotalRequestTimeout.Timeout = timeSpan * 3;
24-
options.Retry.MaxRetryAttempts = 3;
25-
});
18+
{
19+
http.AddStandardResilienceHandler(options =>
20+
{
21+
var timeSpan = TimeSpan.FromMinutes(1);
22+
options.CircuitBreaker.SamplingDuration = timeSpan * 2;
23+
options.TotalRequestTimeout.Timeout = timeSpan * 3;
24+
options.Retry.MaxRetryAttempts = 3;
25+
});
2626

27-
// Turn on service discovery by default
28-
http.AddServiceDiscovery();
29-
});
27+
// Turn on service discovery by default
28+
http.AddServiceDiscovery();
29+
});
3030

3131
return builder;
3232
}
@@ -38,4 +38,4 @@ public static WebApplication UseServiceDefaults(this WebApplication app)
3838

3939
return app;
4040
}
41-
}
41+
}

‎src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
10+
<ProjectReference Include="..\..\..\BuildingBlocks\BuildingBlocks.csproj" IsAspireProjectResource="false" />
1111
</ItemGroup>
1212

1313
</Project>

‎src/Services/Booking/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
99
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
1010
COPY ./src/Services/Booking/src/Booking/Booking.csproj ./src/Services/Booking/src/Booking/
1111
COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./src/Services/Booking/src/Booking.Api/
12-
12+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1313

1414
# Restore nuget packages
1515
RUN dotnet restore ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj
@@ -18,6 +18,7 @@ RUN dotnet restore ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj
1818
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
1919
COPY ./src/Services/Booking/src/Booking/ ./src/Services/Booking/src/Booking/
2020
COPY ./src/Services/Booking/src/Booking.Api/ ./src/Services/Booking/src/Booking.Api/
21+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
2122

2223
# Build project with Release configuration
2324
# and no restore, as we did it already

‎src/Services/Booking/dev.Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
99
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
1010
COPY ./src/Services/Booking/src/Booking/Booking.csproj ./src/Services/Booking/src/Booking/
1111
COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./src/Services/Booking/src/Booking.Api/
12-
12+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1313

1414
# Restore nuget packages
1515
RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages \
@@ -19,6 +19,7 @@ RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages \
1919
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
2020
COPY ./src/Services/Booking/src/Booking/ ./src/Services/Booking/src/Booking/
2121
COPY ./src/Services/Booking/src/Booking.Api/ ./src/Services/Booking/src/Booking.Api/
22+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
2223

2324
# Build project with Release configuration
2425
# and no restore, as we did it already

‎src/Services/Flight/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
99
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
1010
COPY ./src/Services/Flight/src/Flight/Flight.csproj ./src/Services/Flight/src/Flight/
1111
COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./src/Services/Flight/src/Flight.Api/
12-
12+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1313

1414
# Restore nuget packages
1515
RUN dotnet restore ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj
@@ -18,6 +18,7 @@ RUN dotnet restore ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj
1818
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
1919
COPY ./src/Services/Flight/src/Flight/ ./src/Services/Flight/src/Flight/
2020
COPY ./src/Services/Flight/src/Flight.Api/ ./src/Services/Flight/src/Flight.Api/
21+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
2122

2223
# Build project with Release configuration
2324
# and no restore, as we did it already

‎src/Services/Flight/dev.Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY ./Directory.Build.props ./
99
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
1010
COPY ./src/Services/Flight/src/Flight/Flight.csproj ./src/Services/Flight/src/Flight/
1111
COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./src/Services/Flight/src/Flight.Api/
12-
12+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1313

1414
# Restore nuget packages
1515
RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
@@ -19,6 +19,7 @@ RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
1919
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
2020
COPY ./src/Services/Flight/src/Flight/ ./src/Services/Flight/src/Flight/
2121
COPY ./src/Services/Flight/src/Flight.Api/ ./src/Services/Flight/src/Flight.Api/
22+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
2223

2324
# Build project with Release configuration
2425
# and no restore, as we did it already

‎src/Services/Identity/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ COPY ./Directory.Build.props ./
1010
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
1111
COPY ./src/Services/Identity/src/Identity/Identity.csproj ./src/Services/Identity/src/Identity/
1212
COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./src/Services/Identity/src/Identity.Api/
13+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1314

1415
# Restore nuget packages
1516
RUN dotnet restore ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj
@@ -18,6 +19,7 @@ RUN dotnet restore ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj
1819
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
1920
COPY ./src/Services/Identity/src/Identity/ ./src/Services/Identity/src/Identity/
2021
COPY ./src/Services/Identity/src/Identity.Api/ ./src/Services/Identity/src/Identity.Api/
22+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
2123

2224
# Build project with Release configuration
2325
# and no restore, as we did it already

‎src/Services/Identity/dev.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ COPY ./Directory.Build.props ./
1010
COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./src/BuildingBlocks/
1111
COPY ./src/Services/Identity/src/Identity/Identity.csproj ./src/Services/Identity/src/Identity/
1212
COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./src/Services/Identity/src/Identity.Api/
13+
COPY ./src/Aspire/src/ServiceDefaults/ServiceDefaults.csproj ./src/Aspire/src/ServiceDefaults/
1314

1415
# Restore nuget packages
1516
RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
@@ -19,6 +20,7 @@ RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
1920
COPY ./src/BuildingBlocks ./src/BuildingBlocks/
2021
COPY ./src/Services/Identity/src/Identity/ ./src/Services/Identity/src/Identity/
2122
COPY ./src/Services/Identity/src/Identity.Api/ ./src/Services/Identity/src/Identity.Api/
23+
COPY ./src/Aspire/src/ServiceDefaults/ ./src/Aspire/src/ServiceDefaults/
2224

2325
# Build project with Release configuration
2426
# and no restore, as we did it already

0 commit comments

Comments
 (0)
⚡