diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
index 3c3f6a3e3..acae2354a 100644
--- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
+++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
@@ -6,6 +6,12 @@
+
+
+
+
+
+
diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
index fa06e0a0b..fd17f4a0d 100644
--- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
+++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
@@ -3,7 +3,6 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Polly;
-using Polly.Retry;
using System;
using System.Data.SqlClient;
@@ -18,7 +17,7 @@ namespace Microsoft.AspNetCore.Hosting
return orchestratorType?.ToUpper() == "K8S";
}
- public static IWebHost MigrateDbContext(this IWebHost webHost, Action seeder) where TContext : DbContext
+ public static IWebHost MigrateDbContext(this IWebHost webHost, Action seeder) where TContext : DbContext
{
var underK8s = webHost.IsInKubernetes();
@@ -71,7 +70,7 @@ namespace Microsoft.AspNetCore.Hosting
}
private static void InvokeSeeder(Action seeder, TContext context, IServiceProvider services)
- where TContext : DbContext
+ where TContext : DbContext
{
context.Database.Migrate();
seeder(context, services);
diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj
index 00718ad63..22c562da0 100644
--- a/src/Services/Basket/Basket.API/Basket.API.csproj
+++ b/src/Services/Basket/Basket.API/Basket.API.csproj
@@ -4,6 +4,7 @@
$(NetCoreTargetVersion)
$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
..\..\..\..\docker-compose.dcproj
+ 8.0
diff --git a/src/Services/Basket/Basket.API/Dockerfile b/src/Services/Basket/Basket.API/Dockerfile
index 909567b2c..c70aa3a96 100644
--- a/src/Services/Basket/Basket.API/Dockerfile
+++ b/src/Services/Basket/Basket.API/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app
EXPOSE 80
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src
COPY scripts scripts/
diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
index d88c92f09..2640185d1 100644
--- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj
+++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj
@@ -8,6 +8,7 @@
Catalog.API
aspnet-Catalog.API-20161122013618
..\..\..\..\docker-compose.dcproj
+ 8.0
diff --git a/src/Services/Marketing/Marketing.API/Dockerfile b/src/Services/Marketing/Marketing.API/Dockerfile
index 3e0936e81..108b63f28 100644
--- a/src/Services/Marketing/Marketing.API/Dockerfile
+++ b/src/Services/Marketing/Marketing.API/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
WORKDIR /app
EXPOSE 80
-FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
WORKDIR /src
COPY scripts scripts/
diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
index 74d7574a6..8eb50e2a3 100644
--- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj
+++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj
@@ -9,6 +9,7 @@
/subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights
/subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights
+ 8.0
@@ -30,7 +31,6 @@
-
@@ -46,6 +46,7 @@
+
diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs
index 7f990e3ad..cb82dbf88 100644
--- a/src/Services/Marketing/Marketing.API/Startup.cs
+++ b/src/Services/Marketing/Marketing.API/Startup.cs
@@ -21,8 +21,6 @@
using Infrastructure.Services;
using IntegrationEvents.Events;
using Marketing.API.IntegrationEvents.Handlers;
- using Microsoft.ApplicationInsights.Extensibility;
- using Microsoft.ApplicationInsights.ServiceFabric;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.AspNetCore.Mvc;
@@ -30,7 +28,6 @@
using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Middlewares;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using RabbitMQ.Client;
- using Swashbuckle.AspNetCore.Swagger;
using System;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
@@ -63,7 +60,7 @@
services.Configure(Configuration);
- ConfigureAuthService(services);
+ ConfigureAuthService(services);
services.AddDbContext(options =>
{
@@ -123,29 +120,32 @@
return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount);
});
- }
+ }
// Add framework services.
services.AddSwaggerGen(options =>
{
options.DescribeAllEnumsAsStrings();
- options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
+ options.SwaggerDoc("v1", new OpenApi.Models.OpenApiInfo
{
Title = "Marketing HTTP API",
Version = "v1",
- Description = "The Marketing Service HTTP API",
- TermsOfService = "Terms Of Service"
+ Description = "The Marketing Service HTTP API"
});
- options.AddSecurityDefinition("oauth2", new OAuth2Scheme
+ options.AddSecurityDefinition("oauth2", new OpenApi.Models.OpenApiSecurityScheme
{
- Type = "oauth2",
- Flow = "implicit",
- AuthorizationUrl = $"{Configuration.GetValue("IdentityUrlExternal")}/connect/authorize",
- TokenUrl = $"{Configuration.GetValue("IdentityUrlExternal")}/connect/token",
- Scopes = new Dictionary()
+ Flows = new OpenApi.Models.OpenApiOAuthFlows()
{
- { "marketing", "Marketing API" }
+ Implicit = new OpenApi.Models.OpenApiOAuthFlow()
+ {
+ AuthorizationUrl = new Uri($"{Configuration.GetValue("IdentityUrlExternal")}/connect/authorize"),
+ TokenUrl = new Uri($"{Configuration.GetValue("IdentityUrlExternal")}/connect/token"),
+ Scopes = new Dictionary()
+ {
+ { "marketing", "Marketing API" }
+ }
+ }
}
});
@@ -178,7 +178,7 @@
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
- public void Configure(IApplicationBuilder app, IHostingEnvironment env,ILoggerFactory loggerFactory)
+ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
{
//loggerFactory.AddAzureWebAppDiagnostics();
//loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
@@ -213,7 +213,7 @@
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "Marketing.API V1");
c.OAuthClientId("marketingswaggerui");
c.OAuthAppName("Marketing Swagger UI");
- });
+ });
ConfigureEventBus(app);
}
@@ -228,12 +228,6 @@
// Enable K8s telemetry initializer
services.AddApplicationInsightsKubernetesEnricher();
}
- if (orchestratorType?.ToUpper() == "SF")
- {
- // Enable SF telemetry initializer
- services.AddSingleton((serviceProvider) =>
- new FabricTelemetryInitializer());
- }
}
private void ConfigureAuthService(IServiceCollection services)
@@ -241,7 +235,7 @@
// prevent from mapping "sub" claim to nameidentifier.
JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
- services.AddAuthentication(options=>
+ services.AddAuthentication(options =>
{
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -265,7 +259,7 @@
var serviceBusPersisterConnection = sp.GetRequiredService();
var iLifetimeScope = sp.GetRequiredService();
var logger = sp.GetRequiredService>();
- var eventBusSubcriptionsManager = sp.GetRequiredService();
+ var eventBusSubcriptionsManager = sp.GetRequiredService();
return new EventBusServiceBus(serviceBusPersisterConnection, logger,
eventBusSubcriptionsManager, subscriptionClientName, iLifetimeScope);
diff --git a/src/_build/dependencies.props b/src/_build/dependencies.props
index de5ed4901..6a91b3f6a 100644
--- a/src/_build/dependencies.props
+++ b/src/_build/dependencies.props
@@ -43,10 +43,15 @@
3.0.0-preview6.19307.2
3.0.0
4.5.0
- 2.2.2
- 2.2.2
- 2.2.2
- 2.2.2
+
+ 3.0.0-preview4-19123-01
+ 4.7.0-preview6.19303.8
+
+ 3.0.0-preview6.19304.10
+ 3.0.0-preview6.19304.10
+ 3.0.0-preview6.19304.10
+ 3.0.0-preview6.19304.10
+
2.2.0
2.2.0
2.2.0