Skip to content

Commit 13fed89

Browse files
authored
update nuget package and adapt dockerfile to .net 6 (dotnet-architecture#639)
1 parent 6f5a6c0 commit 13fed89

File tree

6 files changed

+23
-7
lines changed

6 files changed

+23
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The **eShopOnWeb** sample is related to the [eShopOnContainers](https://github.c
2424
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.
2525

2626
> ### VERSIONS
27-
> #### The `master` branch is currently running ASP.NET Core 5.0.
27+
> #### The `master` branch is currently running ASP.NET Core 6.0.
2828
> #### Older versions are tagged.
2929
3030
## Topics (eBook TOC)

src/BlazorShared/BlazorShared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="BlazorInputFile" Version="0.2.0" />
11-
<PackageReference Include="FluentValidation" Version="10.3.4" />
11+
<PackageReference Include="FluentValidation" Version="10.3.5" />
1212
</ItemGroup>
1313

1414
</Project>

src/PublicApi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
44
WORKDIR /app
55
EXPOSE 80
66
EXPOSE 443
77

8-
FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
8+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
99
WORKDIR /app
1010
COPY . .
1111
#COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"]

src/PublicApi/PublicApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
29+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
3030
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
3131

3232
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />

src/Web/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
# RUN COMMAND
99
# docker run --name eshopweb --rm -it -p 5106:5106 web
10-
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
10+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
1111
WORKDIR /app
1212

1313
COPY *.sln .
@@ -17,7 +17,7 @@ RUN dotnet restore
1717

1818
RUN dotnet publish -c Release -o out
1919

20-
FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
20+
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
2121
WORKDIR /app
2222
COPY --from=build /app/src/Web/out ./
2323

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<key id="768c1632-cf7b-41a9-bb7a-bff228ae8fba" version="1">
3+
<creationDate>2021-12-01T14:37:52.0438755Z</creationDate>
4+
<activationDate>2021-12-01T14:37:52.0246578Z</activationDate>
5+
<expirationDate>2022-03-01T14:37:52.0246578Z</expirationDate>
6+
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
7+
<descriptor>
8+
<encryption algorithm="AES_256_CBC" />
9+
<validation algorithm="HMACSHA256" />
10+
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
11+
<!-- Warning: the key below is in an unencrypted form. -->
12+
<value>PF3GdfO7PnvHYvXyD5nxmoQ91pY9qfA0rjRsdXHdUQbE1Mg9Xok2gXLY2zn8XemsySH37UGrGknht8u/PlehWg==</value>
13+
</masterKey>
14+
</descriptor>
15+
</descriptor>
16+
</key>

0 commit comments

Comments
 (0)