Top-level statements. Change ordering net standard projects to dotnet 5.

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs

@@ -188,9 +188,6 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
             services.AddHttpClient<IOrderApiClient, OrderApiClient>()
                    .AddDevspacesSupport();
 
-            services.AddHttpClient<IOrderingService, OrderingService>()
-                   .AddDevspacesSupport();
-
             return services;
         }
 
@@ -206,6 +203,8 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
                 options.Address = new Uri(basketApi);
             }).AddInterceptor<GrpcExceptionInterceptor>();
 
+            services.AddScoped<IOrderingService, OrderingService>();
+
             services.AddGrpcClient<OrderingGrpc.OrderingGrpcClient>((services, options) =>
             {
                 var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering;

src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs

@@ -192,10 +192,6 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
                 .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
                 .AddDevspacesSupport();
 
-            services.AddHttpClient<IOrderingService, OrderingService>()
-                .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>()
-                .AddDevspacesSupport();
-
             return services;
         }
 
@@ -211,6 +207,8 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
                 options.Address = new Uri(basketApi);
             }).AddInterceptor<GrpcExceptionInterceptor>();
 
+            services.AddScoped<IOrderingService, OrderingService>();
+
             services.AddGrpcClient<OrderingGrpc.OrderingGrpcClient>((services, options) =>
             {
                 var orderingApi = services.GetRequiredService<IOptions<UrlsConfig>>().Value.GrpcOrdering;

src/Services/Ordering/Ordering.API/Program.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
+using Microsoft.eShopOnContainers.Services.Ordering.API;
 using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure;
 using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 using Microsoft.Extensions.Configuration;
@@ -13,25 +14,16 @@ using System;
 using System.IO;
 using System.Net;
 
-namespace Microsoft.eShopOnContainers.Services.Ordering.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 = BuildWebHost(configuration, args);
 
-                Log.Information("Applying migrations ({ApplicationContext})...", AppName);
+    Log.Information("Applying migrations ({ApplicationContext})...", Program.AppName);
     host.MigrateDbContext<OrderingContext>((context, services) =>
     {
         var env = services.GetService<IWebHostEnvironment>();
@@ -44,23 +36,22 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.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 BuildWebHost(IConfiguration configuration, string[] args) =>
+IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
     WebHost.CreateDefaultBuilder(args)
         .CaptureStartupErrors(false)
         .ConfigureKestrel(options =>
@@ -83,13 +74,13 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.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)
@@ -98,7 +89,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
         .CreateLogger();
 }
 
-        private static IConfiguration GetConfiguration()
+IConfiguration GetConfiguration()
 {
     var builder = new ConfigurationBuilder()
         .SetBasePath(Directory.GetCurrentDirectory())
@@ -117,11 +108,17 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
 
     return builder.Build();
 }
-        private static (int httpPort, int grpcPort) GetDefinedPorts(IConfiguration config)
+
+(int httpPort, int grpcPort) GetDefinedPorts(IConfiguration config)
 {
     var grpcPort = config.GetValue("GRPC_PORT", 5001);
     var port = config.GetValue("PORT", 80);
     return (port, grpcPort);
 }
-    }
+
+public class Program
+{
+
+    public static string Namespace = typeof(Startup).Namespace;
+    public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
 }

src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj

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

src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj

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