migrate catalog api

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DebugType>portable</DebugType>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>Catalog.API</AssemblyName>

src/Services/Catalog/Catalog.API/Dockerfile

@@ -1,9 +1,9 @@
-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
 EXPOSE 443
 
-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/Catalog/Catalog.API/Program.cs

@@ -1,9 +1,9 @@
-using Autofac.Extensions.DependencyInjection;
+using Catalog.API.Extensions;
-using Catalog.API.Extensions;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
+using Microsoft.eShopOnContainers.Services.Catalog.API;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,30 +12,19 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Serilog;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 
-namespace Microsoft.eShopOnContainers.Services.Catalog.API
-{
-    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);
+    Log.Information("Configuring web host ({ApplicationContext})...", Program.AppName);
     var host = CreateHostBuilder(configuration, args);
 
-                Log.Information("Applying migrations ({ApplicationContext})...", AppName);
+    Log.Information("Applying migrations ({ApplicationContext})...", Program.AppName);
     host.MigrateDbContext<CatalogContext>((context, services) =>
     {
         var env = services.GetService<IWebHostEnvironment>();
@@ -48,23 +37,22 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
     })
     .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
 
-                Log.Information("Starting web host ({ApplicationContext})...", AppName);
+    Log.Information("Starting web host ({ApplicationContext})...", Program.AppName);
     host.Run();
 
     return 0;
 }
 catch (Exception ex)
 {
-                Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
+    Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", Program.AppName);
     return 1;
 }
 finally
 {
     Log.CloseAndFlush();
 }
-        }
 
-        private static IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) =>
+IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) =>
   WebHost.CreateDefaultBuilder(args)
       .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
       .CaptureStartupErrors(false)
@@ -87,13 +75,13 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.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()
         .MinimumLevel.Verbose()
-                .Enrich.WithProperty("ApplicationContext", AppName)
+        .Enrich.WithProperty("ApplicationContext", Program.AppName)
         .Enrich.FromLogContext()
         .WriteTo.Console()
         .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
@@ -102,14 +90,14 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
         .CreateLogger();
 }
 
-        private static (int httpPort, int grpcPort) GetDefinedPorts(IConfiguration config)
+(int httpPort, int grpcPort) GetDefinedPorts(IConfiguration config)
 {
     var grpcPort = config.GetValue("GRPC_PORT", 81);
     var port = config.GetValue("PORT", 80);
     return (port, grpcPort);
 }
 
-        private static IConfiguration GetConfiguration()
+IConfiguration GetConfiguration()
 {
     var builder = new ConfigurationBuilder()
         .SetBasePath(Directory.GetCurrentDirectory())
@@ -128,5 +116,9 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
 
     return builder.Build();
 }
-    }
+
+public static class Program
+{
+    public static string Namespace = typeof(Startup).Namespace;
+    public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
 }

src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>