Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/dotnet-architecture/eShopOnWeb

Browse Source
This commit is contained in:
Steve Smith
2021-12-02 16:04:43 -05:00
parent 833dc3bd3a 3a81dcfd84
commit a675f3ad57
12 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Web/Dockerfile
View File

@@ -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 ./

5
src/Web/HealthChecks/ApiHealthCheck.cs
View File

@@ -3,6 +3,7 @@ using System.Threading;
using System.Threading.Tasks;
using BlazorShared;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Options;
namespace Microsoft.eShopWeb.Web.HealthChecks;
@@ -10,9 +11,9 @@ public class ApiHealthCheck : IHealthCheck
{
private readonly BaseUrlConfiguration _baseUrlConfiguration;
public ApiHealthCheck(BaseUrlConfiguration baseUrlConfiguration)
public ApiHealthCheck(IOptions<BaseUrlConfiguration> baseUrlConfiguration)
{
_baseUrlConfiguration = baseUrlConfiguration;
_baseUrlConfiguration = baseUrlConfiguration.Value;
}
public async Task<HealthCheckResult> CheckHealthAsync(

6
src/Web/Startup.cs
View File

@@ -148,10 +148,10 @@ public class Startup
config.Path = "/allservices";
});
var configSection = Configuration.GetRequiredSection(BaseUrlConfiguration.CONFIG_NAME);
services.Configure<BaseUrlConfiguration>(configSection);
var baseUrlConfig = configSection.Get<BaseUrlConfiguration>();
var baseUrlConfig = new BaseUrlConfiguration();
Configuration.Bind(BaseUrlConfiguration.CONFIG_NAME, baseUrlConfig);
services.AddScoped<BaseUrlConfiguration>(sp => baseUrlConfig);
// Blazor Admin Required Services for Prerendering
services.AddScoped<HttpClient>(s => new HttpClient
{

16
src/Web/key-768c1632-cf7b-41a9-bb7a-bff228ae8fba.xml Normal file
View 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>