Skip to content

Commit 151c159

Browse files
author
Borja García Rodríguez
committed
update net 5
1 parent 4e948d0 commit 151c159

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
66
WORKDIR /src
77

88
# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName>
66
<RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace>
77
<DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -15,20 +15,20 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.0.0" />
19-
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.0.0" />
20-
<PackageReference Include="Google.Protobuf" Version="3.11.2" />
21-
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.25.0" />
22-
<PackageReference Include="Grpc.Core" Version="2.25.0" />
23-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.25.0" />
24-
<PackageReference Include="Grpc.Tools" Version="2.25.0" PrivateAssets="All" />
25-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
18+
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.2" />
19+
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.1.2" />
20+
<PackageReference Include="Google.Protobuf" Version="3.14.0" />
21+
<PackageReference Include="Grpc.AspNetCore.Server.ClientFactory" Version="2.34.0" />
22+
<PackageReference Include="Grpc.Core" Version="2.34.0" />
23+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0" />
24+
<PackageReference Include="Grpc.Tools" Version="2.34.0" PrivateAssets="All" />
25+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.1" />
2626
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.0" />
29-
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" />
28+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.1" />
29+
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
3030
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00834" />
31-
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc5" />
31+
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public CatalogService(Catalog.CatalogClient client, ILogger<CatalogService> logg
2121
public async Task<CatalogItem> GetCatalogItemAsync(int id)
2222
{
2323
var request = new CatalogItemRequest { Id = id };
24-
_logger.LogInformation("grpc client created, request = {@request}", request);
24+
_logger.LogInformation("grpc request {@request}", request);
2525
var response = await _client.GetItemByIdAsync(request);
2626
_logger.LogInformation("grpc response {@response}", response);
2727
return MapToCatalogItemResponse(response);
@@ -31,7 +31,7 @@ public async Task<CatalogItem> GetCatalogItemAsync(int id)
3131
public async Task<IEnumerable<CatalogItem>> GetCatalogItemsAsync(IEnumerable<int> ids)
3232
{
3333
var request = new CatalogItemsRequest { Ids = string.Join(",", ids), PageIndex = 1, PageSize = 10 };
34-
_logger.LogInformation("grpc client created, request = {@request}", request);
34+
_logger.LogInformation("grpc request {@request}", request);
3535
var response = await _client.GetItemsByIdsAsync(request);
3636
_logger.LogInformation("grpc response {@response}", response);
3737
return response.Data.Select(this.MapToCatalogItemResponse);

0 commit comments

Comments
 (0)