Merge f21612ac18 into 9486760a9e

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs

@@ -85,7 +85,7 @@ namespace Microsoft.Extensions.HealthChecks
             return new TypeOrHealthCheck_Type(name, cacheDuration, healthCheckType);
         }
 
-        class TypeOrHealthCheck_HealthCheck : CachedHealthCheck
+        private class TypeOrHealthCheck_HealthCheck : CachedHealthCheck
         {
             private readonly IHealthCheck _healthCheck;
 
@@ -95,7 +95,7 @@ namespace Microsoft.Extensions.HealthChecks
             protected override IHealthCheck Resolve(IServiceProvider serviceProvider) => _healthCheck;
         }
 
-        class TypeOrHealthCheck_Type : CachedHealthCheck
+        private class TypeOrHealthCheck_Type : CachedHealthCheck
         {
             private readonly Type _healthCheckType;
 

src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Basket.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;

src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogBrandEntityTypeConfiguration.cs

@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure.EntityConfigurations
 {
-    class CatalogBrandEntityTypeConfiguration
+    internal class CatalogBrandEntityTypeConfiguration
         : IEntityTypeConfiguration<CatalogBrand>
     {
         public void Configure(EntityTypeBuilder<CatalogBrand> builder)

src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogItemEntityTypeConfiguration.cs

@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure.EntityConfigurations
 {
-    class CatalogItemEntityTypeConfiguration
+    internal class CatalogItemEntityTypeConfiguration
         : IEntityTypeConfiguration<CatalogItem>
     {
         public void Configure(EntityTypeBuilder<CatalogItem> builder)

src/Services/Catalog/Catalog.API/Infrastructure/EntityConfigurations/CatalogTypeEntityTypeConfiguration.cs

@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure.EntityConfigurations
 {
-    class CatalogTypeEntityTypeConfiguration
+    internal class CatalogTypeEntityTypeConfiguration
         : IEntityTypeConfiguration<CatalogType>
     {
         public void Configure(EntityTypeBuilder<CatalogType> builder)

src/Services/Location/Locations.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;

src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/CampaignEntityTypeConfiguration.cs

@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.EntityConfigurations
 {
-    class CampaignEntityTypeConfiguration
+    internal class CampaignEntityTypeConfiguration
         : IEntityTypeConfiguration<Campaign>
     {
         public void Configure(EntityTypeBuilder<Campaign> builder)

src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/RuleEntityTypeConfiguration.cs

@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.EntityConfigurations
 {
-    class RuleEntityTypeConfiguration
+    internal class RuleEntityTypeConfiguration
        : IEntityTypeConfiguration<Rule>
     {
         public void Configure(EntityTypeBuilder<Rule> builder)

src/Services/Marketing/Marketing.API/Infrastructure/EntityConfigurations/UserLocationRuleEntityTypeConfiguration.cs

@@ -4,7 +4,7 @@ using Microsoft.eShopOnContainers.Services.Marketing.API.Model;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.EntityConfigurations
 {
-    class UserLocationRuleEntityTypeConfiguration
+    internal class UserLocationRuleEntityTypeConfiguration
        : IEntityTypeConfiguration<UserLocationRule>
     {
         public void Configure(EntityTypeBuilder<UserLocationRule> builder)

src/Services/Marketing/Marketing.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;

src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Ordering.API.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/BuyerEntityTYpeConfiguration.cs

@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class BuyerEntityTypeConfiguration
+    internal class BuyerEntityTypeConfiguration
         : IEntityTypeConfiguration<Buyer>
     {
         public void Configure(EntityTypeBuilder<Buyer> buyerConfiguration)

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs

@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class CardTypeEntityTypeConfiguration
+    internal class CardTypeEntityTypeConfiguration
         : IEntityTypeConfiguration<CardType>
     {
         public void Configure(EntityTypeBuilder<CardType> cardTypesConfiguration)

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/ClientRequestEntityTypeConfiguration.cs

@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class ClientRequestEntityTypeConfiguration
+    internal class ClientRequestEntityTypeConfiguration
         : IEntityTypeConfiguration<ClientRequest>
     {
         public void Configure(EntityTypeBuilder<ClientRequest> requestConfiguration)

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderEntityTypeConfiguration.cs

@@ -7,7 +7,8 @@ using System;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class OrderEntityTypeConfiguration : IEntityTypeConfiguration<Order>
+    internal class OrderEntityTypeConfiguration
+        : IEntityTypeConfiguration<Order>
     {
         public void Configure(EntityTypeBuilder<Order> orderConfiguration)
         {

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderItemEntityTypeConfiguration.cs

@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class OrderItemEntityTypeConfiguration
+    internal class OrderItemEntityTypeConfiguration
         : IEntityTypeConfiguration<OrderItem>
     {
         public void Configure(EntityTypeBuilder<OrderItem> orderItemConfiguration)

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/OrderStatusEntityTypeConfiguration.cs

@@ -5,7 +5,7 @@ using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class OrderStatusEntityTypeConfiguration
+    internal class OrderStatusEntityTypeConfiguration
         : IEntityTypeConfiguration<OrderStatus>
     {
         public void Configure(EntityTypeBuilder<OrderStatus> orderStatusConfiguration)

src/Services/Ordering/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace Ordering.Infrastructure.EntityConfigurations
 {
-    class PaymentMethodEntityTypeConfiguration
+    internal class PaymentMethodEntityTypeConfiguration
         : IEntityTypeConfiguration<PaymentMethod>
     {
         public void Configure(EntityTypeBuilder<PaymentMethod> paymentConfiguration)

src/Services/Ordering/Ordering.Infrastructure/MediatorExtension.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Ordering.Infrastructure
 {
-    static class MediatorExtension
+    internal static class MediatorExtension
     {
         public static async Task DispatchDomainEventsAsync(this IMediator mediator, OrderingContext ctx)
         {

src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs

@@ -73,7 +73,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure
             return new OrderingContext(optionsBuilder.Options,new NoMediator());
         }
 
-        class NoMediator : IMediator
+        private class NoMediator : IMediator
         {
             public Task Publish<TNotification>(TNotification notification, CancellationToken cancellationToken = default(CancellationToken)) where TNotification : INotification
             {

src/Web/WebMVC/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace WebMVC.Infrastructure.Middlewares
 {
-    class ByPassAuthMiddleware
+    internal class ByPassAuthMiddleware
     {
         private readonly RequestDelegate _next;
         private string _currentUserId;

test/Services/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace FunctionalTests.Middleware
 {
-    class AutoAuthorizeMiddleware
+    internal class AutoAuthorizeMiddleware
     {
         private readonly RequestDelegate _next;
         public AutoAuthorizeMiddleware(RequestDelegate rd)

test/Services/FunctionalTests/Services/Location/LocationsTestsStartup.cs

@@ -26,7 +26,7 @@
             }
         }
 
-        class LocationAuthorizeMiddleware
+        private class LocationAuthorizeMiddleware
         {
             private readonly RequestDelegate _next;
 

test/Services/IntegrationTests/Middleware/AutoAuthorizeMiddleware.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace IntegrationTests.Middleware
 {
-    class AutoAuthorizeMiddleware
+    internal class AutoAuthorizeMiddleware
     {
         private readonly RequestDelegate _next;
         public AutoAuthorizeMiddleware(RequestDelegate rd)

test/Services/IntegrationTests/Services/Locations/LocationsTestsStartup.cs

@@ -25,7 +25,7 @@
             }
         }
 
-        class LocationAuthorizeMiddleware
+        private class LocationAuthorizeMiddleware
         {
             private readonly RequestDelegate _next;
             public LocationAuthorizeMiddleware(RequestDelegate rd)