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/CatalogSettings.cs

@@ -2,11 +2,11 @@
 {
     public class CatalogSettings
     {
-        public string PicBaseUrl { get;set;}
+        public string PicBaseUrl { get; set; }
 
         public string EventBusConnection { get; set; }
 
         public bool UseCustomizationData { get; set; }
-	public bool AzureStorageEnabled { get; set; }
+        public bool AzureStorageEnabled { get; set; }
     }
 }

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,121 +12,113 @@ 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
+var configuration = GetConfiguration();
+
+Log.Logger = CreateSerilogLogger(configuration);
+
+try
 {
-    public class Program
+    Log.Information("Configuring web host ({ApplicationContext})...", Program.AppName);
+    var host = CreateHostBuilder(configuration, args);
+
+    Log.Information("Applying migrations ({ApplicationContext})...", Program.AppName);
+    host.MigrateDbContext<CatalogContext>((context, services) =>
     {
-        public static readonly string Namespace = typeof(Program).Namespace;
+        var env = services.GetService<IWebHostEnvironment>();
-        public static readonly string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
+        var settings = services.GetService<IOptions<CatalogSettings>>();
+        var logger = services.GetService<ILogger<CatalogContextSeed>>();
 
-        public static int Main(string[] args)
+        new CatalogContextSeed()
-        {
+                                            .SeedAsync(context, env, settings, logger)
-            var configuration = GetConfiguration();
+                                            .Wait();
+    })
+    .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
 
-            Log.Logger = CreateSerilogLogger(configuration);
+    Log.Information("Starting web host ({ApplicationContext})...", Program.AppName);
+    host.Run();
 
-            try
+    return 0;
-            {
+}
-                Log.Information("Configuring web host ({ApplicationContext})...", AppName);
+catch (Exception ex)
-                var host = CreateHostBuilder(configuration, args);
+{
-
+    Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", Program.AppName);
-                Log.Information("Applying migrations ({ApplicationContext})...", AppName);
+    return 1;
-                host.MigrateDbContext<CatalogContext>((context, services) =>
+}
-                {
+finally
-                    var env = services.GetService<IWebHostEnvironment>();
+{
-                    var settings = services.GetService<IOptions<CatalogSettings>>();
+    Log.CloseAndFlush();
-                    var logger = services.GetService<ILogger<CatalogContextSeed>>();
+}
-
+
-                    new CatalogContextSeed()
+IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) =>
-                        .SeedAsync(context, env, settings, logger)
+  WebHost.CreateDefaultBuilder(args)
-                        .Wait();
+      .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
-                })
+      .CaptureStartupErrors(false)
-                .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
+      .ConfigureKestrel(options =>
-
+      {
-                Log.Information("Starting web host ({ApplicationContext})...", AppName);
+          var ports = GetDefinedPorts(configuration);
-                host.Run();
+          options.Listen(IPAddress.Any, ports.httpPort, listenOptions =>
-
+          {
-                return 0;
+              listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
-            }
+          });
-            catch (Exception ex)
+          options.Listen(IPAddress.Any, ports.grpcPort, listenOptions =>
-            {
+          {
-                Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
+              listenOptions.Protocols = HttpProtocols.Http2;
-                return 1;
+          });
-            }
+
-            finally
+      })
-            {
+      .UseStartup<Startup>()
-                Log.CloseAndFlush();
+      .UseContentRoot(Directory.GetCurrentDirectory())
-            }
+      .UseWebRoot("Pics")
-        }
+      .UseSerilog()
-
+      .Build();
-        private static IWebHost CreateHostBuilder(IConfiguration configuration, string[] args) =>
+
-            WebHost.CreateDefaultBuilder(args)
+Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
-                .ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
+{
-                .CaptureStartupErrors(false)
+    var seqServerUrl = configuration["Serilog:SeqServerUrl"];
-                .ConfigureKestrel(options =>
+    var logstashUrl = configuration["Serilog:LogstashgUrl"];
-                {
+    return new LoggerConfiguration()
-                    var ports = GetDefinedPorts(configuration);
+        .MinimumLevel.Verbose()
-                    options.Listen(IPAddress.Any, ports.httpPort, listenOptions =>
+        .Enrich.WithProperty("ApplicationContext", Program.AppName)
-                    {
+        .Enrich.FromLogContext()
-                        listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
+        .WriteTo.Console()
-                    });
+        .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
-                    options.Listen(IPAddress.Any, ports.grpcPort, listenOptions =>
+        .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
-                    {
+        .ReadFrom.Configuration(configuration)
-                        listenOptions.Protocols = HttpProtocols.Http2;
+        .CreateLogger();
-                    });
+}
-
+
-                })
+(int httpPort, int grpcPort) GetDefinedPorts(IConfiguration config)
-                .UseStartup<Startup>()
+{
-                .UseContentRoot(Directory.GetCurrentDirectory())
+    var grpcPort = config.GetValue("GRPC_PORT", 81);
-                .UseWebRoot("Pics")
+    var port = config.GetValue("PORT", 80);
-                .UseSerilog()
+    return (port, grpcPort);
-                .Build();
+}
-
+
-        private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
+IConfiguration GetConfiguration()
-        {
+{
-            var seqServerUrl = configuration["Serilog:SeqServerUrl"];
+    var builder = new ConfigurationBuilder()
-            var logstashUrl = configuration["Serilog:LogstashgUrl"];
+        .SetBasePath(Directory.GetCurrentDirectory())
-            return new LoggerConfiguration()
+        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .MinimumLevel.Verbose()
+        .AddEnvironmentVariables();
-                .Enrich.WithProperty("ApplicationContext", AppName)
+
-                .Enrich.FromLogContext()
+    var config = builder.Build();
-                .WriteTo.Console()
+
-                .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
+    if (config.GetValue<bool>("UseVault", false))
-                .WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl)
+    {
-                .ReadFrom.Configuration(configuration)
+        builder.AddAzureKeyVault(
-                .CreateLogger();
+            $"https://{config["Vault:Name"]}.vault.azure.net/",
-        }
+            config["Vault:ClientId"],
-
+            config["Vault:ClientSecret"]);
-        private static (int httpPort, int grpcPort) GetDefinedPorts(IConfiguration config)
+    }
-        {
+
-            var grpcPort = config.GetValue("GRPC_PORT", 81);
+    return builder.Build();
-            var port = config.GetValue("PORT", 80);
+}
-            return (port, grpcPort);
+
-        }
+public static class Program
-
+{
-        private static IConfiguration GetConfiguration()
+    public static string Namespace = typeof(Startup).Namespace;
-        {
+    public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables();
-
-            var config = builder.Build();
-
-            if (config.GetValue<bool>("UseVault", false))
-            {
-                builder.AddAzureKeyVault(
-                    $"https://{config["Vault:Name"]}.vault.azure.net/",
-                    config["Vault:ClientId"],
-                    config["Vault:ClientSecret"]);
-            }
-
-            return builder.Build();
-        }
-    }
 }

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>