net5

src/Services/Identity/Identity.API/Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>

src/Services/Identity/Identity.API/Program.cs

@@ -1,6 +1,7 @@
 using IdentityServer4.EntityFramework.DbContexts;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.eShopOnContainers.Services.Identity.API;
 using Microsoft.eShopOnContainers.Services.Identity.API.Data;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,21 +12,15 @@ using Serilog;
 using System;
 using System.IO;
 
-namespace Microsoft.eShopOnContainers.Services.Identity.API
+string Namespace = typeof(Startup).Namespace;
+string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
+
+var configuration = GetConfiguration();
+
+Log.Logger = CreateSerilogLogger(configuration);
+
+try
 {
-    public class Program
-    {
-        public static readonly string Namespace = typeof(Program).Namespace;
-        public static readonly string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
-
-        public static int Main(string[] args)
-        {
-            var configuration = GetConfiguration();
-
-            Log.Logger = CreateSerilogLogger(configuration);
-
-            try
-            {
     Log.Information("Configuring web host ({ApplicationContext})...", AppName);
     var host = BuildWebHost(configuration, args);
 
@@ -52,19 +47,18 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
     host.Run();
 
     return 0;
-            }
+}
-            catch (Exception ex)
+catch (Exception ex)
-            {
+{
     Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
     return 1;
-            }
+}
-            finally
+finally
-            {
+{
     Log.CloseAndFlush();
-            }
+}
-        }
 
-        private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
+IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
     WebHost.CreateDefaultBuilder(args)
         .CaptureStartupErrors(false)
         .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
@@ -73,8 +67,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
         .UseSerilog()
         .Build();
 
-        private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
+Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
-        {
+{
     var seqServerUrl = configuration["Serilog:SeqServerUrl"];
     var logstashUrl = configuration["Serilog:LogstashgUrl"];
     return new LoggerConfiguration()
@@ -86,10 +80,10 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
         .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://localhost:8080" : logstashUrl)
         .ReadFrom.Configuration(configuration)
         .CreateLogger();
-        }
+}
 
-        private static IConfiguration GetConfiguration()
+IConfiguration GetConfiguration()
-        {
+{
     var builder = new ConfigurationBuilder()
         .SetBasePath(Directory.GetCurrentDirectory())
         .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
@@ -106,8 +100,4 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
     }
 
     return builder.Build();
-        }
-
-    }
 }
-