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.

src/Web/ViewModels/Account/LoginViewModel.cs

@@ -1,18 +1,17 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account;
+
+public class LoginViewModel
 {
-    public class LoginViewModel
-    {
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; }
+    [Required]
+    [EmailAddress]
+    public string Email { get; set; }
 
-        [Required]
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [Required]
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        [Display(Name = "Remember me?")]
-        public bool RememberMe { get; set; }
-    }
+    [Display(Name = "Remember me?")]
+    public bool RememberMe { get; set; }
 }

src/Web/ViewModels/Account/LoginWith2faViewModel.cs

@@ -1,18 +1,17 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account;
+
+public class LoginWith2faViewModel
 {
-    public class LoginWith2faViewModel
-    {
-        [Required]
-        [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Text)]
-        [Display(Name = "Authenticator code")]
-        public string TwoFactorCode { get; set; }
+    [Required]
+    [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+    [DataType(DataType.Text)]
+    [Display(Name = "Authenticator code")]
+    public string TwoFactorCode { get; set; }
 
-        [Display(Name = "Remember this machine")]
-        public bool RememberMachine { get; set; }
+    [Display(Name = "Remember this machine")]
+    public bool RememberMachine { get; set; }
 
-        public bool RememberMe { get; set; }
-    }
+    public bool RememberMe { get; set; }
 }

src/Web/ViewModels/Account/RegisterViewModel.cs

@@ -1,23 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account;
+
+public class RegisterViewModel
 {
-    public class RegisterViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
+    [Required]
+    [EmailAddress]
+    [Display(Name = "Email")]
+    public string Email { get; set; }
 
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
+    [Required]
+    [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
+    [DataType(DataType.Password)]
+    [Display(Name = "Password")]
+    public string Password { get; set; }
 
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-    }
+    [DataType(DataType.Password)]
+    [Display(Name = "Confirm password")]
+    [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+    public string ConfirmPassword { get; set; }
 }

src/Web/ViewModels/Account/ResetPasswordViewModel.cs

@@ -1,23 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account;
+
+public class ResetPasswordViewModel
 {
-    public class ResetPasswordViewModel
-    {
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; }
+    [Required]
+    [EmailAddress]
+    public string Email { get; set; }
 
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        public string Password { get; set; }
+    [Required]
+    [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+    [DataType(DataType.Password)]
+    public string Password { get; set; }
 
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+    [DataType(DataType.Password)]
+    [Display(Name = "Confirm password")]
+    [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
+    public string ConfirmPassword { get; set; }
 
-        public string Code { get; set; }
-    }
+    public string Code { get; set; }
 }

src/Web/ViewModels/BasketComponentViewModel.cs

@@ -1,7 +1,6 @@
-namespace Microsoft.eShopWeb.Web.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels;
+
+public class BasketComponentViewModel
 {
-    public class BasketComponentViewModel
-    {
-        public int ItemsCount { get; set; }
-    }
+    public int ItemsCount { get; set; }
 }

src/Web/ViewModels/CatalogIndexViewModel.cs

@@ -1,15 +1,14 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace Microsoft.eShopWeb.Web.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels;
+
+public class CatalogIndexViewModel
 {
-    public class CatalogIndexViewModel
-    {
-        public List<CatalogItemViewModel> CatalogItems { get; set; }
-        public List<SelectListItem> Brands { get; set; }
-        public List<SelectListItem> Types { get; set; }
-        public int? BrandFilterApplied { get; set; }
-        public int? TypesFilterApplied { get; set; }
-        public PaginationInfoViewModel PaginationInfo { get; set; }
-    }
+    public List<CatalogItemViewModel> CatalogItems { get; set; }
+    public List<SelectListItem> Brands { get; set; }
+    public List<SelectListItem> Types { get; set; }
+    public int? BrandFilterApplied { get; set; }
+    public int? TypesFilterApplied { get; set; }
+    public PaginationInfoViewModel PaginationInfo { get; set; }
 }

src/Web/ViewModels/CatalogItemViewModel.cs

@@ -1,10 +1,9 @@
-namespace Microsoft.eShopWeb.Web.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels;
+
+public class CatalogItemViewModel
 {
-    public class CatalogItemViewModel
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string PictureUri { get; set; }
-        public decimal Price { get; set; }
-    }
+    public int Id { get; set; }
+    public string Name { get; set; }
+    public string PictureUri { get; set; }
+    public decimal Price { get; set; }
 }

src/Web/ViewModels/File/FileViewModel.cs

@@ -1,9 +1,8 @@
-namespace Microsoft.eShopWeb.Web.ViewModels.File
+namespace Microsoft.eShopWeb.Web.ViewModels.File;
+
+public class FileViewModel
 {
-    public class FileViewModel
-    {
-        public string FileName { get; set; }
-        public string Url { get; set; }
-        public string DataBase64 { get; set; }
-    }
+    public string FileName { get; set; }
+    public string Url { get; set; }
+    public string DataBase64 { get; set; }
 }

src/Web/ViewModels/Manage/ChangePasswordViewModel.cs

@@ -1,25 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class ChangePasswordViewModel
 {
-    public class ChangePasswordViewModel
-    {
-        [Required]
-        [DataType(DataType.Password)]
-        [Display(Name = "Current password")]
-        public string OldPassword { get; set; }
+    [Required]
+    [DataType(DataType.Password)]
+    [Display(Name = "Current password")]
+    public string OldPassword { get; set; }
 
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "New password")]
-        public string NewPassword { get; set; }
+    [Required]
+    [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+    [DataType(DataType.Password)]
+    [Display(Name = "New password")]
+    public string NewPassword { get; set; }
 
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm new password")]
-        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+    [DataType(DataType.Password)]
+    [Display(Name = "Confirm new password")]
+    [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+    public string ConfirmPassword { get; set; }
 
-        public string StatusMessage { get; set; }
-    }
+    public string StatusMessage { get; set; }
 }

src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs

@@ -1,19 +1,18 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class EnableAuthenticatorViewModel
 {
-    public class EnableAuthenticatorViewModel
-    {
-        [Required]
-        [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Text)]
-        [Display(Name = "Verification Code")]
-        public string Code { get; set; }
+    [Required]
+    [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+    [DataType(DataType.Text)]
+    [Display(Name = "Verification Code")]
+    public string Code { get; set; }
 
-        [ReadOnly(true)]
-        public string SharedKey { get; set; }
+    [ReadOnly(true)]
+    public string SharedKey { get; set; }
 
-        public string AuthenticatorUri { get; set; }
-    }
+    public string AuthenticatorUri { get; set; }
 }

src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs

@@ -1,14 +1,13 @@
-using Microsoft.AspNetCore.Authentication;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Identity;
-using System.Collections.Generic;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class ExternalLoginsViewModel
 {
-    public class ExternalLoginsViewModel
-    {
-        public IList<UserLoginInfo> CurrentLogins { get; set; }
-        public IList<AuthenticationScheme> OtherLogins { get; set; }
-        public bool ShowRemoveButton { get; set; }
-        public string StatusMessage { get; set; }
-    }
+    public IList<UserLoginInfo> CurrentLogins { get; set; }
+    public IList<AuthenticationScheme> OtherLogins { get; set; }
+    public bool ShowRemoveButton { get; set; }
+    public string StatusMessage { get; set; }
 }

src/Web/ViewModels/Manage/GenerateRecoveryCodesViewModel.cs

@@ -1,7 +1,6 @@
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class GenerateRecoveryCodesViewModel
 {
-    public class GenerateRecoveryCodesViewModel
-    {
-        public string[] RecoveryCodes { get; set; }
-    }
+    public string[] RecoveryCodes { get; set; }
 }

src/Web/ViewModels/Manage/IndexViewModel.cs

@@ -1,21 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class IndexViewModel
 {
-    public class IndexViewModel
-    {
-        public string Username { get; set; }
+    public string Username { get; set; }
 
-        public bool IsEmailConfirmed { get; set; }
+    public bool IsEmailConfirmed { get; set; }
 
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; }
+    [Required]
+    [EmailAddress]
+    public string Email { get; set; }
 
-        [Phone]
-        [Display(Name = "Phone number")]
-        public string PhoneNumber { get; set; }
+    [Phone]
+    [Display(Name = "Phone number")]
+    public string PhoneNumber { get; set; }
 
-        public string StatusMessage { get; set; }
-    }
+    public string StatusMessage { get; set; }
 }

src/Web/ViewModels/Manage/RemoveLoginViewModel.cs

@@ -1,8 +1,7 @@
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class RemoveLoginViewModel
 {
-    public class RemoveLoginViewModel
-    {
-        public string LoginProvider { get; set; }
-        public string ProviderKey { get; set; }
-    }
+    public string LoginProvider { get; set; }
+    public string ProviderKey { get; set; }
 }

src/Web/ViewModels/Manage/SetPasswordViewModel.cs

@@ -1,20 +1,19 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class SetPasswordViewModel
 {
-    public class SetPasswordViewModel
-    {
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "New password")]
-        public string NewPassword { get; set; }
+    [Required]
+    [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
+    [DataType(DataType.Password)]
+    [Display(Name = "New password")]
+    public string NewPassword { get; set; }
 
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm new password")]
-        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
+    [DataType(DataType.Password)]
+    [Display(Name = "Confirm new password")]
+    [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
+    public string ConfirmPassword { get; set; }
 
-        public string StatusMessage { get; set; }
-    }
+    public string StatusMessage { get; set; }
 }

src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs

@@ -1,9 +1,8 @@
-namespace Microsoft.eShopWeb.Web.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
+
+public class TwoFactorAuthenticationViewModel
 {
-    public class TwoFactorAuthenticationViewModel
-    {
-        public bool HasAuthenticator { get; set; }
-        public int RecoveryCodesLeft { get; set; }
-        public bool Is2faEnabled { get; set; }
-    }
+    public bool HasAuthenticator { get; set; }
+    public int RecoveryCodesLeft { get; set; }
+    public bool Is2faEnabled { get; set; }
 }

src/Web/ViewModels/OrderItemViewModel.cs

@@ -1,12 +1,11 @@
-namespace Microsoft.eShopWeb.Web.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels;
+
+public class OrderItemViewModel
 {
-    public class OrderItemViewModel
-    {
-        public int ProductId { get; set; }
-        public string ProductName { get; set; }
-        public decimal UnitPrice { get; set; }
-        public decimal Discount => 0;
-        public int Units { get; set; }
-        public string PictureUrl { get; set; }
-    }
+    public int ProductId { get; set; }
+    public string ProductName { get; set; }
+    public decimal UnitPrice { get; set; }
+    public decimal Discount => 0;
+    public int Units { get; set; }
+    public string PictureUrl { get; set; }
 }

src/Web/ViewModels/OrderViewModel.cs

@@ -1,18 +1,17 @@
-using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
-using System;
+using System;
 using System.Collections.Generic;
+using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 
-namespace Microsoft.eShopWeb.Web.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels;
+
+public class OrderViewModel
 {
-    public class OrderViewModel
-    {
-        private const string DEFAULT_STATUS = "Pending";
+    private const string DEFAULT_STATUS = "Pending";
 
-        public int OrderNumber { get; set; }
-        public DateTimeOffset OrderDate { get; set; }
-        public decimal Total { get; set; }
-        public string Status => DEFAULT_STATUS;
-        public Address ShippingAddress { get; set; }
-        public List<OrderItemViewModel> OrderItems { get; set; } = new List<OrderItemViewModel>();
-    }
+    public int OrderNumber { get; set; }
+    public DateTimeOffset OrderDate { get; set; }
+    public decimal Total { get; set; }
+    public string Status => DEFAULT_STATUS;
+    public Address ShippingAddress { get; set; }
+    public List<OrderItemViewModel> OrderItems { get; set; } = new List<OrderItemViewModel>();
 }

src/Web/ViewModels/PaginationInfoViewModel.cs

@@ -1,12 +1,11 @@
-namespace Microsoft.eShopWeb.Web.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels;
+
+public class PaginationInfoViewModel
 {
-    public class PaginationInfoViewModel
-    {
-        public int TotalItems { get; set; }
-        public int ItemsPerPage { get; set; }
-        public int ActualPage { get; set; }
-        public int TotalPages { get; set; }
-        public string Previous { get; set; }
-        public string Next { get; set; }
-    }
+    public int TotalItems { get; set; }
+    public int ItemsPerPage { get; set; }
+    public int ActualPage { get; set; }
+    public int TotalPages { get; set; }
+    public string Previous { get; set; }
+    public string Next { get; set; }
 }