update nuget package and adapt dockerfile to .net 6 (#639)
This commit is contained in:
@@ -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.
|
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
|
> ### 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.
|
> #### Older versions are tagged.
|
||||||
|
|
||||||
## Topics (eBook TOC)
|
## Topics (eBook TOC)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="BlazorInputFile" Version="0.2.0" />
|
<PackageReference Include="BlazorInputFile" Version="0.2.0" />
|
||||||
<PackageReference Include="FluentValidation" Version="10.3.4" />
|
<PackageReference Include="FluentValidation" Version="10.3.5" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
|
#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
|
WORKDIR /app
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 443
|
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
|
WORKDIR /app
|
||||||
COPY . .
|
COPY . .
|
||||||
#COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"]
|
#COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"]
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
|
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
|
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
|
||||||
|
|
||||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
|
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#
|
#
|
||||||
# RUN COMMAND
|
# RUN COMMAND
|
||||||
# docker run --name eshopweb --rm -it -p 5106:5106 web
|
# 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
|
WORKDIR /app
|
||||||
|
|
||||||
COPY *.sln .
|
COPY *.sln .
|
||||||
@@ -17,7 +17,7 @@ RUN dotnet restore
|
|||||||
|
|
||||||
RUN dotnet publish -c Release -o out
|
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
|
WORKDIR /app
|
||||||
COPY --from=build /app/src/Web/out ./
|
COPY --from=build /app/src/Web/out ./
|
||||||
|
|
||||||
|
|||||||
16
src/Web/key-768c1632-cf7b-41a9-bb7a-bff228ae8fba.xml
Normal file
16
src/Web/key-768c1632-cf7b-41a9-bb7a-bff228ae8fba.xml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<key id="768c1632-cf7b-41a9-bb7a-bff228ae8fba" version="1">
|
||||||
|
<creationDate>2021-12-01T14:37:52.0438755Z</creationDate>
|
||||||
|
<activationDate>2021-12-01T14:37:52.0246578Z</activationDate>
|
||||||
|
<expirationDate>2022-03-01T14:37:52.0246578Z</expirationDate>
|
||||||
|
<descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
|
||||||
|
<descriptor>
|
||||||
|
<encryption algorithm="AES_256_CBC" />
|
||||||
|
<validation algorithm="HMACSHA256" />
|
||||||
|
<masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
|
||||||
|
<!-- Warning: the key below is in an unencrypted form. -->
|
||||||
|
<value>PF3GdfO7PnvHYvXyD5nxmoQ91pY9qfA0rjRsdXHdUQbE1Mg9Xok2gXLY2zn8XemsySH37UGrGknht8u/PlehWg==</value>
|
||||||
|
</masterKey>
|
||||||
|
</descriptor>
|
||||||
|
</descriptor>
|
||||||
|
</key>
|
||||||
Reference in New Issue
Block a user