Shady nagy/net6 (#614)

* udated to .net6

* used the .net6 version RC2

* added editconfig.

* App core new Scoped Namespaces style.

* BlazorAdmin new Scoped Namespaces style.

* Blazor Shared new Scoped Namespaces style.

* Infra new Scoped Namespaces style.

* public api new Scoped Namespaces style.

* web new Scoped Namespaces style.

* FunctionalTests new Scoped Namespaces style.

* Integrational tests new Scoped Namespaces style.

* unit tests new Scoped Namespaces style.

* update github action.

* update github action.

* change the global.

.editorconfig

@@ -0,0 +1,134 @@
+###############################
+# Core EditorConfig Options   #
+###############################
+root = true
+# All files
+[*]
+indent_style = space
+
+# XML project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# XML config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+###############################
+# .NET Coding Conventions     #
+###############################
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = true
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+# Use PascalCase for constant fields  
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+###############################
+# C# Coding Conventions       #
+###############################
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+# Namespaces
+csharp_style_namespace_declarations = file_scoped:warning
+###############################
+# C# Formatting Rules         #
+###############################
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+###############################
+# VB Coding Conventions       #
+###############################
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

.github/workflows/dotnetcore.yml

@@ -12,7 +12,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
+        include-prerelease: true
 
     - name: Build with dotnet
       run: dotnet build ./eShopOnWeb.sln --configuration Release

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.x",
+    "rollForward": "latestFeature"
+  }
+}

src/ApplicationCore/ApplicationCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace>Microsoft.eShopWeb.ApplicationCore</RootNamespace>
 	</PropertyGroup>
 

src/ApplicationCore/CatalogSettings.cs

@@ -1,7 +1,6 @@
-namespace Microsoft.eShopWeb
+namespace Microsoft.eShopWeb;
-{
+
 public class CatalogSettings
 {
     public string CatalogBaseUrl { get; set; }
 }
-}

src/ApplicationCore/Constants/AuthorizationConstants.cs

@@ -1,5 +1,5 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Constants
+namespace Microsoft.eShopWeb.ApplicationCore.Constants;
-{
+
 public class AuthorizationConstants
 {
     public const string AUTH_KEY = "AuthKeyOfDoomThatMustBeAMinimumNumberOfBytes";
@@ -10,4 +10,3 @@
     // TODO: Change this to an environment variable
     public const string JWT_SECRET_KEY = "SecretKeyOfDoomThatMustBeAMinimumNumberOfBytes";
 }
-}

src/ApplicationCore/Entities/BaseEntity.cs

@@ -1,9 +1,8 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities;
-{
+
 // This can easily be modified to be BaseEntity<T> and public T Id to support different key types.
 // Using non-generic integer types for simplicity and to ease caching logic
 public abstract class BaseEntity
 {
     public virtual int Id { get; protected set; }
 }
-}

src/ApplicationCore/Entities/BasketAggregate/Basket.cs

@@ -1,9 +1,9 @@
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate
-{
 public class Basket : BaseEntity, IAggregateRoot
 {
     public string BuyerId { get; private set; }
@@ -36,4 +36,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate
         BuyerId = buyerId;
     }
 }
-}

src/ApplicationCore/Entities/BasketAggregate/BasketItem.cs

@@ -1,7 +1,7 @@
 using Ardalis.GuardClauses;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
-{
+
 public class BasketItem : BaseEntity
 {
 
@@ -31,4 +31,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate
         Quantity = quantity;
     }
 }
-}

src/ApplicationCore/Entities/BuyerAggregate/Buyer.cs

@@ -1,9 +1,9 @@
-using Ardalis.GuardClauses;
+using System.Collections.Generic;
+using Ardalis.GuardClauses;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using System.Collections.Generic;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate;
-{
+
 public class Buyer : BaseEntity, IAggregateRoot
 {
     public string IdentityGuid { get; private set; }
@@ -23,4 +23,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate
         IdentityGuid = identity;
     }
 }
-}

src/ApplicationCore/Entities/BuyerAggregate/PaymentMethod.cs

@@ -1,9 +1,8 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.BuyerAggregate;
-{
+
 public class PaymentMethod : BaseEntity
 {
     public string Alias { get; private set; }
     public string CardId { get; private set; } // actual card data must be stored in a PCI compliant system, like Stripe
     public string Last4 { get; private set; }
 }
-}

src/ApplicationCore/Entities/CatalogBrand.cs

@@ -1,7 +1,7 @@
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities;
-{
+
 public class CatalogBrand : BaseEntity, IAggregateRoot
 {
     public string Brand { get; private set; }
@@ -10,4 +10,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities
         Brand = brand;
     }
 }
-}

src/ApplicationCore/Entities/CatalogItem.cs

@@ -1,9 +1,9 @@
-using Ardalis.GuardClauses;
+using System;
+using Ardalis.GuardClauses;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using System;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities;
-{
+
 public class CatalogItem : BaseEntity, IAggregateRoot
 {
     public string Name { get; private set; }
@@ -63,4 +63,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities
         PictureUri = $"images\\products\\{pictureName}?{new DateTime().Ticks}";
     }
 }
-}

src/ApplicationCore/Entities/CatalogType.cs

@@ -1,7 +1,7 @@
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities
+namespace Microsoft.eShopWeb.ApplicationCore.Entities;
-{
+
 public class CatalogType : BaseEntity, IAggregateRoot
 {
     public string Type { get; private set; }
@@ -10,4 +10,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities
         Type = type;
     }
 }
-}

src/ApplicationCore/Entities/OrderAggregate/Address.cs

@@ -1,5 +1,5 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
-{
+
 public class Address // ValueObject
 {
     public string Street { get; private set; }
@@ -23,4 +23,3 @@
         ZipCode = zipcode;
     }
 }
-}

src/ApplicationCore/Entities/OrderAggregate/CatalogItemOrdered.cs

@@ -1,7 +1,7 @@
 using Ardalis.GuardClauses;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
-{
+
 /// <summary>
 /// Represents a snapshot of the item that was ordered. If catalog item details change, details of
 /// the item that was part of a completed order should not change.
@@ -28,4 +28,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
     public string ProductName { get; private set; }
     public string PictureUri { get; private set; }
 }
-}

src/ApplicationCore/Entities/OrderAggregate/Order.cs

@@ -1,10 +1,10 @@
-using Ardalis.GuardClauses;
+using System;
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using System;
 using System.Collections.Generic;
+using Ardalis.GuardClauses;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
-{
 public class Order : BaseEntity, IAggregateRoot
 {
     private Order()
@@ -49,4 +49,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
         return total;
     }
 }
-}

src/ApplicationCore/Entities/OrderAggregate/OrderItem.cs

@@ -1,5 +1,5 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate
+namespace Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
-{
+
 public class OrderItem : BaseEntity
 {
     public CatalogItemOrdered ItemOrdered { get; private set; }
@@ -18,4 +18,3 @@
         Units = units;
     }
 }
-}

src/ApplicationCore/Exceptions/BasketNotFoundException.cs

@@ -1,11 +1,10 @@
 using System;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Exceptions
+namespace Microsoft.eShopWeb.ApplicationCore.Exceptions;
-{
+
 public class BasketNotFoundException : Exception
 {
     public BasketNotFoundException(int basketId) : base($"No basket found with id {basketId}")
     {
     }
 }
-}

src/ApplicationCore/Exceptions/DuplicateException.cs

@@ -1,7 +1,6 @@
 using System;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Exceptions
+namespace Microsoft.eShopWeb.ApplicationCore.Exceptions;
-{
 
 public class DuplicateException : Exception
 {
@@ -11,4 +10,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Exceptions
     }
 
 }
-}

src/ApplicationCore/Exceptions/EmptyBasketOnCheckoutException.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Exceptions
+namespace Microsoft.eShopWeb.ApplicationCore.Exceptions;
-{
+
 public class EmptyBasketOnCheckoutException : Exception
 {
     public EmptyBasketOnCheckoutException()
@@ -21,4 +21,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Exceptions
     {
     }
 }
-}

src/ApplicationCore/Extensions/GuardExtensions.cs

@@ -1,10 +1,10 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using System.Collections.Generic;
-using Microsoft.eShopWeb.ApplicationCore.Exceptions;
-using System.Collections.Generic;
 using System.Linq;
+using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Exceptions;
+
+namespace Ardalis.GuardClauses;
 
-namespace Ardalis.GuardClauses
-{
 public static class BasketGuards
 {
     public static void NullBasket(this IGuardClause guardClause, int basketId, Basket basket)
@@ -19,4 +19,3 @@ namespace Ardalis.GuardClauses
             throw new EmptyBasketOnCheckoutException();
     }
 }
-}

src/ApplicationCore/Extensions/JsonExtensions.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 
-namespace Microsoft.eShopWeb
+namespace Microsoft.eShopWeb;
-{
+
 public static class JsonExtensions
 {
     private static readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions
@@ -15,4 +15,3 @@ namespace Microsoft.eShopWeb
     public static string ToJson<T>(this T obj) =>
         JsonSerializer.Serialize<T>(obj, _jsonOptions);
 }
-}

src/ApplicationCore/Interfaces/IAggregateRoot.cs

@@ -1,5 +1,4 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 public interface IAggregateRoot
 { }
-}

src/ApplicationCore/Interfaces/IAppLogger.cs

@@ -1,5 +1,5 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 /// <summary>
 /// This type eliminates the need to depend directly on the ASP.NET Core logging types.
 /// </summary>
@@ -9,4 +9,3 @@
     void LogInformation(string message, params object[] args);
     void LogWarning(string message, params object[] args);
 }
-}

src/ApplicationCore/Interfaces/IBasketQueryService.cs

@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 public interface IBasketQueryService
 {
     Task<int> CountTotalBasketItems(string username);
 }
-}

src/ApplicationCore/Interfaces/IBasketService.cs

@@ -1,9 +1,9 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
+
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
-{
 public interface IBasketService
 {
     Task TransferBasketAsync(string anonymousId, string userName);
@@ -11,4 +11,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
     Task<Basket> SetQuantities(int basketId, Dictionary<string, int> quantities);
     Task DeleteBasketAsync(int basketId);
 }
-}

src/ApplicationCore/Interfaces/IEmailSender.cs

@@ -1,10 +1,8 @@
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
 
 public interface IEmailSender
 {
     Task SendEmailAsync(string email, string subject, string message);
 }
-}

src/ApplicationCore/Interfaces/IOrderService.cs

@@ -1,10 +1,9 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
+using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
+
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
-{
 public interface IOrderService
 {
     Task CreateOrderAsync(int basketId, Address shippingAddress);
 }
-}

src/ApplicationCore/Interfaces/IReadRepository.cs

@@ -1,8 +1,7 @@
 using Ardalis.Specification;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 public interface IReadRepository<T> : IReadRepositoryBase<T> where T : class, IAggregateRoot
 {
 }
-}

src/ApplicationCore/Interfaces/IRepository.cs

@@ -1,8 +1,7 @@
 using Ardalis.Specification;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 public interface IRepository<T> : IRepositoryBase<T> where T : class, IAggregateRoot
 {
 }
-}

src/ApplicationCore/Interfaces/ITokenClaimsService.cs

@@ -1,9 +1,8 @@
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 public interface ITokenClaimsService
 {
     Task<string> GetTokenAsync(string userName);
 }
-}

src/ApplicationCore/Interfaces/IUriComposer.cs

@@ -1,7 +1,6 @@
-namespace Microsoft.eShopWeb.ApplicationCore.Interfaces
+namespace Microsoft.eShopWeb.ApplicationCore.Interfaces;
-{
+
 public interface IUriComposer
 {
     string ComposePicUri(string uriTemplate);
 }
-}

src/ApplicationCore/Services/BasketService.cs

@@ -1,12 +1,12 @@
-using Ardalis.GuardClauses;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ardalis.GuardClauses;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using Microsoft.eShopWeb.ApplicationCore.Specifications;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Services
+namespace Microsoft.eShopWeb.ApplicationCore.Services;
-{
+
 public class BasketService : IBasketService
 {
     private readonly IRepository<Basket> _basketRepository;
@@ -84,4 +84,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services
         await _basketRepository.DeleteAsync(anonymousBasket);
     }
 }
-}

src/ApplicationCore/Services/OrderService.cs

@@ -1,14 +1,14 @@
-using Ardalis.GuardClauses;
+using System.Linq;
+using System.Threading.Tasks;
+using Ardalis.GuardClauses;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using Microsoft.eShopWeb.ApplicationCore.Specifications;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Services
+namespace Microsoft.eShopWeb.ApplicationCore.Services;
-{
+
 public class OrderService : IOrderService
 {
     private readonly IRepository<Order> _orderRepository;
@@ -51,4 +51,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services
         await _orderRepository.AddAsync(order);
     }
 }
-}

src/ApplicationCore/Services/UriComposer.cs

@@ -1,7 +1,7 @@
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Services
+namespace Microsoft.eShopWeb.ApplicationCore.Services;
-{
+
 public class UriComposer : IUriComposer
 {
     private readonly CatalogSettings _catalogSettings;
@@ -13,4 +13,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Services
         return uriTemplate.Replace("http://catalogbaseurltobereplaced", _catalogSettings.CatalogBaseUrl);
     }
 }
-}

src/ApplicationCore/Specifications/BasketWithItemsSpecification.cs

@@ -1,8 +1,8 @@
 using Ardalis.Specification;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
-{
+
 public sealed class BasketWithItemsSpecification : Specification<Basket>, ISingleResultSpecification
 {
     public BasketWithItemsSpecification(int basketId)
@@ -19,4 +19,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
             .Include(b => b.Items);
     }
 }
-}

src/ApplicationCore/Specifications/CatalogFilterPaginatedSpecification.cs

@@ -1,8 +1,8 @@
 using Ardalis.Specification;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
-{
+
 public class CatalogFilterPaginatedSpecification : Specification<CatalogItem>
 {
     public CatalogFilterPaginatedSpecification(int skip, int take, int? brandId, int? typeId)
@@ -18,4 +18,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
             .Skip(skip).Take(take);
     }
 }
-}

src/ApplicationCore/Specifications/CatalogFilterSpecification.cs

@@ -1,8 +1,8 @@
 using Ardalis.Specification;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
-{
+
 public class CatalogFilterSpecification : Specification<CatalogItem>
 {
     public CatalogFilterSpecification(int? brandId, int? typeId)
@@ -11,4 +11,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
             (!typeId.HasValue || i.CatalogTypeId == typeId));
     }
 }
-}

src/ApplicationCore/Specifications/CatalogItemNameSpecification.cs

@@ -1,8 +1,8 @@
 using Ardalis.Specification;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
-{
+
 public class CatalogItemNameSpecification : Specification<CatalogItem>
 {
     public CatalogItemNameSpecification(string catalogItemName)
@@ -10,4 +10,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
         Query.Where(item => catalogItemName == item.Name);
     }
 }
-}

src/ApplicationCore/Specifications/CatalogItemsSpecification.cs

@@ -1,10 +1,10 @@
-using Ardalis.Specification;
+using System;
-using Microsoft.eShopWeb.ApplicationCore.Entities;
-using System;
 using System.Linq;
+using Ardalis.Specification;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
+
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
-{
 public class CatalogItemsSpecification : Specification<CatalogItem>
 {
     public CatalogItemsSpecification(params int[] ids)
@@ -12,4 +12,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
         Query.Where(c => ids.Contains(c.Id));
     }
 }
-}

src/ApplicationCore/Specifications/CustomerOrdersWithItemsSpecification.cs

@@ -1,8 +1,8 @@
 using Ardalis.Specification;
 using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
-{
+
 public class CustomerOrdersWithItemsSpecification : Specification<Order>
 {
     public CustomerOrdersWithItemsSpecification(string buyerId)
@@ -12,4 +12,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
                 .ThenInclude(i => i.ItemOrdered);
     }
 }
-}

src/ApplicationCore/Specifications/OrderWithItemsByIdSpec.cs

@@ -1,8 +1,8 @@
 using Ardalis.Specification;
 using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
-namespace Microsoft.eShopWeb.ApplicationCore.Specifications
+namespace Microsoft.eShopWeb.ApplicationCore.Specifications;
-{
+
 public class OrderWithItemsByIdSpec : Specification<Order>, ISingleResultSpecification
 {
     public OrderWithItemsByIdSpec(int orderId)
@@ -13,4 +13,3 @@ namespace Microsoft.eShopWeb.ApplicationCore.Specifications
             .ThenInclude(i => i.ItemOrdered);
     }
 }
-}

src/BlazorAdmin/BlazorAdmin.csproj

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

src/BlazorAdmin/CustomAuthStateProvider.cs

@@ -1,15 +1,15 @@
-using BlazorShared.Authorization;
+using System;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.Extensions.Logging;
-using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using BlazorShared.Authorization;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.Extensions.Logging;
+
+namespace BlazorAdmin;
 
-namespace BlazorAdmin
-{
 public class CustomAuthStateProvider : AuthenticationStateProvider
 {
     // TODO: Get Default Cache Duration from Config
@@ -84,4 +84,3 @@ namespace BlazorAdmin
         return new ClaimsPrincipal(identity);
     }
 }
-}

src/BlazorAdmin/Helpers/BlazorComponent.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 
-namespace BlazorAdmin.Helpers
+namespace BlazorAdmin.Helpers;
-{
+
 public class BlazorComponent : ComponentBase
 {
     private readonly RefreshBroadcast _refresh = RefreshBroadcast.Instance;
@@ -23,4 +23,3 @@ namespace BlazorAdmin.Helpers
     }
 
 }
-}

src/BlazorAdmin/Helpers/BlazorLayoutComponent.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 
-namespace BlazorAdmin.Helpers
+namespace BlazorAdmin.Helpers;
-{
+
 public class BlazorLayoutComponent : LayoutComponentBase
 {
     private readonly RefreshBroadcast _refresh = RefreshBroadcast.Instance;
@@ -22,4 +22,3 @@ namespace BlazorAdmin.Helpers
         StateHasChanged();
     }
 }
-}

src/BlazorAdmin/Helpers/RefreshBroadcast.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace BlazorAdmin.Helpers
+namespace BlazorAdmin.Helpers;
-{
+
 internal sealed class RefreshBroadcast
 {
     private static readonly Lazy<RefreshBroadcast>
@@ -21,4 +21,3 @@ namespace BlazorAdmin.Helpers
         RefreshRequested?.Invoke();
     }
 }
-}

src/BlazorAdmin/Helpers/ToastComponent.cs

@@ -1,9 +1,9 @@
-using BlazorAdmin.Services;
+using System;
+using BlazorAdmin.Services;
 using Microsoft.AspNetCore.Components;
-using System;
 
-namespace BlazorAdmin.Helpers
+namespace BlazorAdmin.Helpers;
-{
+
 public class ToastComponent : ComponentBase, IDisposable
 {
     [Inject]
@@ -85,4 +85,3 @@ namespace BlazorAdmin.Helpers
         ToastService.OnShow -= ShowToast;
     }
 }
-}

src/BlazorAdmin/JavaScript/Cookies.cs

@@ -1,8 +1,8 @@
-using Microsoft.JSInterop;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
+using Microsoft.JSInterop;
+
+namespace BlazorAdmin.JavaScript;
 
-namespace BlazorAdmin.JavaScript
-{
 public class Cookies
 {
     private readonly IJSRuntime _jsRuntime;
@@ -22,4 +22,3 @@ namespace BlazorAdmin.JavaScript
         return await _jsRuntime.InvokeAsync<string>(JSInteropConstants.GetCookie, name);
     }
 }
-}

src/BlazorAdmin/JavaScript/Css.cs

@@ -1,8 +1,8 @@
-using Microsoft.JSInterop;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
+using Microsoft.JSInterop;
+
+namespace BlazorAdmin.JavaScript;
 
-namespace BlazorAdmin.JavaScript
-{
 public class Css
 {
     private readonly IJSRuntime _jsRuntime;
@@ -22,4 +22,3 @@ namespace BlazorAdmin.JavaScript
         return await _jsRuntime.InvokeAsync<string>(JSInteropConstants.HideBodyOverflow);
     }
 }
-}

src/BlazorAdmin/JavaScript/JSInteropConstants.cs

@@ -1,5 +1,5 @@
-namespace BlazorAdmin.JavaScript
+namespace BlazorAdmin.JavaScript;
-{
+
 public static class JSInteropConstants
 {
     public static string DeleteCookie => "deleteCookie";
@@ -8,4 +8,3 @@
     public static string HideBodyOverflow => "hideBodyOverflow";
     public static string ShowBodyOverflow => "showBodyOverflow";
 }
-}

src/BlazorAdmin/JavaScript/Route.cs

@@ -1,8 +1,8 @@
-using Microsoft.JSInterop;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
+using Microsoft.JSInterop;
+
+namespace BlazorAdmin.JavaScript;
 
-namespace BlazorAdmin.JavaScript
-{
 public class Route
 {
     private readonly IJSRuntime _jsRuntime;
@@ -17,4 +17,3 @@ namespace BlazorAdmin.JavaScript
         await _jsRuntime.InvokeAsync<string>(JSInteropConstants.RouteOutside, path);
     }
 }
-}

src/BlazorAdmin/Pages/CatalogItemPage/List.razor.cs

@@ -1,11 +1,11 @@
-using BlazorAdmin.Helpers;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using BlazorAdmin.Helpers;
 using BlazorShared.Interfaces;
 using BlazorShared.Models;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
-namespace BlazorAdmin.Pages.CatalogItemPage
+namespace BlazorAdmin.Pages.CatalogItemPage;
-{
+
 public partial class List : BlazorComponent
 {
     [Microsoft.AspNetCore.Components.Inject]
@@ -66,4 +66,3 @@ namespace BlazorAdmin.Pages.CatalogItemPage
         StateHasChanged();
     }
 }
-}

src/BlazorAdmin/Program.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
 using BlazorAdmin.Services;
 using Blazored.LocalStorage;
 using BlazorShared;
@@ -7,12 +10,9 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
 
-namespace BlazorAdmin
+namespace BlazorAdmin;
-{
+
 public class Program
 {
     public static async Task Main(string[] args)
@@ -53,4 +53,3 @@ namespace BlazorAdmin
         await localStorageService.RemoveItemAsync(typeof(CatalogType).Name);
     }
 }
-}

src/BlazorAdmin/Services/CacheEntry.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace BlazorAdmin.Services
+namespace BlazorAdmin.Services;
-{
+
 public class CacheEntry<T>
 {
     public CacheEntry(T item)
@@ -16,4 +16,3 @@ namespace BlazorAdmin.Services
     public T Value { get; set; }
     public DateTime DateCreated { get; set; } = DateTime.UtcNow;
 }
-}

src/BlazorAdmin/Services/CachedCatalogItemServiceDecorator.cs

@@ -1,14 +1,14 @@
-using Blazored.LocalStorage;
+using System;
-using BlazorShared.Interfaces;
-using BlazorShared.Models;
-using Microsoft.Extensions.Logging;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Blazored.LocalStorage;
+using BlazorShared.Interfaces;
+using BlazorShared.Models;
+using Microsoft.Extensions.Logging;
+
+namespace BlazorAdmin.Services;
 
-namespace BlazorAdmin.Services
-{
 public class CachedCatalogItemServiceDecorator : ICatalogItemService
 {
     private readonly ILocalStorageService _localStorageService;
@@ -111,4 +111,3 @@ namespace BlazorAdmin.Services
         await _localStorageService.SetItemAsync(key, entry);
     }
 }
-}

src/BlazorAdmin/Services/CachedCatalogLookupDataServiceDecorator .cs

@@ -1,13 +1,13 @@
-using Blazored.LocalStorage;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Blazored.LocalStorage;
 using BlazorShared.Interfaces;
 using BlazorShared.Models;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
-namespace BlazorAdmin.Services
+namespace BlazorAdmin.Services;
-{
+
 public class CachedCatalogLookupDataServiceDecorator<TLookupData, TReponse>
     : ICatalogLookupDataService<TLookupData>
     where TLookupData : LookupData
@@ -50,4 +50,3 @@ namespace BlazorAdmin.Services
         return types;
     }
 }
-}

src/BlazorAdmin/Services/CatalogItemService.cs

@@ -1,13 +1,13 @@
-using BlazorShared.Interfaces;
+using System.Collections.Generic;
-using BlazorShared.Models;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using BlazorShared.Interfaces;
+using BlazorShared.Models;
+using Microsoft.Extensions.Logging;
 
 
-namespace BlazorAdmin.Services
+namespace BlazorAdmin.Services;
-{
+
 public class CatalogItemService : ICatalogItemService
 {
     private readonly ICatalogLookupDataService<CatalogBrand> _brandService;
@@ -94,4 +94,3 @@ namespace BlazorAdmin.Services
         return items;
     }
 }
-}

src/BlazorAdmin/Services/CatalogLookupDataService.cs

@@ -1,17 +1,17 @@
-using BlazorShared;
+using System.Collections.Generic;
-using BlazorShared.Attributes;
-using BlazorShared.Interfaces;
-using BlazorShared.Models;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Reflection;
 using System.Threading.Tasks;
+using BlazorShared;
+using BlazorShared.Attributes;
+using BlazorShared.Interfaces;
+using BlazorShared.Models;
+using Microsoft.Extensions.Logging;
+
+namespace BlazorAdmin.Services;
 
-namespace BlazorAdmin.Services
-{
 public class CatalogLookupDataService<TLookupData, TReponse>
     : ICatalogLookupDataService<TLookupData>
     where TLookupData : LookupData
@@ -40,4 +40,3 @@ namespace BlazorAdmin.Services
         return response.List;
     }
 }
-}

src/BlazorAdmin/Services/HttpService.cs

@@ -1,12 +1,12 @@
-using BlazorShared;
+using System.Net.Http;
-using BlazorShared.Models;
-using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+using BlazorShared;
+using BlazorShared.Models;
+
+namespace BlazorAdmin.Services;
 
-namespace BlazorAdmin.Services
-{
 public class HttpService
 {
     private readonly HttpClient _httpClient;
@@ -93,4 +93,3 @@ namespace BlazorAdmin.Services
         });
     }
 }
-}

src/BlazorAdmin/Services/ToastService.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Timers;
 
-namespace BlazorAdmin.Services
+namespace BlazorAdmin.Services;
-{
+
 public enum ToastLevel
 {
     Info,
@@ -52,4 +52,3 @@ namespace BlazorAdmin.Services
         Countdown?.Dispose();
     }
 }
-}

src/BlazorAdmin/ServicesConfiguration.cs

@@ -3,8 +3,8 @@ using BlazorShared.Interfaces;
 using BlazorShared.Models;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace BlazorAdmin
+namespace BlazorAdmin;
-{
+
 public static class ServicesConfiguration
 {
     public static IServiceCollection AddBlazorServices(this IServiceCollection services)
@@ -19,4 +19,3 @@ namespace BlazorAdmin
         return services;
     }
 }
-}

src/BlazorAdmin/Shared/CustomInputSelect.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 
-namespace BlazorAdmin.Shared
+namespace BlazorAdmin.Shared;
-{
+
 /// <summary>
 /// This is needed until 5.0 ships with native support
 /// https://www.pragimtech.com/blog/blazor/inputselect-does-not-support-system.int32/
@@ -35,4 +35,3 @@ namespace BlazorAdmin.Shared
         }
     }
 }
-}

src/BlazorShared/Attributes/EndpointAttribute.cs

@@ -1,9 +1,8 @@
 using System;
 
-namespace BlazorShared.Attributes
+namespace BlazorShared.Attributes;
-{
+
 public class EndpointAttribute : Attribute
 {
     public string Name { get; set; }
 }
-}

src/BlazorShared/Authorization/ClaimValue.cs

@@ -1,5 +1,5 @@
-namespace BlazorShared.Authorization
+namespace BlazorShared.Authorization;
-{
+
 public class ClaimValue
 {
     public ClaimValue()
@@ -15,4 +15,3 @@
     public string Type { get; set; }
     public string Value { get; set; }
 }
-}

src/BlazorShared/Authorization/Constants.cs

@@ -1,5 +1,5 @@
-namespace BlazorShared.Authorization
+namespace BlazorShared.Authorization;
-{
+
 public static class Constants
 {
     public static class Roles
@@ -7,4 +7,3 @@
         public const string ADMINISTRATORS = "Administrators";
     }
 }
-}

src/BlazorShared/Authorization/UserInfo.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
-namespace BlazorShared.Authorization
+namespace BlazorShared.Authorization;
-{
+
 public class UserInfo
 {
     public static readonly UserInfo Anonymous = new UserInfo();
@@ -11,4 +11,3 @@ namespace BlazorShared.Authorization
     public string Token { get; set; }
     public IEnumerable<ClaimValue> Claims { get; set; }
 }
-}

src/BlazorShared/BaseUrlConfiguration.cs

@@ -1,5 +1,5 @@
-namespace BlazorShared
+namespace BlazorShared;
-{
+
 public class BaseUrlConfiguration
 {
     public const string CONFIG_NAME = "baseUrls";
@@ -7,4 +7,3 @@
     public string ApiBase { get; set; }
     public string WebBase { get; set; }
 }
-}

src/BlazorShared/BlazorShared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>BlazorShared</RootNamespace>
     <AssemblyName>BlazorShared</AssemblyName>
   </PropertyGroup>

src/BlazorShared/Interfaces/ICatalogItemService.cs

@@ -2,8 +2,8 @@
 using System.Threading.Tasks;
 using BlazorShared.Models;
 
-namespace BlazorShared.Interfaces
+namespace BlazorShared.Interfaces;
-{
+
 public interface ICatalogItemService
 {
     Task<CatalogItem> Create(CreateCatalogItemRequest catalogItem);
@@ -13,4 +13,3 @@ namespace BlazorShared.Interfaces
     Task<List<CatalogItem>> ListPaged(int pageSize);
     Task<List<CatalogItem>> List();
 }
-}

src/BlazorShared/Interfaces/ICatalogLookupDataService.cs

@@ -1,11 +1,10 @@
-using BlazorShared.Models;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Threading.Tasks;
+using BlazorShared.Models;
+
+namespace BlazorShared.Interfaces;
 
-namespace BlazorShared.Interfaces
-{
 public interface ICatalogLookupDataService<TLookupData> where TLookupData : LookupData
 {
     Task<List<TLookupData>> List();
 }
-}

src/BlazorShared/Interfaces/ILookupDataResponse.cs

@@ -1,10 +1,9 @@
-using BlazorShared.Models;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using BlazorShared.Models;
+
+namespace BlazorShared.Interfaces;
 
-namespace BlazorShared.Interfaces
-{
 public interface ILookupDataResponse<TLookupData> where TLookupData : LookupData
 {
     List<TLookupData> List { get; set; }
 }
-}

src/BlazorShared/Models/CatalogBrand.cs

@@ -1,9 +1,8 @@
 using BlazorShared.Attributes;
 
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 [Endpoint(Name = "catalog-brands")]
 public class CatalogBrand : LookupData
 {
 }
-}

src/BlazorShared/Models/CatalogBrandResponse.cs

@@ -1,12 +1,11 @@
-using BlazorShared.Interfaces;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using BlazorShared.Interfaces;
+
+namespace BlazorShared.Models;
 
-namespace BlazorShared.Models
-{
 public class CatalogBrandResponse : ILookupDataResponse<CatalogBrand>
 {
     [JsonPropertyName("CatalogBrands")]
     public List<CatalogBrand> List { get; set; } = new List<CatalogBrand>();
 }
-}

src/BlazorShared/Models/CatalogItem.cs

@@ -4,8 +4,8 @@ using System.IO;
 using System.Threading.Tasks;
 using BlazorInputFile;
 
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class CatalogItem
 {
     public int Id { get; set; }
@@ -85,4 +85,3 @@ namespace BlazorShared.Models
                string.Equals(extension, ".jpeg", StringComparison.OrdinalIgnoreCase);
     }
 }
-}

src/BlazorShared/Models/CatalogType.cs

@@ -1,9 +1,8 @@
 using BlazorShared.Attributes;
 
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 [Endpoint(Name = "catalog-types")]
 public class CatalogType : LookupData
 {
 }
-}

src/BlazorShared/Models/CatalogTypeResponse.cs

@@ -1,13 +1,12 @@
-using BlazorShared.Interfaces;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using BlazorShared.Interfaces;
+
+namespace BlazorShared.Models;
 
-namespace BlazorShared.Models
-{
 public class CatalogTypeResponse : ILookupDataResponse<CatalogType>
 {
 
     [JsonPropertyName("CatalogTypes")]
     public List<CatalogType> List { get; set; } = new List<CatalogType>();
 }
-}

src/BlazorShared/Models/CreateCatalogItemRequest.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class CreateCatalogItemRequest
 {
     public int CatalogTypeId { get; set; }
@@ -25,4 +25,3 @@ namespace BlazorShared.Models
     public string PictureName { get; set; } = string.Empty;
 
 }
-}

src/BlazorShared/Models/CreateCatalogItemResponse.cs

@@ -1,7 +1,6 @@
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class CreateCatalogItemResponse
 {
     public CatalogItem CatalogItem { get; set; } = new CatalogItem();
 }
-}

src/BlazorShared/Models/DeleteCatalogItemResponse.cs

@@ -1,7 +1,6 @@
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class DeleteCatalogItemResponse
 {
     public string Status { get; set; } = "Deleted";
 }
-}

src/BlazorShared/Models/EditCatalogItemResponse.cs

@@ -1,7 +1,6 @@
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class EditCatalogItemResult
 {
     public CatalogItem CatalogItem { get; set; } = new CatalogItem();
 }
-}

src/BlazorShared/Models/ErrorDetails.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class ErrorDetails
 {
     public int StatusCode { get; set; }
@@ -11,4 +11,3 @@ namespace BlazorShared.Models
         return JsonSerializer.Serialize(this);
     }
 }
-}

src/BlazorShared/Models/LookupData.cs

@@ -1,8 +1,7 @@
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public abstract class LookupData
 {
     public int Id { get; set; }
     public string Name { get; set; }
 }
-}

src/BlazorShared/Models/PagedCatalogItemResponse.cs

@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 
-namespace BlazorShared.Models
+namespace BlazorShared.Models;
-{
+
 public class PagedCatalogItemResponse
 {
     public List<CatalogItem> CatalogItems { get; set; } = new List<CatalogItem>();
     public int PageCount { get; set; } = 0;
 }
-}

src/Infrastructure/Data/BasketQueryService.cs

@@ -1,10 +1,10 @@
-using Microsoft.EntityFrameworkCore;
+using System.Linq;
-using Microsoft.eShopWeb.ApplicationCore.Interfaces;
-using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+
+namespace Microsoft.eShopWeb.Infrastructure.Data;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data
-{
 public class BasketQueryService : IBasketQueryService
 {
     private readonly CatalogContext _dbContext;
@@ -24,4 +24,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data
         return totalItems;
     }
 }
-}

src/Infrastructure/Data/CatalogContext.cs

@@ -1,11 +1,10 @@
-using Microsoft.EntityFrameworkCore;
+using System.Reflection;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
-using System.Reflection;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data
+namespace Microsoft.eShopWeb.Infrastructure.Data;
-{
 
 public class CatalogContext : DbContext
 {
@@ -27,4 +26,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data
         builder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
     }
 }
-}

src/Infrastructure/Data/CatalogContextSeed.cs

@@ -1,12 +1,12 @@
-using Microsoft.EntityFrameworkCore;
+using System;
-using Microsoft.eShopWeb.ApplicationCore.Entities;
-using Microsoft.Extensions.Logging;
-using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.eShopWeb.ApplicationCore.Entities;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.eShopWeb.Infrastructure.Data;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data
-{
 public class CatalogContextSeed
 {
     public static async Task SeedAsync(CatalogContext catalogContext,
@@ -98,4 +98,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data
             };
     }
 }
-}

src/Infrastructure/Data/Config/BasketConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class BasketConfiguration : IEntityTypeConfiguration<Basket>
 {
     public void Configure(EntityTypeBuilder<Basket> builder)
@@ -16,4 +16,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
             .HasMaxLength(256);
     }
 }
-}

src/Infrastructure/Data/Config/BasketItemConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class BasketItemConfiguration : IEntityTypeConfiguration<BasketItem>
 {
     public void Configure(EntityTypeBuilder<BasketItem> builder)
@@ -13,4 +13,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
             .HasColumnType("decimal(18,2)");
     }
 }
-}

src/Infrastructure/Data/Config/CatalogBrandConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class CatalogBrandConfiguration : IEntityTypeConfiguration<CatalogBrand>
 {
     public void Configure(EntityTypeBuilder<CatalogBrand> builder)
@@ -19,4 +19,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
             .HasMaxLength(100);
     }
 }
-}

src/Infrastructure/Data/Config/CatalogItemConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class CatalogItemConfiguration : IEntityTypeConfiguration<CatalogItem>
 {
     public void Configure(EntityTypeBuilder<CatalogItem> builder)
@@ -34,4 +34,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
             .HasForeignKey(ci => ci.CatalogTypeId);
     }
 }
-}

src/Infrastructure/Data/Config/CatalogTypeConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class CatalogTypeConfiguration : IEntityTypeConfiguration<CatalogType>
 {
     public void Configure(EntityTypeBuilder<CatalogType> builder)
@@ -19,4 +19,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
             .HasMaxLength(100);
     }
 }
-}

src/Infrastructure/Data/Config/OrderConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class OrderConfiguration : IEntityTypeConfiguration<Order>
 {
     public void Configure(EntityTypeBuilder<Order> builder)
@@ -41,4 +41,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
         });
     }
 }
-}

src/Infrastructure/Data/Config/OrderItemConfiguration.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Config
+namespace Microsoft.eShopWeb.Infrastructure.Data.Config;
-{
+
 public class OrderItemConfiguration : IEntityTypeConfiguration<OrderItem>
 {
     public void Configure(EntityTypeBuilder<OrderItem> builder)
@@ -22,4 +22,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Config
             .HasColumnType("decimal(18,2)");
     }
 }
-}

src/Infrastructure/Data/EfRepository.cs

@@ -1,12 +1,11 @@
 using Ardalis.Specification.EntityFrameworkCore;
 using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data
+namespace Microsoft.eShopWeb.Infrastructure.Data;
-{
+
 public class EfRepository<T> : RepositoryBase<T>, IReadRepository<T>, IRepository<T> where T : class, IAggregateRoot
 {
     public EfRepository(CatalogContext dbContext) : base(dbContext)
     {
     }
 }
-}

src/Infrastructure/Data/FileItem.cs

@@ -1,5 +1,5 @@
-namespace Microsoft.eShopWeb.Infrastructure.Data
+namespace Microsoft.eShopWeb.Infrastructure.Data;
-{
+
 public class FileItem
 {
     public string FileName { get; set; }
@@ -9,4 +9,3 @@
     public string Type { get; set; }
     public string DataBase64 { get; set; }
 }
-}

src/Infrastructure/Data/Migrations/20201202111507_InitialModel.cs

@@ -1,8 +1,8 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations
+namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations;
-{
+
 public partial class InitialModel : Migration
 {
     protected override void Up(MigrationBuilder migrationBuilder)
@@ -204,4 +204,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations
             name: "catalog_type_hilo");
     }
 }
-}

src/Infrastructure/Data/Migrations/20211026175614_FixBuyerId.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations
+namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations;
-{
+
 public partial class FixBuyerId : Migration
 {
     protected override void Up(MigrationBuilder migrationBuilder)
@@ -50,4 +50,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Data.Migrations
             oldMaxLength: 256);
     }
 }
-}

src/Infrastructure/Identity/AppIdentityDbContext.cs

@@ -2,8 +2,8 @@
 using Microsoft.EntityFrameworkCore;
 
 
-namespace Microsoft.eShopWeb.Infrastructure.Identity
+namespace Microsoft.eShopWeb.Infrastructure.Identity;
-{
+
 public class AppIdentityDbContext : IdentityDbContext<ApplicationUser>
 {
     public AppIdentityDbContext(DbContextOptions<AppIdentityDbContext> options)
@@ -19,5 +19,3 @@ namespace Microsoft.eShopWeb.Infrastructure.Identity
         // Add your customizations after calling base.OnModelCreating(builder);
     }
 }
-
-}