diff --git a/README.md b/README.md index 4374c34..4293827 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The **eShopOnWeb** sample is related to the [eShopOnContainers](https://github.c The goal for this sample is to demonstrate some of the principles and patterns described in the [eBook](https://aka.ms/webappebook). It is not meant to be an eCommerce reference application, and as such it does not implement many features that would be obvious and/or essential to a real eCommerce application. > ### VERSIONS -> #### The `master` branch is currently running ASP.NET Core 5.0. +> #### The `master` branch is currently running ASP.NET Core 6.0. > #### Older versions are tagged. ## Topics (eBook TOC) diff --git a/src/BlazorShared/BlazorShared.csproj b/src/BlazorShared/BlazorShared.csproj index 8f5269e..a8f1800 100644 --- a/src/BlazorShared/BlazorShared.csproj +++ b/src/BlazorShared/BlazorShared.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/PublicApi/Dockerfile b/src/PublicApi/Dockerfile index 9292461..f768db5 100644 --- a/src/PublicApi/Dockerfile +++ b/src/PublicApi/Dockerfile @@ -1,11 +1,11 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /app COPY . . #COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"] diff --git a/src/PublicApi/PublicApi.csproj b/src/PublicApi/PublicApi.csproj index a3a56a3..76b3b9c 100644 --- a/src/PublicApi/PublicApi.csproj +++ b/src/PublicApi/PublicApi.csproj @@ -26,7 +26,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Web/Dockerfile b/src/Web/Dockerfile index 6bc9cdc..9062398 100644 --- a/src/Web/Dockerfile +++ b/src/Web/Dockerfile @@ -7,7 +7,7 @@ # # RUN COMMAND # docker run --name eshopweb --rm -it -p 5106:5106 web -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /app COPY *.sln . @@ -17,7 +17,7 @@ RUN dotnet restore RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime WORKDIR /app COPY --from=build /app/src/Web/out ./ diff --git a/src/Web/key-768c1632-cf7b-41a9-bb7a-bff228ae8fba.xml b/src/Web/key-768c1632-cf7b-41a9-bb7a-bff228ae8fba.xml new file mode 100644 index 0000000..b8b27ae --- /dev/null +++ b/src/Web/key-768c1632-cf7b-41a9-bb7a-bff228ae8fba.xml @@ -0,0 +1,16 @@ + + + 2021-12-01T14:37:52.0438755Z + 2021-12-01T14:37:52.0246578Z + 2022-03-01T14:37:52.0246578Z + + + + + + + PF3GdfO7PnvHYvXyD5nxmoQ91pY9qfA0rjRsdXHdUQbE1Mg9Xok2gXLY2zn8XemsySH37UGrGknht8u/PlehWg== + + + + \ No newline at end of file