diff --git a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs
index 91ffb0db95..734c69159e 100644
--- a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs
+++ b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Autofac;
 using SmartStore.Core.Infrastructure;
 
diff --git a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs
index ba66c15bf0..026978c927 100644
--- a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs
+++ b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Caching;
+using Microsoft.Extensions.Caching.Memory;
 using System.Threading;
 
 namespace SmartStore.Core.Async
diff --git a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs
index 332b199c61..69046e5ba0 100644
--- a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs
+++ b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Caching;
+using Microsoft.Extensions.Caching.Memory;
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Threading;
diff --git a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs
index 601afc2fef..1f3f412927 100644
--- a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs
+++ b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Utilities;
 
 namespace SmartStore.Core.Caching
diff --git a/src/Libraries/SmartStore.Core/Collections/Querystring.cs b/src/Libraries/SmartStore.Core/Collections/Querystring.cs
index 84de3dd797..65ac786e47 100644
--- a/src/Libraries/SmartStore.Core/Collections/Querystring.cs
+++ b/src/Libraries/SmartStore.Core/Collections/Querystring.cs
@@ -1,7 +1,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Utilities.ObjectPools;
 
 namespace SmartStore.Collections
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs
index d94b7933e7..c0d97937dd 100644
--- a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs
+++ b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Globalization;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Utilities;
 
 namespace SmartStore.ComponentModel
diff --git a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs
index 4db9fd8d90..a0fdbd9e9d 100644
--- a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs
+++ b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Dynamic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json.Linq;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Shipping;
diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs
index 11a9944a32..5041f1a6f6 100644
--- a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs
+++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using EfState = System.Data.Entity.EntityState;
 
 namespace SmartStore.Core.Data.Hooks
diff --git a/src/Libraries/SmartStore.Core/Data/IDbContext.cs b/src/Libraries/SmartStore.Core/Data/IDbContext.cs
index 95224e0308..5044fca160 100644
--- a/src/Libraries/SmartStore.Core/Data/IDbContext.cs
+++ b/src/Libraries/SmartStore.Core/Data/IDbContext.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
 
 namespace SmartStore.Core.Data
diff --git a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs
index 430f4eabee..789a28b615 100644
--- a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Expressions;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs
index dc5a3eed3e..67173d80eb 100644
--- a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Expressions;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs
index 1fefc75eb2..f8cfc5e28a 100644
--- a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
diff --git a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs
index 821d502963..c433f51a65 100644
--- a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs
@@ -167,7 +167,6 @@ public static IReadOnlyCollection<string> GetVisibilityAffectingPropertyNames()
         /// Gets or sets a language identifier for which the blog post should be displayed.
         /// </summary>
         [DataMember]
-        [Index]
         public int? LanguageId { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs
index f0364da897..5d760ef767 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs
@@ -173,7 +173,6 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
         public bool Deleted { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs
index 68ec18111c..22d4205361 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs
@@ -109,7 +109,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc
         /// Gets or sets a value indicating whether the entity is subject to ACL.
         /// </summary>
         [DataMember]
-        [Index]
         public bool SubjectToAcl { get; set; }
 
         /// <summary>
@@ -121,7 +120,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
         public bool Deleted { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
index 06abbb9bbf..eff2b49bb4 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs
@@ -90,7 +90,6 @@ public static IReadOnlyCollection<string> GetVisibilityAffectingPropertyNames()
         /// Gets or sets the visibility level of the product.
         /// </summary>
         [DataMember]
-        [Index]
         public ProductVisibility Visibility { get; set; }
 
         /// <summary>
@@ -216,7 +215,6 @@ public string Sku
         /// Gets or sets the manufacturer part number
         /// </summary>
         [DataMember]
-        [Index]
         public string ManufacturerPartNumber
         {
             [DebuggerStepThrough]
@@ -228,7 +226,6 @@ public string ManufacturerPartNumber
         /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books).
         /// </summary>
         [DataMember]
-        [Index]
         public string Gtin
         {
             [DebuggerStepThrough]
@@ -669,30 +666,23 @@ public decimal Height
         /// Gets or sets a value indicating whether the entity is published
         /// </summary>
 		[DataMember]
-        [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)]
         public bool Published { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
-        [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)]
         public bool Deleted { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity is a system product.
         /// </summary>
         [DataMember]
-        [Index]
-        [Index("IX_Product_SystemName_IsSystemProduct", 2)]
-        [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)]
         public bool IsSystemProduct { get; set; }
 
         /// <summary>
         /// Gets or sets the product system name.
         /// </summary>
         [DataMember]
-        [Index("IX_Product_SystemName_IsSystemProduct", 1)]
         public string SystemName { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs
index 9043816b92..271ad124f1 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs
@@ -37,14 +37,12 @@ public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAli
         /// Gets or sets whether the attribute can be filtered
         /// </summary>
         [DataMember]
-        [Index]
         public bool AllowFiltering { get; set; }
 
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
         [DataMember]
-        [Index]
         public int DisplayOrder { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs
index 1d027e15b4..84c9c4f4e3 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs
@@ -25,7 +25,6 @@ public partial class ProductCategory : BaseEntity
         /// Gets or sets a value indicating whether the product is featured
         /// </summary>
         [DataMember]
-        [Index]
         public bool IsFeaturedProduct { get; set; }
 
         /// <summary>
@@ -38,7 +37,6 @@ public partial class ProductCategory : BaseEntity
         /// Indicates whether the mapping is created by the user or by the system.
         /// </summary>
         [DataMember]
-        [Index]
         public bool IsSystemMapping { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs
index 88babcda90..22aafb82c4 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs
@@ -25,7 +25,6 @@ public partial class ProductManufacturer : BaseEntity
         /// Gets or sets a value indicating whether the product is featured
         /// </summary>
 		[DataMember]
-        [Index]
         public bool IsFeaturedProduct { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs
index ace86b58ef..0c18987c40 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs
@@ -23,7 +23,6 @@ public partial class ProductTag : BaseEntity, ILocalizedEntity
         /// Gets or sets a value indicating whether the entity is published.
         /// </summary>
         [DataMember]
-        [Index("IX_ProductTag_Published")]
         public bool Published { get; set; } = true;
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs
index 44f6a4885e..3d18477b8e 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs
@@ -18,7 +18,6 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity
         /// Gets or sets the product identifier
         /// </summary>
 		[DataMember]
-        [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)]
         public int ProductId { get; set; }
 
         /// <summary>
@@ -51,14 +50,12 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity
         /// Gets or sets the attribute control type identifier
         /// </summary>
 		[DataMember]
-        [Index]
         public int AttributeControlTypeId { get; set; }
 
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
 		[DataMember]
-        [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)]
         public int DisplayOrder { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs
index d3199afd8c..39025e8cc2 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs
@@ -24,14 +24,12 @@ public partial class ProductVariantAttributeCombination : BaseEntity
         /// Gets or sets the stock quantity
         /// </summary>
 		[DataMember]
-        [Index("IX_StockQuantity_AllowOutOfStockOrders", 1)]
         public int StockQuantity { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to allow orders when out of stock
         /// </summary>
 		[DataMember]
-        [Index("IX_StockQuantity_AllowOutOfStockOrders", 2)]
         public bool AllowOutOfStockOrders { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs
index 7804a7f972..81853a7c6d 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs
@@ -15,7 +15,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity
         /// Gets or sets the product variant attribute mapping identifier
         /// </summary>
 		[DataMember]
-        [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 1)]
         public int ProductVariantAttributeId { get; set; }
 
         /// <summary>
@@ -28,7 +27,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity
         /// Gets or sets the product variant attribute name
         /// </summary>
 		[DataMember]
-        [Index]
         public string Name { get; set; }
 
         /// <summary>
@@ -65,14 +63,12 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity
         /// Gets or sets the display order
         /// </summary>
 		[DataMember]
-        [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 2)]
         public int DisplayOrder { get; set; }
 
         /// <summary>
         /// Gets or sets the type Id
         /// </summary>
         [DataMember]
-        [Index]
         public int ValueTypeId { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs
index 9b3a3c6463..e30a6eb201 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs
@@ -20,11 +20,9 @@ public ProductVariantAttributeCombination()
         public string Sku { get; set; }
 
         [DataMember]
-        [Index]
         public string Gtin { get; set; }
 
         [DataMember]
-        [Index]
         public string ManufacturerPartNumber { get; set; }
 
         [DataMember]
@@ -61,7 +59,6 @@ public ProductVariantAttributeCombination()
         public virtual QuantityUnit QuantityUnit { get; set; }
 
         [DataMember]
-        [Index]
         public bool IsActive { get; set; }
         //public bool IsDefaultCombination { get; set; }
 
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs
index f867f81ff7..d74ce5f850 100644
--- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs
@@ -43,7 +43,6 @@ public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity, ISea
         /// Gets or sets whether the specification attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin.
         /// </summary>
         [DataMember]
-        [Index]
         public bool AllowFiltering { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs
index 90fc7610e9..01d0ac59f0 100644
--- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs
@@ -27,7 +27,6 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport
         /// <summary>
         /// Gets or sets the parent menu item identifier. 0 if the item has no parent.
         /// </summary>
-        [Index("IX_MenuItem_ParentItemId")]
         public int ParentItemId { get; set; }
 
         /// <summary>
@@ -63,13 +62,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport
         /// <summary>
         /// Gets or sets a value indicating whether the menu item is published.
         /// </summary>
-        [Index("IX_MenuItem_Published")]
         public bool Published { get; set; } = true;
 
         /// <summary>
         /// Gets or sets the display order.
         /// </summary>
-        [Index("IX_MenuItem_DisplayOrder")]
         public int DisplayOrder { get; set; }
 
         /// <summary>
@@ -125,13 +122,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport
         /// <summary>
         /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores.
         /// </summary>
-        [Index("IX_MenuItem_LimitedToStores")]
         public bool LimitedToStores { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity is subject to ACL.
         /// </summary>
-        [Index("IX_MenuItem_SubjectToAcl")]
         public bool SubjectToAcl { get; set; }
     }
 }
diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs
index 19dfe6e581..5e09e49181 100644
--- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs
@@ -35,7 +35,6 @@ public virtual ICollection<MenuItemRecord> Items
         /// <summary>
         /// Gets or sets the value indicating whether this menu is deleteable by a user.
         /// </summary>
-        [Index("IX_Menu_SystemName_IsSystemMenu", Order = 1)]
         public bool IsSystemMenu { get; set; }
 
         /// <summary>
@@ -59,7 +58,6 @@ public virtual ICollection<MenuItemRecord> Items
         /// <summary>
         /// Gets or sets a value indicating whether the menu is published.
         /// </summary>
-        [Index("IX_Menu_Published")]
         public bool Published { get; set; } = true;
 
         /// <summary>
@@ -70,13 +68,11 @@ public virtual ICollection<MenuItemRecord> Items
         /// <summary>
         /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores.
         /// </summary>
-        [Index("IX_Menu_LimitedToStores")]
         public bool LimitedToStores { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity is subject to ACL.
         /// </summary>
-        [Index("IX_Menu_SubjectToAcl")]
         public bool SubjectToAcl { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs
index c0582bce24..b5dbd9b4eb 100644
--- a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs
@@ -105,35 +105,30 @@ public PasswordFormat PasswordFormat
         /// <summary>
         /// Gets or sets a value indicating whether the customer has been deleted
         /// </summary>
-		[Index]
-        [Index("IX_Customer_Deleted_IsSystemAccount", 1)]
         public bool Deleted { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the customer account is system
         /// </summary>
 		[DataMember]
-        [Index]
-        [Index("IX_Customer_Deleted_IsSystemAccount", 2)]
         public bool IsSystemAccount { get; set; }
 
         /// <summary>
         /// Gets or sets the customer system name
         /// </summary>
 		[DataMember]
-        [Index]
         public string SystemName { get; set; }
 
         /// <summary>
         /// Gets or sets the last IP address
         /// </summary>
-		[DataMember, Index("IX_Customer_LastIpAddress")]
+		[DataMember]
         public string LastIpAddress { get; set; }
 
         /// <summary>
         /// Gets or sets the date and time of entity creation
         /// </summary>
-		[DataMember, Index("IX_Customer_CreatedOn")]
+		[DataMember]
         public DateTime CreatedOnUtc { get; set; }
 
         /// <summary>
@@ -145,7 +140,7 @@ public PasswordFormat PasswordFormat
         /// <summary>
         /// Gets or sets the date and time of last activity
         /// </summary>
-		[DataMember, Index("IX_Customer_LastActivity")]
+		[DataMember]
         public DateTime LastActivityDateUtc { get; set; }
 
         /// <summary>
@@ -162,16 +157,16 @@ public PasswordFormat PasswordFormat
         [DataMember]
         public string LastName { get; set; }
 
-        [DataMember, Index("IX_Customer_FullName")]
+        [DataMember]
         public string FullName { get; set; }
 
-        [DataMember, Index("IX_Customer_Company")]
+        [DataMember]
         public string Company { get; set; }
 
-        [DataMember, Index("IX_Customer_CustomerNumber")]
+        [DataMember]
         public string CustomerNumber { get; set; }
 
-        [DataMember, Index("IX_Customer_BirthDate")]
+        [DataMember]
         public DateTime? BirthDate { get; set; }
 
         [DataMember]
diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs
index f5f8e96436..6d20871c2e 100644
--- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs
@@ -43,23 +43,18 @@ public partial class CustomerRole : BaseEntity, IRulesContainer
         /// Gets or sets a value indicating whether the customer role is active
         /// </summary>
         [DataMember]
-        [Index]
         public bool Active { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the customer role is system
         /// </summary>
         [DataMember]
-        [Index]
-        [Index("IX_CustomerRole_SystemName_IsSystemRole", 2)]
         public bool IsSystemRole { get; set; }
 
         /// <summary>
         /// Gets or sets the customer role system name
         /// </summary>
         [DataMember]
-        [Index]
-        [Index("IX_CustomerRole_SystemName_IsSystemRole", 1)]
         public string SystemName { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs
index 18ff112076..7035fb90f3 100644
--- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs
@@ -26,7 +26,6 @@ public partial class CustomerRoleMapping : BaseEntity
         /// Indicates whether the mapping is created by the user or by the system.
         /// </summary>
         [DataMember]
-        [Index]
         public bool IsSystemMapping { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs
index 4befa9f0d9..fd0dd77183 100644
--- a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs
@@ -12,7 +12,6 @@ public class WalletHistory : BaseEntity
         /// <summary>
         /// Gets or sets the store identifier. Should not be zero.
         /// </summary>
-        [Index("IX_StoreId_CreatedOn", 0)]
         public int StoreId { get; set; }
 
         /// <summary>
@@ -43,7 +42,6 @@ public class WalletHistory : BaseEntity
         /// <summary>
         /// Gets or sets the date ehen the entry was created (in UTC).
         /// </summary>
-        [Index("IX_StoreId_CreatedOn", 1)]
         public DateTime CreatedOnUtc { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs
index 09230db0a7..b6f31f241c 100644
--- a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs
+++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs
@@ -20,30 +20,24 @@ public SyncMapping()
         /// <summary>
         /// Gets or sets the entity identifier in SmartStore
         /// </summary>
-        [Index("IX_SyncMapping_ByEntity", 0, IsUnique = true)]
         [DataMember]
         public int EntityId { get; set; }
 
         /// <summary>
         /// Gets or sets the entity's key in the external application
         /// </summary>
-        [Index("IX_SyncMapping_BySource", 0, IsUnique = true)]
         [DataMember]
         public string SourceKey { get; set; }
 
         /// <summary>
         /// Gets or sets a name representing the entity type
         /// </summary>
-        [Index("IX_SyncMapping_ByEntity", 1, IsUnique = true)]
-        [Index("IX_SyncMapping_BySource", 1, IsUnique = true)]
         [DataMember]
         public string EntityName { get; set; }
 
         /// <summary>
         /// Gets or sets a name for the external application
         /// </summary>
-        [Index("IX_SyncMapping_ByEntity", 2, IsUnique = true)]
-        [Index("IX_SyncMapping_BySource", 2, IsUnique = true)]
         [DataMember]
         public string ContextName { get; set; }
 
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs
index b4cedb8d01..df8c4cb64c 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs
@@ -13,7 +13,6 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp
         /// <summary>
         /// Gets or sets the forum group identifier
         /// </summary>
-        [Index("IX_ForumGroupId_DisplayOrder", Order = 0)]
         public int ForumGroupId { get; set; }
 
         /// <summary>
@@ -59,7 +58,6 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
-        [Index("IX_ForumGroupId_DisplayOrder", Order = 1)]
         public int DisplayOrder { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs
index 3b21ddda01..40d82f6dbd 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs
@@ -28,7 +28,6 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
-        [Index]
         public int DisplayOrder { get; set; }
 
         /// <summary>
@@ -44,13 +43,11 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported
         /// <summary>
         /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
         /// </summary>
-        [Index]
         public bool LimitedToStores { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity is subject to ACL
         /// </summary>
-        [Index]
         public bool SubjectToAcl { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs
index 3098a9cdc0..1809ec537e 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs
@@ -35,7 +35,6 @@ public partial class ForumPost : BaseEntity, IAuditable
         /// <summary>
         /// Gets or sets the date and time of instance creation
         /// </summary>
-        [Index]
         public DateTime CreatedOnUtc { get; set; }
 
         /// <summary>
@@ -46,7 +45,6 @@ public partial class ForumPost : BaseEntity, IAuditable
         /// <summary>
         /// Gets or sets a value indicating whether the entity is published
         /// </summary>
-        [Index]
         public bool Published { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs
index d7059778c1..feecc8ab5b 100644
--- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs
@@ -12,7 +12,6 @@ public partial class ForumTopic : BaseEntity, IAuditable
         /// <summary>
         /// Gets or sets the forum identifier
         /// </summary>
-        [Index("IX_ForumId_Published", Order = 0)]
         public int ForumId { get; set; }
 
         /// <summary>
@@ -23,19 +22,16 @@ public partial class ForumTopic : BaseEntity, IAuditable
         /// <summary>
         /// Gets or sets the topic type identifier
         /// </summary>
-        [Index("IX_TopicTypeId_LastPostTime", Order = 0)]
         public int TopicTypeId { get; set; }
 
         /// <summary>
         /// Gets or sets the subject
         /// </summary>
-        [Index]
         public string Subject { get; set; }
 
         /// <summary>
         /// Gets or sets the number of posts
         /// </summary>
-        [Index]
         public int NumPosts { get; set; }
 
         /// <summary>
@@ -62,13 +58,11 @@ public partial class ForumTopic : BaseEntity, IAuditable
         /// <summary>
         /// Gets or sets the last post date and time
         /// </summary>
-        [Index("IX_TopicTypeId_LastPostTime", Order = 1)]
         public DateTime? LastPostTime { get; set; }
 
         /// <summary>
         /// Gets or sets the date and time of instance creation
         /// </summary>
-        [Index]
         public DateTime CreatedOnUtc { get; set; }
 
         /// <summary>
@@ -79,7 +73,6 @@ public partial class ForumTopic : BaseEntity, IAuditable
         /// <summary>
         /// Gets or sets a value indicating whether the entity is published
         /// </summary>
-        [Index("IX_ForumId_Published", Order = 1)]
         public bool Published { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs
index 521252dd36..e0bc8cd285 100644
--- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs
@@ -13,29 +13,24 @@ public partial class LocalizedProperty : BaseEntity
         /// Gets or sets the entity identifier
         /// </summary>
 		[DataMember]
-        [Index("IX_LocalizedProperty_Compound", Order = 1)]
         public int EntityId { get; set; }
 
         /// <summary>
         /// Gets or sets the language identifier
         /// </summary>
 		[DataMember]
-        [Index("IX_LocalizedProperty_Compound", Order = 4)]
         public int LanguageId { get; set; }
 
         /// <summary>
         /// Gets or sets the locale key group
         /// </summary>
 		[DataMember]
-        [Index("IX_LocalizedProperty_Compound", Order = 3)]
-        [Index("IX_LocalizedProperty_LocaleKeyGroup")]
         public string LocaleKeyGroup { get; set; }
 
         /// <summary>
         /// Gets or sets the locale key
         /// </summary>
 		[DataMember]
-        [Index("IX_LocalizedProperty_Compound", Order = 2)]
         public string LocaleKey { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs
index a907f17dfc..d255a58f54 100644
--- a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs
@@ -15,7 +15,6 @@ public partial class Log : BaseEntity
         /// <summary>
         /// Gets or sets the log level identifier
         /// </summary>
-        [Index("IX_Log_Level", IsUnique = false)]
         public int LogLevelId { get; set; }
 
         /// <summary>
@@ -56,7 +55,6 @@ public partial class Log : BaseEntity
         /// <summary>
         /// Gets or sets the logger name
         /// </summary>
-        [Index("IX_Log_Logger", IsUnique = false)]
         public string Logger { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs
index 95c3a6351e..d601a526ff 100644
--- a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs
@@ -15,7 +15,6 @@ public partial class Download : BaseEntity//, ITransient
         /// Gets or sets a GUID
         /// </summary>
         [DataMember]
-        [Index]
         public Guid DownloadGuid { get; set; }
 
         /// <summary>
@@ -34,14 +33,12 @@ public partial class Download : BaseEntity//, ITransient
         /// Gets or sets a value indicating whether the entity transient/preliminary
         /// </summary>
         [DataMember]
-        [Index("IX_UpdatedOn_IsTransient", 1)]
         public bool IsTransient { get; set; }
 
         /// <summary>
         /// Gets or sets the date and time of instance update
         /// </summary>
         [DataMember]
-        [Index("IX_UpdatedOn_IsTransient", 0)]
         public DateTime UpdatedOnUtc { get; set; }
 
         /// <summary>
@@ -60,14 +57,12 @@ public partial class Download : BaseEntity//, ITransient
         /// Gets or sets a value indicating the corresponding entity id
         /// </summary>
         [DataMember]
-        [Index("IX_EntityId_EntityName", 0)]
         public int EntityId { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating the corresponding entity name
         /// </summary>
         [DataMember]
-        [Index("IX_EntityId_EntityName", 1)]
         [StringLength(100)]
         public string EntityName { get; set; }
 
diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs
index 2681666518..4283ead9df 100644
--- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs
@@ -37,13 +37,6 @@ public static IReadOnlyCollection<string> GetOutputAffectingPropertyNames()
         /// Gets or sets the associated folder identifier.
         /// </summary>
         [DataMember]
-        [Index("IX_Media_MediaType", 0)]
-        [Index("IX_Media_Extension", 0)]
-        [Index("IX_Media_PixelSize", 0)]
-        [Index("IX_Media_Name", 0)]
-        [Index("IX_Media_Size", 0)]
-        [Index("IX_Media_UpdatedOnUtc", 0)]
-        [Index("IX_Media_FolderId", 0)]
         public int? FolderId { get; set; }
 
         /// <summary>
@@ -56,7 +49,6 @@ public static IReadOnlyCollection<string> GetOutputAffectingPropertyNames()
         /// Gets or sets the SEO friendly name of the media file including file extension
         /// </summary>
         [DataMember]
-        [Index("IX_Media_Name", 1)]
         public string Name { get; set; }
 
         /// <summary>
@@ -75,8 +67,6 @@ public static IReadOnlyCollection<string> GetOutputAffectingPropertyNames()
         /// Gets or sets the (dotless) file extension
         /// </summary>
         [DataMember]
-        [Index("IX_Media_MediaType", 2)]
-        [Index("IX_Media_Extension", 1)]
         public string Extension { get; set; }
 
         /// <summary>
@@ -89,23 +79,18 @@ public static IReadOnlyCollection<string> GetOutputAffectingPropertyNames()
         /// Gets or sets the file media type (image, video, audio, document etc.)
         /// </summary>
         [DataMember]
-        [Index("IX_Media_MediaType", 1)]
         public string MediaType { get; set; }
 
         /// <summary>
         /// Gets or sets the file size in bytes
         /// </summary>
         [DataMember]
-        [Index("IX_Media_Size", 1)]
         public int Size { get; set; }
 
         /// <summary>
         /// Gets or sets the total pixel size of an image (width * height)
         /// </summary>
         [DataMember]
-        [Index("IX_Media_MediaType", 3)]
-        [Index("IX_Media_Extension", 2)]
-        [Index("IX_Media_PixelSize", 1)]
         public int? PixelSize { get; set; }
 
         /// <summary>
@@ -147,13 +132,6 @@ public static IReadOnlyCollection<string> GetOutputAffectingPropertyNames()
         /// <summary>
         /// Gets or sets a value indicating whether the file has been soft deleted
         /// </summary>
-        [Index("IX_Media_MediaType", 4)]
-        [Index("IX_Media_Extension", 3)]
-        [Index("IX_Media_PixelSize", 2)]
-        [Index("IX_Media_Name", 2)]
-        [Index("IX_Media_Size", 2)]
-        [Index("IX_Media_UpdatedOnUtc", 2)]
-        [Index("IX_Media_FolderId", 1)]
         public bool Deleted { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs
index 3598c1bb8d..7a025715af 100644
--- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs
@@ -14,7 +14,6 @@ public partial class MediaFolder : BaseEntity
         /// Gets or sets the parent folder id.
         /// </summary>
         [DataMember]
-        [Index("IX_NameParentId", Order = 0, IsUnique = true)]
         public int? ParentId { get; set; }
 
         /// <summary>
@@ -26,7 +25,6 @@ public partial class MediaFolder : BaseEntity
         /// Gets or sets the media folder name.
         /// </summary>
         [DataMember]
-        [Index("IX_NameParentId", Order = 1, IsUnique = true)]
         public string Name { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs
index 359c4c5141..526a7439bb 100644
--- a/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs
@@ -26,7 +26,6 @@ public partial class MediaTrack : BaseEntity, IEquatable<MediaTrack>
         /// Gets or sets the media file identifier.
         /// </summary>
         [DataMember]
-        [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 0)]
         public int MediaFileId
         {
             get => _mediaFileId;
@@ -52,7 +51,6 @@ public int MediaFileId
         /// Gets or sets the related entity identifier.
         /// </summary>
         [DataMember]
-        [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 1)]
         public int EntityId
         {
             get => _entityId;
@@ -67,7 +65,6 @@ public int EntityId
         /// Gets or sets the related entity set name.
         /// </summary>
         [DataMember]
-        [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 2)]
         public string EntityName
         {
             get => _entityName;
@@ -82,7 +79,6 @@ public string EntityName
         /// Gets or sets the media file property name in the tracked entity.
         /// </summary>
         [DataMember]
-        [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 3)]
         public string Property
         {
             get => _property;
diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs
index b15cfc8557..e1829058c8 100644
--- a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Core.Domain.Stores;
 
@@ -43,7 +43,6 @@ public partial class MessageTemplate : BaseEntity, ILocalizedEntity, IStoreMappi
         /// <summary>
         /// Gets or sets the body
         /// </summary>
-		[AllowHtml]
         public string Body { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs
index 282267126a..69743f9821 100644
--- a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs
@@ -20,14 +20,12 @@ public partial class NewsLetterSubscription : BaseEntity
         /// Gets or sets the subcriber email
         /// </summary>
         [DataMember]
-        [Index("IX_NewsletterSubscription_Email_StoreId", 1)]
         public string Email { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether subscription is active
         /// </summary>
         [DataMember]
-        [Index]
         public bool Active { get; set; }
 
         /// <summary>
@@ -40,7 +38,6 @@ public partial class NewsLetterSubscription : BaseEntity
         /// Gets or sets the store identifier
         /// </summary>
         [DataMember]
-        [Index("IX_NewsletterSubscription_Email_StoreId", 2)]
         public int StoreId { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs
index 954961a9b2..0f380e95c4 100644
--- a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs
+++ b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs
@@ -130,7 +130,6 @@ public static IReadOnlyCollection<string> GetVisibilityAffectingPropertyNames()
         /// <summary>
         /// Gets or sets a language identifier for which the news item should be displayed.
         /// </summary>
-        [Index]
         public int? LanguageId { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs
index d32337103c..0cb3324729 100644
--- a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs
@@ -440,7 +440,6 @@ protected virtual SortedDictionary<decimal, decimal> ParseTaxRates(string taxRat
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
         public bool Deleted { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs
index aa2f64a941..ee88fdccdf 100644
--- a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs
@@ -13,7 +13,6 @@ public class PermissionRecord : BaseEntity
         /// <summary>
         /// Gets or sets the permission system name.
         /// </summary>
-        [Index]
         public string SystemName { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs
index bf04b013c6..3edb5ec884 100644
--- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs
@@ -37,13 +37,11 @@ public class ScheduleTask : BaseEntity, ICloneable<ScheduleTask>
         /// <summary>
         /// Gets or sets the type of appropriate ITask class
         /// </summary>
-		[Index("IX_Type")]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets the value indicating whether a task is enabled
         /// </summary>
-        [Index("IX_NextRun_Enabled", 1)]
         public bool Enabled { get; set; }
 
         /// <summary>
@@ -56,7 +54,6 @@ public class ScheduleTask : BaseEntity, ICloneable<ScheduleTask>
         /// </summary>
         public bool StopOnError { get; set; }
 
-        [Index("IX_NextRun_Enabled", 0)]
         public DateTime? NextRunUtc { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs
index dbf2cbfefb..53b53b742a 100644
--- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs
+++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs
@@ -15,25 +15,21 @@ public class ScheduleTaskHistory : BaseEntity, ICloneable<ScheduleTaskHistory>
         /// <summary>
         /// Gets or sets whether the task is running.
         /// </summary>
-        [Index("IX_MachineName_IsRunning", 1)]
         public bool IsRunning { get; set; }
 
         /// <summary>
         /// Gets or sets the server machine name.
         /// </summary>
-        [Index("IX_MachineName_IsRunning", 0)]
         public string MachineName { get; set; }
 
         /// <summary>
         /// Gets or sets the date when the task was started. It is also the date when this entry was created.
         /// </summary>
-        [Index("IX_Started_Finished", 0)]
         public DateTime StartedOnUtc { get; set; }
 
         /// <summary>
         /// Gets or sets the date when the task has been finished.
         /// </summary>
-        [Index("IX_Started_Finished", 1)]
         public DateTime? FinishedOnUtc { get; set; }
 
         /// <summary>
diff --git a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs
index f867372efa..86dcd8ef84 100644
--- a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Utilities.ObjectPools;
diff --git a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs
index df752203cd..37f9114a04 100644
--- a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.UI;
 
 namespace SmartStore
 {
diff --git a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs
index a2618ee834..650fb27524 100644
--- a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs
@@ -5,10 +5,10 @@
 using System.Linq;
 using System.Net;
 using System.Runtime.CompilerServices;
-using System.Web;
-using System.Web.Caching;
-using System.Web.Mvc;
-using System.Web.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Identity;
 using SmartStore.Core;
 using SmartStore.Core.Fakes;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs
index 94ad48d31e..9ee584c151 100644
--- a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 // use base SmartStore Namespace to ensure the extension methods are always available
 namespace SmartStore
diff --git a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs
index efea7d0778..bf4efe7eab 100644
--- a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs
+++ b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs
@@ -9,7 +9,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Html;
 using SmartStore.Utilities.ObjectPools;
 
diff --git a/src/Libraries/SmartStore.Core/Fakes/Extensions.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/Extensions.cs
similarity index 94%
rename from src/Libraries/SmartStore.Core/Fakes/Extensions.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/Extensions.cs
index a6b9d765e8..4e65ce0a35 100644
--- a/src/Libraries/SmartStore.Core/Fakes/Extensions.cs
+++ b/src/Libraries/SmartStore.Core/Fakes.disabled/Extensions.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Fakes
 {
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeController.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeController.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Fakes/FakeController.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeController.cs
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpContext.cs
similarity index 98%
rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpContext.cs
index 6da257d71a..c0d1b86805 100644
--- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs
+++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpContext.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Security.Principal;
-using System.Web;
-using System.Web.SessionState;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Fakes
 {
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpHandler.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpHandler.cs
similarity index 89%
rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpHandler.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpHandler.cs
index ea0839801a..1b42258b2f 100644
--- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpHandler.cs
+++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpHandler.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Fakes
 {
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpRequest.cs
similarity index 97%
rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpRequest.cs
index 5bc4db024a..bbcf819c0d 100644
--- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs
+++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpRequest.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Specialized;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Core.Fakes
 {
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpResponse.cs
similarity index 96%
rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpResponse.cs
index 4b5719ed6e..1552cc5443 100644
--- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs
+++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpResponse.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Fakes
 {
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpSessionState.cs
similarity index 96%
rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpSessionState.cs
index 6d45307e06..ad8937f34f 100644
--- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs
+++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpSessionState.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Specialized;
-using System.Web;
-using System.Web.SessionState;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Fakes
 {
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeIdentity.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeIdentity.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Fakes/FakeIdentity.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeIdentity.cs
diff --git a/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakePrincipal.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs
rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakePrincipal.cs
diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs
index ff56b0f0d5..50dcf63fa1 100644
--- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs
+++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Html.CodeFormatter
 {
diff --git a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs
index 2428d3c4aa..20048425d8 100644
--- a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs
+++ b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs
@@ -3,12 +3,12 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using AngleSharp;
 using AngleSharp.Dom;
-using AngleSharp.Extensions;
-using AngleSharp.Parser.Html;
-using Ganss.XSS;
+using AngleSharp.Dom;
+using AngleSharp.Html.Parser;
+using Ganss.Xss;
 using SmartStore.Utilities.ObjectPools;
 
 namespace SmartStore.Core.Html
diff --git a/src/Libraries/SmartStore.Core/IMergedData.cs b/src/Libraries/SmartStore.Core/IMergedData.cs
index 2cf39de6dd..8f22e7f0d5 100644
--- a/src/Libraries/SmartStore.Core/IMergedData.cs
+++ b/src/Libraries/SmartStore.Core/IMergedData.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 
diff --git a/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs b/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs
index 91e96b0ed5..df185815e4 100644
--- a/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs
+++ b/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.IO;
 using System.Text;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Data;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs
index 45bb9e8c77..4601b9386e 100644
--- a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs
+++ b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs
@@ -4,8 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Utilities;
 
 namespace SmartStore.Core.IO
diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs
index a7eea24f4e..f5f5344abc 100644
--- a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs
+++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web;
-using System.Web.Caching;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Logging;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs
index 2a7d3717f0..752f7af654 100644
--- a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs
+++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Web.Caching;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace SmartStore.Core.IO
 {
diff --git a/src/Libraries/SmartStore.Core/IWebHelper.cs b/src/Libraries/SmartStore.Core/IWebHelper.cs
index 31cd154105..120d605ad3 100644
--- a/src/Libraries/SmartStore.Core/IWebHelper.cs
+++ b/src/Libraries/SmartStore.Core/IWebHelper.cs
@@ -1,4 +1,4 @@
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core
 {
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs
index 14b51e277c..70340a2ffb 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Filters;
 using SmartStore.Core.Logging;
 
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs
index ae9af5f59e..6f6eaa1ce4 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Runtime.Remoting.Messaging;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Infrastructure
 {
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs
index d32030bcbd..9958517636 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Web;
-using Autofac.Integration.Mvc;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Infrastructure.DependencyManagement
 {
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs
index b4b0886ac5..4b41adf58c 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using Autofac;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs
index eab1548dc0..7cafa3436b 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs
@@ -1,6 +1,5 @@
 using System;
 using Autofac;
-using Autofac.Integration.Mvc;
 
 namespace SmartStore.Core.Infrastructure.DependencyManagement
 {
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs
index 5fabdf7d55..da44476106 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs
@@ -3,9 +3,8 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Autofac;
-using Autofac.Integration.Mvc;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure.DependencyManagement;
 using SmartStore.Core.Logging;
diff --git a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs
index 4b6981b2ef..1f65a349f8 100644
--- a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs
+++ b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Plugins;
 using SmartStore.Utilities;
diff --git a/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs b/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs
index 7a97e459b3..5cd8631c15 100644
--- a/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs
+++ b/src/Libraries/SmartStore.Core/Localization/LocalizationFileResolver.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Caching;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs b/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs
index 82dc95d9ee..5c3608b84f 100644
--- a/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs
+++ b/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Core.Localization
 {
diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs
index be5b37a6b1..764e4d013b 100644
--- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs
+++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using log4net.Core;
 using log4net.Util;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs
index b949429081..e31e73da4e 100644
--- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs
+++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs
@@ -3,7 +3,7 @@
 using System.Data;
 using System.IO;
 using System.Linq;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using log4net;
 using log4net.Appender;
 using log4net.Config;
diff --git a/src/Libraries/SmartStore.Core/Packaging/ExtensionDescriptor.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/ExtensionDescriptor.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/ExtensionDescriptor.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/ExtensionDescriptor.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/FolderUpdater.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/FolderUpdater.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/IPackageBuilder.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/IPackageBuilder.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/IPackageBuilder.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/IPackageBuilder.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/IPackageInstaller.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/IPackageInstaller.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/IPackageInstaller.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/IPackageInstaller.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/IPackageManager.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/IPackageManager.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/IPackageManager.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/IPackageManager.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/ExtensionReferenceRepository.cs
similarity index 99%
rename from src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/ExtensionReferenceRepository.cs
index 644b6b15a7..6ae75d01a5 100644
--- a/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/ExtensionReferenceRepository.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using NuGet;
 using SmartStore.Core.Plugins;
 using SmartStore.Core.Themes;
 
diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/FileBasedProjectSystem.cs
similarity index 99%
rename from src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/FileBasedProjectSystem.cs
index 22e5a3c580..f4f1932831 100644
--- a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/FileBasedProjectSystem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Runtime.Versioning;
-using NuGet;
 
 namespace SmartStore.Core.Packaging
 {
diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/NugetLogger.cs
similarity index 98%
rename from src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/NugetLogger.cs
index 8a2942f601..7ad1041b32 100644
--- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/NugetLogger.cs
@@ -1,5 +1,4 @@
 using System;
-using NuGet;
 using SmartStore.Core.Logging;
 using Log = SmartStore.Core.Logging;
 
diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/NullSourceRepository.cs
similarity index 98%
rename from src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/NullSourceRepository.cs
index 24d9271ae6..9007dcf8a5 100644
--- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet/NullSourceRepository.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using NuGet;
 
 namespace SmartStore.Core.Packaging
 {
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageBuilder.cs
similarity index 99%
rename from src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackageBuilder.cs
index d3d23fda59..7a9d516cc0 100644
--- a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageBuilder.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
-using NuGet;
 using SmartStore.Core.IO;
 using SmartStore.Core.Plugins;
 using SmartStore.Core.Themes;
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageInfo.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageInfo.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/PackageInfo.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackageInfo.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageInstaller.cs
similarity index 99%
rename from src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackageInstaller.cs
index 98e98970dd..3b00e853ae 100644
--- a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageInstaller.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using NuGet;
 using SmartStore.Core.IO;
 using SmartStore.Core.Localization;
 using SmartStore.Core.Logging;
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageManager.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/PackageManager.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackageManager.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingResult.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackagingResult.cs
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/PackagingResult.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackagingResult.cs
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackagingUtils.cs
similarity index 99%
rename from src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackagingUtils.cs
index cbaa6e0cd0..63d1badd03 100644
--- a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/PackagingUtils.cs
@@ -1,8 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Web.Hosting;
-using NuGet;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Plugins;
 using SmartStore.Core.Themes;
 
diff --git a/src/Libraries/SmartStore.Core/Packaging/Readme.txt b/src/Libraries/SmartStore.Core/Packaging.disabled/Readme.txt
similarity index 100%
rename from src/Libraries/SmartStore.Core/Packaging/Readme.txt
rename to src/Libraries/SmartStore.Core/Packaging.disabled/Readme.txt
diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/Updater/AppUpdater.cs
similarity index 99%
rename from src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs
rename to src/Libraries/SmartStore.Core/Packaging.disabled/Updater/AppUpdater.cs
index 0e5cae0836..aeb19b31fa 100644
--- a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs
+++ b/src/Libraries/SmartStore.Core/Packaging.disabled/Updater/AppUpdater.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
-using NuGet;
 using SmartStore.Core.Data;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Plugins;
diff --git a/src/Libraries/SmartStore.Core/PagedList`T.cs b/src/Libraries/SmartStore.Core/PagedList`T.cs
index 3796a1350a..d4309f09e6 100644
--- a/src/Libraries/SmartStore.Core/PagedList`T.cs
+++ b/src/Libraries/SmartStore.Core/PagedList`T.cs
@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Linq;
 using System.Threading.Tasks;
 
diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs
index d8a3f158af..d383990f97 100644
--- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs
+++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs
@@ -6,9 +6,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Web;
-using System.Web.Compilation;
-using Microsoft.Web.Infrastructure.DynamicModuleHelper;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Infrastructure.DependencyManagement;
@@ -21,7 +19,6 @@
 // SEE THIS POST for full details of what this does
 //http://shazwazza.com/post/Developing-a-plugin-framework-in-ASPNET-with-medium-trust.aspx
 
-[assembly: PreApplicationStartMethod(typeof(PluginManager), "Initialize")]
 namespace SmartStore.Core.Plugins
 {
     /// <summary>
diff --git a/src/Libraries/SmartStore.Core/RouteInfo.cs b/src/Libraries/SmartStore.Core/RouteInfo.cs
index e98f9d9004..5932759ce3 100644
--- a/src/Libraries/SmartStore.Core/RouteInfo.cs
+++ b/src/Libraries/SmartStore.Core/RouteInfo.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json;
 
 namespace SmartStore
diff --git a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs
index 587be18e1f..5dc1193482 100644
--- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs
+++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs
@@ -17,7 +17,6 @@ public partial class RuleEntity : BaseEntity
 
         [DataMember]
         [Required, StringLength(100)]
-        [Index("IX_PageBuilder_RuleType")]
         public string RuleType { get; set; }
 
         //[DataMember]
@@ -33,7 +32,6 @@ public partial class RuleEntity : BaseEntity
         public string Value { get; set; }
 
         [DataMember]
-        [Index("IX_PageBuilder_DisplayOrder")]
         public int DisplayOrder { get; set; }
 
         [NotMapped]
diff --git a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs
index 96d4bb591e..12835f0fcd 100644
--- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs
+++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs
@@ -29,18 +29,15 @@ public partial class RuleSetEntity : BaseEntity, IAuditable
         [StringLength(400)]
         public string Description { get; set; }
 
-        [Index("IX_RuleSetEntity_Scope", Order = 0)]
         public bool IsActive { get; set; } = true;
 
         [Required]
-        [Index("IX_RuleSetEntity_Scope", Order = 1)]
         public RuleScope Scope { get; set; }
 
 
         /// <summary>
         /// True when this set is an internal composite container for rules within another ruleset.
         /// </summary>
-        [Index]
         public bool IsSubGroup { get; set; }
 
         public LogicalRuleOperator LogicalOperator { get; set; }
diff --git a/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs b/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs
index 8b8226c2bd..57e338c77f 100644
--- a/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs
+++ b/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs
index b1e4b0399c..6209758cd2 100644
--- a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs
+++ b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Core.Security
 {
diff --git a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs
index 48d48e2d78..34cc707b96 100644
--- a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs
+++ b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs
@@ -1,7 +1,7 @@
 using System.Security;
 using System.Security.Claims;
 using System.Security.Principal;
-using System.Web.Security;
+using Microsoft.AspNetCore.Identity;
 using SmartStore.Core.Domain.Customers;
 
 namespace SmartStore.Core
diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj
index cd84ae4268..670be36907 100644
--- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj
+++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj
@@ -1,810 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6BDA8332-939F-45B7-A25E-7A797260AE59}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Core</RootNamespace>
     <AssemblyName>SmartStore.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\EFMigrations\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\PluginDev\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="HtmlSanitizer, Version=3.0.0.0, Culture=neutral, PublicKeyToken=61c49a1a9e79cc28, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\HtmlSanitizer.4.0.205\lib\net45\HtmlSanitizer.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.XmlTransform, Version=3.0.0.34420, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Async\AsyncStateInfo.cs" />
-    <Compile Include="Async\IAsyncState.cs" />
-    <Compile Include="Async\LocalAsyncState.cs" />
-    <Compile Include="Caching\CacheScope.cs" />
-    <Compile Include="Caching\CacheScopeAccessor.cs" />
-    <Compile Include="Caching\ICacheScopeAccessor.cs" />
-    <Compile Include="Caching\ISet.cs" />
-    <Compile Include="Caching\MemoryCacheManager.cs" />
-    <Compile Include="Caching\OutputCache\DisplayControl.cs" />
-    <Compile Include="Caching\IRequestCache.cs" />
-    <Compile Include="Caching\OutputCache\IDisplayControl.cs" />
-    <Compile Include="Caching\OutputCache\IOutputCacheInvalidationObserver.cs" />
-    <Compile Include="Caching\OutputCache\ICacheableRouteRegistrar.cs" />
-    <Compile Include="Caching\OutputCache\IOutputCacheProvider.cs" />
-    <Compile Include="Caching\MemorySet.cs" />
-    <Compile Include="Caching\OutputCache\NullOutputCacheProvider.cs" />
-    <Compile Include="Caching\OutputCache\OutputCacheItem.cs" />
-    <Compile Include="Caching\RequestCache.cs" />
-    <Compile Include="Collections\ConcurrentMultimap.cs" />
-    <Compile Include="Collections\LazyMultimap.cs" />
-    <Compile Include="Collections\Querystring.cs" />
-    <Compile Include="Collections\SyncedCollection.cs" />
-    <Compile Include="Collections\TopologicalSorter.cs" />
-    <Compile Include="Collections\TreeNodeBase.cs" />
-    <Compile Include="ComponentModel\FastInvoker.cs" />
-    <Compile Include="ComponentModel\FastPropertyValueProvider.cs" />
-    <Compile Include="ComponentModel\IMapper.cs" />
-    <Compile Include="ComponentModel\MapperFactory.cs" />
-    <Compile Include="ComponentModel\MiniMapper.cs" />
-    <Compile Include="Collections\ReferenceEqualityComparer.cs" />
-    <Compile Include="ComponentModel\SmartContractResolver.cs" />
-    <Compile Include="ComponentModel\TypeConversion\BooleanConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\JObjectConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\DictionaryConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\EmailAddressConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\EnumerableConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\NullableConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\ProductBundleDataConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\ShippingOptionConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\TimeSpanConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\DateTimeConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\ITypeConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\DefaultTypeConverter.cs" />
-    <Compile Include="ComponentModel\TypeConversion\TypeConverterFactory.cs" />
-    <Compile Include="Data\Hooks\HookableAttribute.cs" />
-    <Compile Include="Data\Hooks\HookMetadata.cs" />
-    <Compile Include="Data\Hooks\ImportantAttribute.cs" />
-    <Compile Include="Data\Hooks\DbSaveHook.cs" />
-    <Compile Include="Data\Hooks\DefaultDbHookHandler.cs" />
-    <Compile Include="Data\Hooks\HookedEntity.cs" />
-    <Compile Include="Data\Hooks\IDbSaveHook.cs" />
-    <Compile Include="Data\Hooks\IDbHookHandler.cs" />
-    <Compile Include="Data\IDbContextExtensions.cs" />
-    <Compile Include="Data\ITransaction.cs" />
-    <Compile Include="Domain\Catalog\AttributeChoiceBehaviour.cs" />
-    <Compile Include="Domain\Catalog\CategoryNode.cs" />
-    <Compile Include="Domain\Catalog\PriceDisplayStyle.cs" />
-    <Compile Include="Domain\Catalog\ProductAttributeOption.cs" />
-    <Compile Include="Domain\Catalog\ProductAttributeOptionsSet.cs" />
-    <Compile Include="Domain\Catalog\ProductCondition.cs" />
-    <Compile Include="Domain\Catalog\ProductVisibility.cs" />
-    <Compile Include="Domain\Catalog\QuantiyControlType.cs" />
-    <Compile Include="Domain\Catalog\IPagingOptions.cs" />
-    <Compile Include="Domain\Catalog\PriceDisplayType.cs" />
-    <Compile Include="Domain\Cms\MenuRecord.cs" />
-    <Compile Include="Domain\Cms\MenuItemRecord.cs" />
-    <Compile Include="Domain\Cms\WidgetSettings.cs" />
-    <Compile Include="Domain\Common\PerformanceSettings.cs" />
-    <Compile Include="Domain\Customers\SameSiteType.cs" />
-    <Compile Include="Domain\Customers\CustomerLoginType.cs" />
-    <Compile Include="Domain\Customers\CustomerNumberVisibility.cs" />
-    <Compile Include="Domain\Customers\CustomerNumberMethod.cs" />
-    <Compile Include="Domain\Customers\CustomerRoleMapping.cs" />
-    <Compile Include="Domain\Customers\PrivacySettings.cs" />
-    <Compile Include="Domain\Customers\WalletHistory.cs" />
-    <Compile Include="Domain\Customers\WalletPostingReason.cs" />
-    <Compile Include="Domain\Dashboard\OrderDataPoint.cs" />
-    <Compile Include="Domain\DataExchange\DataExchangeEnums.cs" />
-    <Compile Include="Domain\DataExchange\ImportEnums.cs" />
-    <Compile Include="Domain\DataExchange\ImportProfile.cs" />
-    <Compile Include="Domain\DataExchange\SyncMapping.cs" />
-    <Compile Include="Domain\DataExchange\DataExchangeSettings.cs" />
-    <Compile Include="Domain\DataExchange\ExportDeployment.cs" />
-    <Compile Include="Domain\DataExchange\ExportProjection.cs" />
-    <Compile Include="Domain\Directory\CurrencyRoundingRule.cs" />
-    <Compile Include="Domain\Directory\QuantityUnit.cs" />
-    <Compile Include="Domain\DataExchange\ExportEnums.cs" />
-    <Compile Include="Domain\DataExchange\ExportFilter.cs" />
-    <Compile Include="Domain\DataExchange\ExportProfile.cs" />
-    <Compile Include="Domain\Forums\ForumDateFilter.cs" />
-    <Compile Include="Domain\Forums\ForumPostVote.cs" />
-    <Compile Include="Domain\Forums\ForumTopicSorting.cs" />
-    <Compile Include="Domain\Localization\LocalizedPropertyCollection.cs" />
-    <Compile Include="Domain\Media\MediaTrack.cs" />
-    <Compile Include="Domain\Media\MediaAlbum.cs" />
-    <Compile Include="Domain\Media\MediaStorage.cs" />
-    <Compile Include="Domain\Media\IHasMedia.cs" />
-    <Compile Include="Domain\Media\MediaFolder.cs" />
-    <Compile Include="Domain\Media\MediaTag.cs" />
-    <Compile Include="Domain\Messages\EmailAttachmentStorageLocation.cs" />
-    <Compile Include="Domain\Messages\MessageTemplateNames.cs" />
-    <Compile Include="Domain\Messages\QueuedEmailAttachment.cs" />
-    <Compile Include="Domain\Orders\CheckoutEnums.cs" />
-    <Compile Include="Domain\Payments\CapturePaymentReason.cs" />
-    <Compile Include="Domain\Payments\PaymentMethod.cs" />
-    <Compile Include="Domain\Security\PermissionNode.cs" />
-    <Compile Include="Domain\Security\PermissionRoleMapping.cs" />
-    <Compile Include="Domain\Seo\CanonicalHostNameRule.cs" />
-    <Compile Include="Domain\Seo\HomePageSettings.cs" />
-    <Compile Include="Domain\Seo\UrlRecordCollection.cs" />
-    <Compile Include="Domain\Tasks\ScheduleTaskHistory.cs" />
-    <Compile Include="Domain\Tax\AuxiliaryServicesTaxType.cs" />
-    <Compile Include="Events\AmbigousConsumerException.cs" />
-    <Compile Include="Events\CommonMessages\AppStartedEvent.cs" />
-    <Compile Include="Events\ConsumeContext.cs" />
-    <Compile Include="Events\ConsumerDescriptor.cs" />
-    <Compile Include="Events\ConsumerInvoker.cs" />
-    <Compile Include="Events\FireForgetAttribute.cs" />
-    <Compile Include="Events\IConsumer.cs" />
-    <Compile Include="Events\IConsumerInvoker.cs" />
-    <Compile Include="Events\IConsumerRegistry.cs" />
-    <Compile Include="Events\IConsumerResolver.cs" />
-    <Compile Include="Events\IEventPublisher.cs" />
-    <Compile Include="Extensions\ExceptionExtensions.cs" />
-    <Compile Include="Extensions\ExpressionExtensions.cs" />
-    <Compile Include="Extensions\IOExtensions.cs" />
-    <Compile Include="Extensions\NumericExtensions.cs" />
-    <Compile Include="Data\IQueryableExtensions.cs" />
-    <Compile Include="Extensions\ProcessExtensions.cs" />
-    <Compile Include="Extensions\RegexExtensions.cs" />
-    <Compile Include="Extensions\RouteExtensions.cs" />
-    <Compile Include="Extensions\XPathExtensions.cs" />
-    <Compile Include="Fakes\FakeController.cs" />
-    <Compile Include="Fakes\FakeHttpHandler.cs" />
-    <Compile Include="IActivatable.cs" />
-    <Compile Include="Infrastructure\ContextState.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\DefaultLifetimeScopeAccessor.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\DefaultLifetimeScopeProvider.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\ILifetimeScopeAccessor.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\Work.cs" />
-    <Compile Include="Infrastructure\ApplicationEnvironment.cs" />
-    <Compile Include="Infrastructure\IApplicationEnvironment.cs" />
-    <Compile Include="IO\DirectoryHasher.cs" />
-    <Compile Include="IO\ImageHeader.cs" />
-    <Compile Include="IO\SeekableReadOnlyStream.cs" />
-    <Compile Include="IO\SymLink\FileSystemInfoExtensions.cs" />
-    <Compile Include="IO\SymLink\SymbolicLink.cs" />
-    <Compile Include="IO\VirtualPath\DefaultVirtualPathProvider.cs" />
-    <Compile Include="IO\VirtualPath\IVirtualFolder.cs" />
-    <Compile Include="IO\VirtualPath\IVirtualPathProvider.cs" />
-    <Compile Include="IO\VirtualPath\VirtualFolder.cs" />
-    <Compile Include="IO\IFileSystemExtensions.cs" />
-    <Compile Include="IO\LockFile\ILockFile.cs" />
-    <Compile Include="IO\LockFile\ILockFileManager.cs" />
-    <Compile Include="IO\LockFile\LockFile.cs" />
-    <Compile Include="IO\LockFile\LockFileManager.cs" />
-    <Compile Include="IAuditable.cs" />
-    <Compile Include="ITransient.cs" />
-    <Compile Include="Collections\TrimmedBuffer.cs" />
-    <Compile Include="Linq\ExpressionStarter.cs" />
-    <Compile Include="Localization\ILocalizationFileResolver.cs" />
-    <Compile Include="Localization\LocalizationFileResolver.cs" />
-    <Compile Include="Localization\LocalizationHelper.cs" />
-    <Compile Include="Logging\IChronometer.cs" />
-    <Compile Include="Logging\ILoggerFactory.cs" />
-    <Compile Include="Logging\log4net\Log4netLogger.cs" />
-    <Compile Include="Logging\log4net\Log4netLoggerFactory.cs" />
-    <Compile Include="Logging\log4net\SmartFileAppender.cs" />
-    <Compile Include="Logging\LoggingModule.cs" />
-    <Compile Include="Money.cs" />
-    <Compile Include="Plugins\ICookiePublisher.cs" />
-    <Compile Include="Plugins\IConfigurable.cs" />
-    <Compile Include="Plugins\PluginManager.Cache.cs" />
-    <Compile Include="Plugins\Providers\DependentWidgetsAttribute.cs" />
-    <Compile Include="Plugins\Providers\DisplayOrderAttribute.cs" />
-    <Compile Include="Plugins\Providers\IsHiddenAttribute.cs" />
-    <Compile Include="Plugins\Providers\IUserEditable.cs" />
-    <Compile Include="Plugins\Providers\IProvider.cs" />
-    <Compile Include="Plugins\Providers\IProviderManager.cs" />
-    <Compile Include="Plugins\Providers\ProviderMetadata.cs" />
-    <Compile Include="Plugins\Providers\FriendlyNameAttribute.cs" />
-    <Compile Include="Plugins\Providers\SystemNameAttribute.cs" />
-    <Compile Include="Configuration\ISettingService.cs" />
-    <Compile Include="Configuration\JsonPersistAttribute.cs" />
-    <Compile Include="Data\DbContextScope.cs" />
-    <Compile Include="Data\DbQuerySettings.cs" />
-    <Compile Include="Data\EntityState.cs" />
-    <Compile Include="Data\IDbContext.cs" />
-    <Compile Include="Data\RepositoryExtensions.cs" />
-    <Compile Include="Data\SqlFileTokenizer.cs" />
-    <Compile Include="Domain\Catalog\ProductBundleData.cs" />
-    <Compile Include="Domain\Catalog\ProductBundleItemAttributeFilter.cs" />
-    <Compile Include="Domain\Catalog\ProductBundleItem.cs" />
-    <Compile Include="Domain\Catalog\ProductType.cs" />
-    <Compile Include="Domain\Catalog\ProductVariantAttributeValueType.cs" />
-    <Compile Include="Domain\Common\CompanyInformationSettings.cs" />
-    <Compile Include="Domain\Common\ContactDataSettings.cs" />
-    <Compile Include="Domain\Common\BankConnectionSettings.cs" />
-    <Compile Include="Domain\Common\SocialSettings.cs" />
-    <Compile Include="Domain\Directory\DeliveryTime.cs" />
-    <Compile Include="Domain\Orders\OrderExtensions.cs" />
-    <Compile Include="Domain\Orders\OrganizedShoppingCartItem.cs" />
-    <Compile Include="Domain\Stores\IStoreMappingSupported.cs" />
-    <Compile Include="Domain\Stores\Store.cs" />
-    <Compile Include="Domain\Stores\StoreExtensions.cs" />
-    <Compile Include="Domain\Stores\StoreMapping.cs" />
-    <Compile Include="Domain\Themes\ThemeSettings.cs" />
-    <Compile Include="Domain\Themes\ThemeVariable.cs" />
-    <Compile Include="Email\DefaultEmailSender.cs" />
-    <Compile Include="Email\EmailAddress.cs" />
-    <Compile Include="Email\EmailException.cs" />
-    <Compile Include="Email\EmailMessage.cs" />
-    <Compile Include="Email\IEmailSender.cs" />
-    <Compile Include="Email\IEmailSenderExtensions.cs" />
-    <Compile Include="Email\SmtpContext.cs" />
-    <Compile Include="Events\EventConsumerMetadata.cs" />
-    <Compile Include="Events\NullEventPublisher.cs" />
-    <Compile Include="Extensions\HttpExtensions.cs" />
-    <Compile Include="Extensions\XmlWriterExtensions.cs" />
-    <Compile Include="IMergedData.cs" />
-    <Compile Include="Async\AsyncRunner.cs" />
-    <Compile Include="IO\LocalFileSystem.cs" />
-    <Compile Include="IO\IFile.cs" />
-    <Compile Include="IO\IFolder.cs" />
-    <Compile Include="IO\IFileSystem.cs" />
-    <Compile Include="IO\MimeTypes.cs" />
-    <Compile Include="ISoftDeletable.cs" />
-    <Compile Include="IStoreContext.cs" />
-    <Compile Include="Linq\Expanders\IPathExpander.cs" />
-    <Compile Include="Linq\Expanders\LambdaPathExpander.cs" />
-    <Compile Include="Linq\Expanders\StringPathExpander.cs" />
-    <Compile Include="Linq\Expressions\ExpressionVisitor.cs" />
-    <Compile Include="Linq\Expressions\MemberAccessPathVisitor.cs" />
-    <Compile Include="Linq\Expressions\MemberAccessPropertyInfoVisitor.cs" />
-    <Compile Include="Localization\LocalizedString.cs" />
-    <Compile Include="Localization\Localizer.cs" />
-    <Compile Include="Localization\NullLocalizer.cs" />
-    <Compile Include="Logging\ICustomerActivityService.cs" />
-    <Compile Include="Logging\ILogger.cs" />
-    <Compile Include="Logging\LoggingExtensions.cs" />
-    <Compile Include="Logging\Notifier.cs" />
-    <Compile Include="Logging\NotifyEntry.cs" />
-    <Compile Include="Logging\NullLogger.cs" />
-    <Compile Include="Logging\TraceLogger.cs" />
-    <Compile Include="Packaging\ExtensionDescriptor.cs" />
-    <Compile Include="Packaging\FolderUpdater.cs" />
-    <Compile Include="Packaging\IPackageBuilder.cs" />
-    <Compile Include="Packaging\IPackageInstaller.cs" />
-    <Compile Include="Packaging\IPackageManager.cs" />
-    <Compile Include="Packaging\NuGet\ExtensionReferenceRepository.cs" />
-    <Compile Include="Packaging\NuGet\FileBasedProjectSystem.cs" />
-    <Compile Include="Packaging\NuGet\NugetLogger.cs" />
-    <Compile Include="Packaging\NuGet\NullSourceRepository.cs" />
-    <Compile Include="Packaging\PackageBuilder.cs" />
-    <Compile Include="Packaging\PackageInfo.cs" />
-    <Compile Include="Packaging\PackageInstaller.cs" />
-    <Compile Include="Packaging\PackageManager.cs" />
-    <Compile Include="Packaging\PackagingResult.cs" />
-    <Compile Include="Packaging\PackagingUtils.cs" />
-    <Compile Include="PagedList.cs" />
-    <Compile Include="Collections\Multimap.cs" />
-    <Compile Include="Collections\TreeNode.cs" />
-    <Compile Include="ComponentModel\HybridExpando.cs" />
-    <Compile Include="ComponentModel\PropertyBag.cs" />
-    <Compile Include="ComponentModel\SerializationUtils.cs" />
-    <Compile Include="Domain\Catalog\BackInStockSubscription.cs" />
-    <Compile Include="Domain\Catalog\SmartStoreProductVariantAttributeCombination.cs" />
-    <Compile Include="Domain\Common\AddressSettings.cs" />
-    <Compile Include="Domain\Common\GenericAttribute.cs" />
-    <Compile Include="Domain\Orders\Events.cs" />
-    <Compile Include="Domain\Security\AclRecord.cs" />
-    <Compile Include="Domain\Security\IAclSupported.cs" />
-    <Compile Include="Domain\Seo\ISlugSupported.cs" />
-    <Compile Include="Domain\Seo\PageTitleSeoAdjustment.cs" />
-    <Compile Include="Domain\Seo\SeoSettings.cs" />
-    <Compile Include="Domain\Seo\UrlRecord.cs" />
-    <Compile Include="Domain\Shipping\ShipmentItem.cs" />
-    <Compile Include="Domain\Shipping\Shipment.cs" />
-    <Compile Include="Domain\Tasks\ScheduleTask.cs" />
-    <Compile Include="Domain\Messages\Events.cs" />
-    <Compile Include="Events\CommonMessages\AppRegisterGlobalFiltersEvent.cs" />
-    <Compile Include="Events\CommonMessages\AppInitScheduledTasksEvent.cs" />
-    <Compile Include="Data\DataProviderFactory.cs" />
-    <Compile Include="Data\IDataProvider.cs" />
-    <Compile Include="Data\DataSettings.cs" />
-    <Compile Include="Domain\Blogs\BlogExtensions.cs" />
-    <Compile Include="Domain\Catalog\ManufacturerTemplate.cs" />
-    <Compile Include="Domain\Catalog\CategoryTemplate.cs" />
-    <Compile Include="Domain\Catalog\ProductTemplate.cs" />
-    <Compile Include="Domain\Common\AdminAreaSettings.cs" />
-    <Compile Include="Domain\Customers\ExternalAuthenticationSettings.cs" />
-    <Compile Include="Domain\Customers\ExternalAuthenticationRecord.cs" />
-    <Compile Include="Domain\Customers\SystemCustomerNames.cs" />
-    <Compile Include="Domain\Polls\PollVotingRecord.cs" />
-    <Compile Include="Domain\Polls\PollAnswer.cs" />
-    <Compile Include="Domain\Polls\Poll.cs" />
-    <Compile Include="Domain\Orders\BestsellersReportLine.cs" />
-    <Compile Include="Extensions\ConversionExtensions.cs" />
-    <Compile Include="Extensions\DateTimeExtensions.cs" />
-    <Compile Include="Extensions\DictionaryExtensions.cs" />
-    <Compile Include="Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Extensions\CollectionExtensions.cs" />
-    <Compile Include="Extensions\HtmlTextWriterExtensions.cs" />
-    <Compile Include="Extensions\MiscExtensions.cs" />
-    <Compile Include="Extensions\StreamExtensions.cs" />
-    <Compile Include="Extensions\LinqExtensions.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="Extensions\TypeExtensions.cs" />
-    <Compile Include="Extensions\XmlNodeExtensions.cs" />
-    <Compile Include="Fakes\Extensions.cs" />
-    <Compile Include="Fakes\FakeHttpContext.cs" />
-    <Compile Include="Fakes\FakeHttpRequest.cs" />
-    <Compile Include="Fakes\FakeHttpResponse.cs" />
-    <Compile Include="Fakes\FakeHttpSessionState.cs" />
-    <Compile Include="Fakes\FakeIdentity.cs" />
-    <Compile Include="Fakes\FakePrincipal.cs" />
-    <Compile Include="BaseEntity.cs" />
-    <Compile Include="Caching\ICacheManager.cs" />
-    <Compile Include="Caching\NullCache.cs" />
-    <Compile Include="Plugins\LoadPluginResult.cs" />
-    <Compile Include="Rules\Domain\IRulesContainer.cs" />
-    <Compile Include="Rules\IRuleVisitor.cs" />
-    <Compile Include="Rules\Domain\RuleEntity.cs" />
-    <Compile Include="Rules\Domain\RuleSetEntity.cs" />
-    <Compile Include="Rules\Filters\FilterExpressionGroup.cs" />
-    <Compile Include="Rules\Filters\ExpressionHelper.cs" />
-    <Compile Include="Rules\Filters\FilterDescriptor.cs" />
-    <Compile Include="Rules\Filters\FilterExpression.cs" />
-    <Compile Include="Rules\Rendering\IRuleTemplateSelector.cs" />
-    <Compile Include="Rules\Rendering\IRuleOptionsProvider.cs" />
-    <Compile Include="Rules\Rendering\RuleTemplateInfo.cs" />
-    <Compile Include="Rules\Rendering\RuleTemplateSelector.cs" />
-    <Compile Include="Rules\Rendering\RuleOptionsResult.cs" />
-    <Compile Include="Rules\RuleModule.cs" />
-    <Compile Include="Rules\RuleDescriptorCollection.cs" />
-    <Compile Include="Rules\RuleScope.cs" />
-    <Compile Include="Rules\IRuleProvider.cs" />
-    <Compile Include="Rules\RuleExpressionGroup.cs" />
-    <Compile Include="Rules\RuleStorage.cs" />
-    <Compile Include="Rules\RuleValueSelectList.cs" />
-    <Compile Include="Rules\Filters\FilterExpressionVisitor.cs" />
-    <Compile Include="Rules\Filters\QueryableExtensions.cs" />
-    <Compile Include="Rules\Operators\ListOperators.cs" />
-    <Compile Include="Rules\Operators\StringOperators.cs" />
-    <Compile Include="Rules\IRuleConstraint.cs" />
-    <Compile Include="Rules\Operators\CommonOperators.cs" />
-    <Compile Include="Rules\Operators\NumericOperators.cs" />
-    <Compile Include="Rules\RuleExpression.cs" />
-    <Compile Include="Rules\RuleDescriptor.cs" />
-    <Compile Include="Rules\Exceptions\InvalidRuleOperatorException.cs" />
-    <Compile Include="Rules\RuleOperator.cs" />
-    <Compile Include="Rules\RuleFactory.cs" />
-    <Compile Include="Rules\RuleType.cs" />
-    <Compile Include="Search\AcquireWriterContext.cs" />
-    <Compile Include="Search\DefaultIndexManager.cs" />
-    <Compile Include="Search\Events\IndexingCompletedEvent.cs" />
-    <Compile Include="Search\Facets\Facet.cs" />
-    <Compile Include="Search\Facets\FacetExtensions.cs" />
-    <Compile Include="Search\Facets\FacetGroup.cs" />
-    <Compile Include="Search\Facets\FacetDescriptor.cs" />
-    <Compile Include="Search\Facets\FacetEnums.cs" />
-    <Compile Include="Search\Facets\FacetValue.cs" />
-    <Compile Include="Search\Filter\CombinedSearchFilter.cs" />
-    <Compile Include="Search\Filter\RangeSearchFilter.cs" />
-    <Compile Include="Search\Filter\SearchFilterBase.cs" />
-    <Compile Include="Search\IIndexDocument.cs" />
-    <Compile Include="Search\IIndexManager.cs" />
-    <Compile Include="Search\IIndexOperation.cs" />
-    <Compile Include="Search\IIndexProvider.cs" />
-    <Compile Include="Search\IIndexStore.cs" />
-    <Compile Include="Search\IndexDocument.cs" />
-    <Compile Include="Search\IndexField.cs" />
-    <Compile Include="Search\IndexInfo.cs" />
-    <Compile Include="Search\IndexProviderBase.cs" />
-    <Compile Include="Search\Events\IndexSegmentProcessedEvent.cs" />
-    <Compile Include="Search\ISearchAlias.cs" />
-    <Compile Include="Search\ISearchEngine.cs" />
-    <Compile Include="Search\Filter\ISearchFilter.cs" />
-    <Compile Include="Search\ISearchHit.cs" />
-    <Compile Include="Search\ISearchQuery.cs" />
-    <Compile Include="Search\NullIndexStore.cs" />
-    <Compile Include="Search\Filter\SearchFilter.cs" />
-    <Compile Include="Search\SearchDocumentType.cs" />
-    <Compile Include="Search\SearchEnums.cs" />
-    <Compile Include="Search\SearchQuery.cs" />
-    <Compile Include="Search\Settings\ForumSearchSettings.cs" />
-    <Compile Include="Search\Settings\SearchSettings.cs" />
-    <Compile Include="Search\SearchSort.cs" />
-    <Compile Include="Security\IPermissionProvider.cs" />
-    <Compile Include="Security\IPermissionService.cs" />
-    <Compile Include="Security\PermissionAttribute.cs" />
-    <Compile Include="Security\PermissionHelper.cs" />
-    <Compile Include="Security\Permissions.cs" />
-    <Compile Include="Security\SmartStorePrincipal.cs" />
-    <Compile Include="Templating\DefaultTemplateManager.cs" />
-    <Compile Include="Templating\ITemplate.cs" />
-    <Compile Include="Templating\ITemplateEngine.cs" />
-    <Compile Include="Templating\ITemplateManager.cs" />
-    <Compile Include="Templating\NullTemplateEngine.cs" />
-    <Compile Include="Themes\DefaultThemeRegistry.cs" />
-    <Compile Include="Themes\InheritedThemeFileResult.cs" />
-    <Compile Include="Themes\IThemeContext.cs" />
-    <Compile Include="Themes\IThemeFileResolver.cs" />
-    <Compile Include="Themes\ThemeFolderData.cs" />
-    <Compile Include="Themes\ThemeTouchedEvent.cs" />
-    <Compile Include="Utilities\ImagingHelper.cs" />
-    <Compile Include="Utilities\CommonHelper.cs" />
-    <Compile Include="Configuration\ISettings.cs" />
-    <Compile Include="Domain\Affiliates\Affiliate.cs" />
-    <Compile Include="Domain\Blogs\BlogSettings.cs" />
-    <Compile Include="Domain\Blogs\BlogPost.cs" />
-    <Compile Include="Domain\Blogs\BlogComment.cs" />
-    <Compile Include="Domain\Blogs\BlogPostTag.cs" />
-    <Compile Include="Domain\Catalog\CatalogSettings.cs" />
-    <Compile Include="Domain\Catalog\ProductTag.cs" />
-    <Compile Include="Domain\Catalog\ProductReviewHelpfulness.cs" />
-    <Compile Include="Domain\Catalog\PriceRange.cs" />
-    <Compile Include="Domain\Catalog\SpecificationAttributeOptionFilter.cs" />
-    <Compile Include="Domain\Common\CommonSettings.cs" />
-    <Compile Include="Domain\Common\PdfSettings.cs" />
-    <Compile Include="Domain\Customers\TopCustomerReportLine.cs" />
-    <Compile Include="Domain\Orders\OrderAverageReportLine.cs" />
-    <Compile Include="Domain\Orders\OrderAverageReportLineSummary.cs" />
-    <Compile Include="Domain\Topics\Topic.cs" />
-    <Compile Include="Domain\News\NewsComment.cs" />
-    <Compile Include="Domain\News\NewsItem.cs" />
-    <Compile Include="Domain\News\NewsSettings.cs" />
-    <Compile Include="Domain\Localization\ILocalizedEnum.cs" />
-    <Compile Include="Domain\Logging\ActivityLog.cs" />
-    <Compile Include="Domain\Logging\ActivityLogType.cs" />
-    <Compile Include="Domain\Media\MediaSettings.cs" />
-    <Compile Include="Domain\Messages\Campaign.cs" />
-    <Compile Include="Domain\Customers\UserRegistrationType.cs" />
-    <Compile Include="Domain\Customers\CustomerNameFormat.cs" />
-    <Compile Include="Domain\Customers\SystemCustomerAttributeNames.cs" />
-    <Compile Include="Domain\Directory\ExchangeRate.cs" />
-    <Compile Include="Domain\Forums\EditorType.cs" />
-    <Compile Include="Domain\Forums\Forum.cs" />
-    <Compile Include="Domain\Forums\ForumGroup.cs" />
-    <Compile Include="Domain\Forums\ForumPost.cs" />
-    <Compile Include="Domain\Forums\ForumSettings.cs" />
-    <Compile Include="Domain\Forums\ForumSubscription.cs" />
-    <Compile Include="Domain\Forums\ForumTopic.cs" />
-    <Compile Include="Domain\Forums\ForumTopicType.cs" />
-    <Compile Include="Domain\Forums\PrivateMessage.cs" />
-    <Compile Include="Domain\Localization\LocalizationSettings.cs" />
-    <Compile Include="Domain\Media\Download.cs" />
-    <Compile Include="Domain\Media\Enums.cs" />
-    <Compile Include="Domain\Messages\EmailAccountSettings.cs" />
-    <Compile Include="Domain\Messages\EmailAccount.cs" />
-    <Compile Include="Domain\Messages\MessageTemplate.cs" />
-    <Compile Include="Domain\Messages\NewsLetterSubscription.cs" />
-    <Compile Include="Domain\Messages\QueuedEmail.cs" />
-    <Compile Include="Domain\Orders\OrderNote.cs" />
-    <Compile Include="Domain\Orders\OrderItem.cs" />
-    <Compile Include="Domain\Orders\OrderStatus.cs" />
-    <Compile Include="Domain\Orders\RecurringPayment.cs" />
-    <Compile Include="Domain\Orders\RecurringPaymentHistory.cs" />
-    <Compile Include="Domain\Orders\OrderSettings.cs" />
-    <Compile Include="Domain\Orders\ReturnRequest.cs" />
-    <Compile Include="Domain\Orders\ReturnRequestStatus.cs" />
-    <Compile Include="Domain\Payments\PaymentSettings.cs" />
-    <Compile Include="Domain\Payments\PaymentStatus.cs" />
-    <Compile Include="Domain\Security\SecuritySettings.cs" />
-    <Compile Include="Domain\Shipping\ShippingStatus.cs" />
-    <Compile Include="Domain\StoreInformationSettings.cs" />
-    <Compile Include="GenericEqualityComparer.cs" />
-    <Compile Include="Data\IRepository.cs" />
-    <Compile Include="IHideObjectMembers.cs" />
-    <Compile Include="Infrastructure\ComparableObject.cs" />
-    <Compile Include="Infrastructure\DisposableObject.cs" />
-    <Compile Include="Infrastructure\Error.cs" />
-    <Compile Include="Infrastructure\Guard.cs" />
-    <Compile Include="Infrastructure\ICloneable.cs" />
-    <Compile Include="Infrastructure\IOrdered.cs" />
-    <Compile Include="Infrastructure\RegularExpressions.cs" />
-    <Compile Include="IWebHelper.cs" />
-    <Compile Include="Domain\Security\DefaultPermissionRecord.cs" />
-    <Compile Include="Domain\Security\PermissionRecord.cs" />
-    <Compile Include="Infrastructure\EngineContext.cs" />
-    <Compile Include="Infrastructure\AppDomainTypeFinder.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\IDependencyRegistrar.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\ContainerManager.cs" />
-    <Compile Include="Infrastructure\IEngine.cs" />
-    <Compile Include="Infrastructure\ITypeFinder.cs" />
-    <Compile Include="Infrastructure\SmartStoreEngine.cs" />
-    <Compile Include="Domain\Common\Address.cs" />
-    <Compile Include="Domain\Customers\CustomerSettings.cs" />
-    <Compile Include="Domain\Customers\CustomerRole.cs" />
-    <Compile Include="Domain\Customers\RewardPointsSettings.cs" />
-    <Compile Include="Domain\Customers\SystemCustomerRoleNames.cs" />
-    <Compile Include="Domain\Directory\MeasureSettings.cs" />
-    <Compile Include="Domain\Directory\Country.cs" />
-    <Compile Include="Domain\Directory\Currency.cs" />
-    <Compile Include="Domain\Directory\CurrencySettings.cs" />
-    <Compile Include="Domain\Directory\MeasureDimension.cs" />
-    <Compile Include="Domain\Directory\MeasureWeight.cs" />
-    <Compile Include="Domain\Catalog\ProductReview.cs" />
-    <Compile Include="Domain\Customers\CustomerContent.cs" />
-    <Compile Include="Domain\Discounts\DiscountUsageHistory.cs" />
-    <Compile Include="Domain\Discounts\Discount.cs" />
-    <Compile Include="Domain\Discounts\DiscountLimitationType.cs" />
-    <Compile Include="Domain\Discounts\DiscountType.cs" />
-    <Compile Include="Domain\Localization\ILocalizedEntity.cs" />
-    <Compile Include="Domain\Directory\StateProvince.cs" />
-    <Compile Include="Domain\Orders\CheckoutAttribute.cs" />
-    <Compile Include="Domain\Orders\CheckoutAttributeValue.cs" />
-    <Compile Include="Domain\Orders\GiftCard.cs" />
-    <Compile Include="Domain\Orders\GiftCardUsageHistory.cs" />
-    <Compile Include="Domain\Orders\Order.cs" />
-    <Compile Include="Domain\Customers\RewardPointsHistory.cs" />
-    <Compile Include="Domain\Orders\ShoppingCartSettings.cs" />
-    <Compile Include="Domain\Orders\ShoppingCartItem.cs" />
-    <Compile Include="Domain\Orders\ShoppingCartType.cs" />
-    <Compile Include="Domain\Shipping\ShippingMethod.cs" />
-    <Compile Include="Domain\Shipping\ShippingOption.cs" />
-    <Compile Include="Domain\Shipping\ShippingSettings.cs" />
-    <Compile Include="Domain\Tax\TaxSettings.cs" />
-    <Compile Include="Domain\Tax\TaxBasedOn.cs" />
-    <Compile Include="Domain\Tax\TaxCategory.cs" />
-    <Compile Include="Domain\Tax\TaxDisplayType.cs" />
-    <Compile Include="Domain\Tax\VatNumberStatus.cs" />
-    <Compile Include="Html\BBCodeHelper.cs" />
-    <Compile Include="Html\CodeFormatter\CLikeFormat.cs" />
-    <Compile Include="Html\CodeFormatter\CodeFormat.cs" />
-    <Compile Include="Html\CodeFormatter\CodeFormatHelper.cs" />
-    <Compile Include="Html\CodeFormatter\CSharpFormat.cs" />
-    <Compile Include="Html\CodeFormatter\HighlightOptions.cs" />
-    <Compile Include="Html\CodeFormatter\HtmlFormat.cs" />
-    <Compile Include="Html\CodeFormatter\JavaScriptFormat.cs" />
-    <Compile Include="Html\CodeFormatter\MshFormat.cs" />
-    <Compile Include="Html\CodeFormatter\SourceFormat.cs" />
-    <Compile Include="Html\CodeFormatter\TsqlFormat.cs" />
-    <Compile Include="Html\CodeFormatter\VisualBasicFormat.cs" />
-    <Compile Include="Html\HtmlUtils.cs" />
-    <Compile Include="Html\ResolveLinksHelper.cs" />
-    <Compile Include="IPageable.cs" />
-    <Compile Include="Linq\LinqContainsPredicateBuilder.cs" />
-    <Compile Include="Linq\PredicateBuilder.cs" />
-    <Compile Include="Plugins\BasePlugin.cs" />
-    <Compile Include="Infrastructure\ApplicationStart.cs" />
-    <Compile Include="Plugins\PluginFileParser.cs" />
-    <Compile Include="Plugins\PluginManager.cs" />
-    <Compile Include="Plugins\PluginDescriptor.cs" />
-    <Compile Include="Infrastructure\Singleton.cs" />
-    <Compile Include="Plugins\IPlugin.cs" />
-    <Compile Include="Plugins\IPluginFinder.cs" />
-    <Compile Include="Plugins\PluginFinder.cs" />
-    <Compile Include="Infrastructure\DependencyManagement\AutofacRequestLifetimeHttpModule.cs" />
-    <Compile Include="Infrastructure\WebAppTypeFinder.cs" />
-    <Compile Include="IWorkContext.cs" />
-    <Compile Include="Domain\Localization\LocalizedProperty.cs" />
-    <Compile Include="Domain\Catalog\ProductSortingEnum.cs" />
-    <Compile Include="Domain\Catalog\AttributeControlType.cs" />
-    <Compile Include="Domain\Catalog\BackorderMode.cs" />
-    <Compile Include="Domain\Catalog\Category.cs" />
-    <Compile Include="Domain\Catalog\CrossSellProduct.cs" />
-    <Compile Include="Domain\Catalog\DownloadActivationType.cs" />
-    <Compile Include="Domain\Catalog\GiftCardType.cs" />
-    <Compile Include="Domain\Catalog\LowStockActivity.cs" />
-    <Compile Include="Domain\Catalog\ManageInventoryMethod.cs" />
-    <Compile Include="Domain\Catalog\Manufacturer.cs" />
-    <Compile Include="Domain\Media\MediaFile.cs" />
-    <Compile Include="Domain\Catalog\Product.cs" />
-    <Compile Include="Domain\Catalog\ProductAttribute.cs" />
-    <Compile Include="Domain\Catalog\ProductCategory.cs" />
-    <Compile Include="Domain\Catalog\ProductManufacturer.cs" />
-    <Compile Include="Domain\Catalog\ProductMediaFile.cs" />
-    <Compile Include="Domain\Catalog\ProductSpecificationAttribute.cs" />
-    <Compile Include="Domain\Catalog\ProductVariantAttribute.cs" />
-    <Compile Include="Domain\Catalog\ProductVariantAttributeCombination.cs" />
-    <Compile Include="Domain\Catalog\ProductVariantAttributeValue.cs" />
-    <Compile Include="Domain\Catalog\RecurringProductCyclePeriod.cs" />
-    <Compile Include="Domain\Catalog\RelatedProduct.cs" />
-    <Compile Include="Domain\Catalog\SpecificationAttribute.cs" />
-    <Compile Include="Domain\Catalog\SpecificationAttributeOption.cs" />
-    <Compile Include="Domain\Catalog\TierPrice.cs" />
-    <Compile Include="Domain\Customers\PasswordFormat.cs" />
-    <Compile Include="HttpSecurityMode.cs" />
-    <Compile Include="RouteInfo.cs" />
-    <Compile Include="SmartStoreVersion.cs" />
-    <Compile Include="Themes\IThemeRegistry.cs" />
-    <Compile Include="Themes\ThemeManifest.cs" />
-    <Compile Include="Themes\ThemeManifestMaterializer.cs" />
-    <Compile Include="Themes\ThemeSwitchedEvent.cs" />
-    <Compile Include="Themes\ThemeVariableInfo.cs" />
-    <Compile Include="Themes\ThemeVariableType.cs" />
-    <Compile Include="Utilities\ActionDisposable.cs" />
-    <Compile Include="Utilities\DictionaryConverter.cs" />
-    <Compile Include="Utilities\FileDownloadManager.cs" />
-    <Compile Include="Utilities\FileSystemHelper.cs" />
-    <Compile Include="Utilities\HashCodeCombiner.cs" />
-    <Compile Include="Utilities\Inflector.cs" />
-    <Compile Include="Utilities\ObjectDumper.cs" />
-    <Compile Include="Utilities\ObjectPools\LeakTrackingObjectPool.cs" />
-    <Compile Include="Utilities\ObjectPools\ObjectPool.cs" />
-    <Compile Include="Utilities\ObjectPools\IPooledObject.cs" />
-    <Compile Include="Utilities\ObjectPools\PooledStringBuilder.cs" />
-    <Compile Include="Utilities\PathHelper.cs" />
-    <Compile Include="Utilities\Prettifier.cs" />
-    <Compile Include="Utilities\Range.cs" />
-    <Compile Include="ComponentModel\FastActivator.cs" />
-    <Compile Include="Utilities\Retry.cs" />
-    <Compile Include="Utilities\SeoHelper.cs" />
-    <Compile Include="Utilities\SmartSyndicationFeed.cs" />
-    <Compile Include="Utilities\StringTokenizer.cs" />
-    <Compile Include="ComponentModel\FastProperty.cs" />
-    <Compile Include="Utilities\Threading\KeyedLock.cs" />
-    <Compile Include="Utilities\Threading\LockExtensions.cs" />
-    <Compile Include="Utilities\Threading\ReadLockDisposable.cs" />
-    <Compile Include="Utilities\Threading\UpgradeableReadLockDisposable.cs" />
-    <Compile Include="Utilities\Threading\WriteLockDisposable.cs" />
-    <Compile Include="Utilities\Throttle.cs" />
-    <Compile Include="Utilities\TypeHelper.cs" />
-    <Compile Include="Utilities\Wildcard.cs" />
-    <Compile Include="WebHelper.cs" />
-    <Compile Include="Domain\Customers\Customer.cs" />
-    <Compile Include="Domain\Localization\Language.cs" />
-    <Compile Include="Domain\Localization\LocaleStringResource.cs" />
-    <Compile Include="Domain\Logging\Log.cs" />
-    <Compile Include="Logging\LogLevel.cs" />
-    <Compile Include="Domain\Configuration\Setting.cs" />
-    <Compile Include="SmartException.cs" />
-    <Compile Include="PagedList`T.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="XmlHelper.cs" />
-    <Compile Include="Packaging\Updater\AppUpdater.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <Compile Include="..\..\AssemblySharedInfo.cs" Link="Properties\AssemblySharedInfo.cs" />
+    <Compile Include="..\..\AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="Packaging\Readme.txt" />
+    <PackageReference Include="AngleSharp" Version="1.1.0" />
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+    <PackageReference Include="HtmlSanitizer" Version="8.1.870" />
+    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs
index 0b1cd338e5..c0c55809ed 100644
--- a/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs
+++ b/src/Libraries/SmartStore.Core/Utilities/CommonHelper.cs
@@ -10,8 +10,8 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web.Hosting;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.ComponentModel;
 
diff --git a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs
index b54d69e003..8f6302c697 100644
--- a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs
+++ b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs
@@ -8,7 +8,7 @@
 using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.IO;
 using SmartStore.Core.Logging;
diff --git a/src/Libraries/SmartStore.Core/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs
index 14a332af68..4c62741498 100644
--- a/src/Libraries/SmartStore.Core/WebHelper.cs
+++ b/src/Libraries/SmartStore.Core/WebHelper.cs
@@ -10,8 +10,8 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Web;
-using System.Web.Configuration;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using SmartStore.Collections;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs
index aa426e1762..b5e762966e 100644
--- a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs
+++ b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs
@@ -4,7 +4,7 @@
 using System.Data.Entity.Core.EntityClient;
 using System.Data.Entity.Core.Metadata.Edm;
 using System.Data.Entity.Core.Objects;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Linq;
 using System.Reflection;
 using SmartStore.ComponentModel;
diff --git a/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs b/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs
index 83fe2f2d99..54ac45dab1 100644
--- a/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs
+++ b/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
diff --git a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs
index 85c0d10238..ccd0c813b2 100644
--- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs
+++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Data.Entity.Core.Mapping;
 using System.Data.Entity.Core.Metadata.Edm;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.Entity.Infrastructure.MappingViews;
 using System.IO;
 using System.Linq;
diff --git a/src/Libraries/SmartStore.Data/EfRepository.cs b/src/Libraries/SmartStore.Data/EfRepository.cs
index 04934f60d3..7a13e159da 100644
--- a/src/Libraries/SmartStore.Data/EfRepository.cs
+++ b/src/Libraries/SmartStore.Data/EfRepository.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Data.Entity.Validation;
 using System.Linq;
 using System.Linq.Expressions;
diff --git a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs
index 1dace89f64..c48a3b11a4 100644
--- a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs
+++ b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs
@@ -1,5 +1,5 @@
 using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Diagnostics;
 using System.Linq;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs
index 1543a8ba41..1b012f4c07 100644
--- a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs
+++ b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Linq;
 using SmartStore.Core.Data;
 using EfState = System.Data.Entity.EntityState;
diff --git a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs
index 6f685642a4..dedc713841 100644
--- a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs
+++ b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data.Entity.Core;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.SqlClient;
 
 namespace SmartStore
diff --git a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs
index 68b043a6a5..724433ab44 100644
--- a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs
+++ b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Linq.Expressions;
diff --git a/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs
index 339a99b51b..55b808569e 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Affiliates;
 
 namespace SmartStore.Data.Mapping.Affiliates
diff --git a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs
index 99f73ff900..0d5f2974cd 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Blogs;
 
 namespace SmartStore.Data.Mapping.Blogs
diff --git a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs
index bca23be8d1..26d50451d0 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Blogs;
 
 namespace SmartStore.Data.Mapping.Blogs
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs
index 3767cac539..e1d06fe561 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs
index 21705b06ae..b320d4657b 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs
index bc7e36b94c..d4829b5bd4 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs
index 1dd181d475..28df49819a 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs
index f74f5cd16d..7db3fc672b 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs
index 2cd85a86b6..815689ac91 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs
index fafd737864..8fd0fd01a8 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs
index d4d26e1ff8..cf5697ae2a 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs
index a707bed719..30b2844745 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs
index 387c86a13a..c077cf0e4c 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs
index 7996718c6c..318076b136 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs
index d49b4f18b0..37f0a221cf 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs
index ce61d806b7..3e7e8dfd9c 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs
index 4daffdc1d7..8fe5b571da 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs
index 77e82b37ca..366f90f409 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs
index d596e09131..b5724b4780 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs
index 7e91dbe2a0..bb2fcc4e81 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs
index 8bc170faa6..0d8b325500 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs
index 5bc9a202ff..405a43d841 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs
index 06b9acf7fd..7fbca3b21a 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs
index ed57c5b86d..37cf97c9af 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs
index a7f7d5a2f5..53acac813f 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs
index 9f3b5d80d2..d033e566d7 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Catalog;
 
 namespace SmartStore.Data.Mapping.Catalog
diff --git a/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs
index d9394809fb..7a16f2eac3 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Common;
 
 namespace SmartStore.Data.Mapping.Common
diff --git a/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs b/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs
index 0892840b65..3167ef8487 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Configuration;
 
 namespace SmartStore.Data.Mapping.Configuration
diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs
index fc7466ca9c..bfac3ae710 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Customers;
 
 namespace SmartStore.Data.Mapping.Customers
diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs
index 817228436a..1ee2da8007 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
 
diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs
index 35a76ed019..30f851c4f7 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Customers;
 
 namespace SmartStore.Data.Mapping.Customers
diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs
index 90359ba9c9..c30c89842b 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Customers;
 
 namespace SmartStore.Data.Mapping.Customers
diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs
index 81fc8dd484..5713346d30 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Customers;
 
 namespace SmartStore.Data.Mapping.Customers
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs
index ba4ce8536b..edc022765f 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs
index 32a9ef1701..a533d4d90a 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs
index 7672cd962a..dbe3ef22b4 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs
index 019a3a8cbb..a9f0b6a38d 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs
index 3291d5ae30..128e1ba66e 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs
index a840571e67..64cc1b717a 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs
index fd2e6c52c2..0b650161db 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Directory;
 
 namespace SmartStore.Data.Mapping.Directory
diff --git a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs
index 0136595340..9a816c21be 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Discounts;
 
 namespace SmartStore.Data.Mapping.Discounts
diff --git a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs
index 2ef6b8b368..cf0c49f6f9 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Discounts;
 
 namespace SmartStore.Data.Mapping.Discounts
diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs
index ee9b04ec9a..eae0acd591 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Localization;
 
 namespace SmartStore.Data.Mapping.Localization
diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs
index 077168007a..fdf7fbc0dc 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Localization;
 
 namespace SmartStore.Data.Mapping.Localization
diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs
index 0caaa0f2cd..a48c104787 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Localization;
 
 namespace SmartStore.Data.Mapping.Localization
diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs
index 54c139fe45..3e0efeccf1 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Logging;
 
 namespace SmartStore.Data.Mapping.Logging
diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs
index 2b94e64c0c..f034b44629 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Media;
 
 namespace SmartStore.Data.Mapping.Media
diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs
index e95f99ddeb..42c328aaff 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Media;
 
 namespace SmartStore.Data.Mapping.Media
diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs
index bc5a713680..66ce9b888d 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Messages;
 
 namespace SmartStore.Data.Mapping.Messages
diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs
index e2109fbc89..e31a67a343 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Messages;
 
 namespace SmartStore.Data.Mapping.Messages
diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs
index 67d301bc0c..07a5eb464c 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Messages;
 
 namespace SmartStore.Data.Mapping.Messages
diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs
index a9dc296150..b7bdfa1da7 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Messages;
 
 namespace SmartStore.Data.Mapping.Messages
diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs
index 9ef6a7ebe2..549bc6e8a6 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Messages;
 
 namespace SmartStore.Data.Mapping.Messages
diff --git a/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs b/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs
index 13317df3ff..80533e23c9 100644
--- a/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.News;
 
 namespace SmartStore.Data.Mapping.News
diff --git a/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs
index 5e99db7272..277122382b 100644
--- a/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.News;
 
 namespace SmartStore.Data.Mapping.News
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs
index dd2511ce59..ff233e4753 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs
index bab207962c..a24a15ce82 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs
index 40201e3105..8335718881 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs
index bb054850df..b13ab2d5ca 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs
index f07ec73c2b..81cc319cfe 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs
index 43d7722631..3c180d5e8d 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs
index f05a9e653f..0b18222ff4 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs
index 2e2a9d2bda..ecbe98237b 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs
index 9160cead42..96090fa8aa 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs
index 67776065ba..7e094f2950 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Orders;
 
 namespace SmartStore.Data.Mapping.Orders
diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs
index 925bf98e8e..4d1db4810d 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Polls;
 
 namespace SmartStore.Data.Mapping.Polls
diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs
index 1f2eaf2e54..ec29a6be6d 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Polls;
 
 namespace SmartStore.Data.Mapping.Polls
diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs
index 8e6ff8b3e2..26502c67be 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Polls;
 
 namespace SmartStore.Data.Mapping.Polls
diff --git a/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs b/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs
index 74f4f452f2..104b071145 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Rules.Domain;
 
 namespace SmartStore.Data.Mapping.Rules
diff --git a/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs
index 7c3f705d9a..5a6c969d59 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Security;
 
 namespace SmartStore.Data.Mapping.Seo
diff --git a/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs
index 145234dee3..bda65a4fbc 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Security;
 
 namespace SmartStore.Data.Mapping.Security
diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs
index e8108ae002..0aa5debf1f 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Shipping;
 
 namespace SmartStore.Data.Mapping.Shipping
diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs
index 056cd938de..732b41ccda 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Shipping;
 
 namespace SmartStore.Data.Mapping.Shipping
diff --git a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs
index c582f53566..6dd30df75b 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Tasks;
 
 namespace SmartStore.Data.Mapping.Tasks
diff --git a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs
index 1e3c8f8818..81c7bb814d 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Tasks;
 
 namespace SmartStore.Data.Mapping.Tasks
diff --git a/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs b/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs
index bab6575777..a7e165d8db 100644
--- a/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs
+++ b/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs
@@ -1,5 +1,5 @@
 
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Core.Domain.Themes;
 
 namespace SmartStore.Data.Mapping.Themes
diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs
index 8503451f1f..761be47b54 100644
--- a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs
+++ b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.Entity.Validation;
 using System.Linq;
 using System.Text;
diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.cs
index 26d5a65685..296651d29d 100644
--- a/src/Libraries/SmartStore.Data/ObjectContextBase.cs
+++ b/src/Libraries/SmartStore.Data/ObjectContextBase.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using SmartStore.ComponentModel;
diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs b/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs
index eadb6db49d..5e1857deac 100644
--- a/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs
+++ b/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Localization;
diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs b/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs
index 16eccfdfd4..2cd7cd0eb4 100644
--- a/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs
+++ b/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Configuration;
diff --git a/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs b/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs
index 61c6c92d0d..98b8336509 100644
--- a/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs
+++ b/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Collections;
 
diff --git a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs
index 633c5ff6b1..aba6a2f56c 100644
--- a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs
+++ b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Data.Entity.Migrations;
 using System.Data.Entity.Migrations.Infrastructure;
 using System.Linq;
diff --git a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs
index a4d10d520a..33b1096c41 100644
--- a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs
+++ b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.Entity.Migrations;
 using System.Linq;
 using SmartStore.Collections;
diff --git a/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs b/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs
index e58a59a192..27a67b0db8 100644
--- a/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs
+++ b/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs
@@ -1,8 +1,8 @@
 using System.Data.Entity;
 using System.Data.Entity.Core.Common;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.Entity.Infrastructure.DependencyResolution;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Data.Caching;
diff --git a/src/Libraries/SmartStore.Data/SmartObjectContext.cs b/src/Libraries/SmartStore.Data/SmartObjectContext.cs
index d74769d6ed..f002fa8943 100644
--- a/src/Libraries/SmartStore.Data/SmartObjectContext.cs
+++ b/src/Libraries/SmartStore.Data/SmartObjectContext.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Data;
-using System.Data.Entity;
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System.Linq;
 using System.Reflection;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj
index fb594ed6a4..8bcdee70b7 100644
--- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj
+++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj
@@ -1,1016 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Data</RootNamespace>
     <AssemblyName>SmartStore.Data</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\EFMigrations\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\PluginDev\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServerCompact, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.SqlServer.ConnectionInfo, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.ConnectionInfo.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.SqlServer.Management.Sdk.Sfc, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Management.Sdk.Sfc.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.SqlServer.Smo, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Caching\CacheTransactionInterceptor.cs" />
-    <Compile Include="Caching\CachingCommand.cs" />
-    <Compile Include="Caching\CachingCommandDefinition.cs" />
-    <Compile Include="Caching\CachingDataReader.cs" />
-    <Compile Include="Caching\CachingProviderServices.cs" />
-    <Compile Include="Caching\CommandTreeFacts.cs" />
-    <Compile Include="Caching\DbCacheUtil.cs" />
-    <Compile Include="Caching\EfDbCache.cs" />
-    <Compile Include="Caching\DbCacheEntry.cs" />
-    <Compile Include="Caching\DbCachingPolicy.cs" />
-    <Compile Include="Caching\EfDbModelStore.cs" />
-    <Compile Include="Caching\EfMappingViewCacheFactory.cs" />
-    <Compile Include="Caching\EfMappingViewCache.cs" />
-    <Compile Include="Caching\IDbCache.cs" />
-    <Compile Include="Caching\DbCacheExtensions.cs" />
-    <Compile Include="Caching\QueryRegistrar.cs" />
-    <Compile Include="Caching\SingletonQueries.cs" />
-    <Compile Include="Extensions\DbEntityEntryExtensions.cs" />
-    <Compile Include="Extensions\ExceptionExtensions.cs" />
-    <Compile Include="Mapping\Catalog\ProductAttributeOptionMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductAttributeOptionsSetMap.cs" />
-    <Compile Include="Mapping\Customers\WalletHistoryMap.cs" />
-    <Compile Include="Mapping\DataExchange\ImportProfileMap.cs" />
-    <Compile Include="Mapping\DataExchange\SyncMappingMap.cs" />
-    <Compile Include="Mapping\DataExchange\ExportDeploymentMap.cs" />
-    <Compile Include="Mapping\Directory\QuantityUnitMap.cs" />
-    <Compile Include="Mapping\DataExchange\ExportProfileMap.cs" />
-    <Compile Include="Mapping\Forums\ForumPostVoteMap.cs" />
-    <Compile Include="Mapping\Media\MediaFolderMap.cs" />
-    <Compile Include="Mapping\Media\MediaTrackMap.cs" />
-    <Compile Include="Mapping\Media\MediaTagMap.cs" />
-    <Compile Include="Mapping\Rules\RuleEntityMap.cs" />
-    <Compile Include="Mapping\Media\MediaStorageMap.cs" />
-    <Compile Include="Mapping\Messages\QueuedEmailAttachmentMap.cs" />
-    <Compile Include="Mapping\Payments\PaymentMethodMap.cs" />
-    <Compile Include="Mapping\Tasks\ScheduleTaskHistoryMap.cs" />
-    <Compile Include="Migrations\201705281903241_MoreIndexes.cs" />
-    <Compile Include="Migrations\201705281903241_MoreIndexes.Designer.cs">
-      <DependentUpon>201705281903241_MoreIndexes.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201706020759565_UpdateMediaPath.cs" />
-    <Compile Include="Migrations\201706020759565_UpdateMediaPath.Designer.cs">
-      <DependentUpon>201706020759565_UpdateMediaPath.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201707190940318_V302Resources.cs" />
-    <Compile Include="Migrations\201707190940318_V302Resources.Designer.cs">
-      <DependentUpon>201707190940318_V302Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201707281452589_TierPriceCalcMethod.cs" />
-    <Compile Include="Migrations\201707281452589_TierPriceCalcMethod.Designer.cs">
-      <DependentUpon>201707281452589_TierPriceCalcMethod.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201708251628482_SystemTopics.cs" />
-    <Compile Include="Migrations\201708251628482_SystemTopics.Designer.cs">
-      <DependentUpon>201708251628482_SystemTopics.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201709141000226_V303Resources.cs" />
-    <Compile Include="Migrations\201709141000226_V303Resources.Designer.cs">
-      <DependentUpon>201709141000226_V303Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201709251538312_UpdateTrustedShopsTask.cs" />
-    <Compile Include="Migrations\201709251538312_UpdateTrustedShopsTask.Designer.cs">
-      <DependentUpon>201709251538312_UpdateTrustedShopsTask.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201710102038287_CurrencyRounding.cs" />
-    <Compile Include="Migrations\201710102038287_CurrencyRounding.Designer.cs">
-      <DependentUpon>201710102038287_CurrencyRounding.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201710252016556_IndexOptionNames.cs" />
-    <Compile Include="Migrations\201710252016556_IndexOptionNames.Designer.cs">
-      <DependentUpon>201710252016556_IndexOptionNames.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201711112331162_ProductMainPictureId.cs" />
-    <Compile Include="Migrations\201711112331162_ProductMainPictureId.Designer.cs">
-      <DependentUpon>201711112331162_ProductMainPictureId.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201711222311112_MoveFsMedia.cs" />
-    <Compile Include="Migrations\201711222311112_MoveFsMedia.Designer.cs">
-      <DependentUpon>201711222311112_MoveFsMedia.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201711291017168_SyncStringResources.cs" />
-    <Compile Include="Migrations\201711291017168_SyncStringResources.Designer.cs">
-      <DependentUpon>201711291017168_SyncStringResources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201712081631552_Liquid.cs" />
-    <Compile Include="Migrations\201712081631552_Liquid.Designer.cs">
-      <DependentUpon>201712081631552_Liquid.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201712290151517_AddressFormat.cs" />
-    <Compile Include="Migrations\201712290151517_AddressFormat.Designer.cs">
-      <DependentUpon>201712290151517_AddressFormat.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201802081830029_ShippingMethodMultistore.cs" />
-    <Compile Include="Migrations\201802081830029_ShippingMethodMultistore.Designer.cs">
-      <DependentUpon>201802081830029_ShippingMethodMultistore.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201802270844034_ExportAttributeMappings.cs" />
-    <Compile Include="Migrations\201802270844034_ExportAttributeMappings.Designer.cs">
-      <DependentUpon>201802270844034_ExportAttributeMappings.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201804060721031_Wallet.cs" />
-    <Compile Include="Migrations\201804060721031_Wallet.Designer.cs">
-      <DependentUpon>201804060721031_Wallet.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201804090744324_ForceSslForAllPages.cs" />
-    <Compile Include="Migrations\201804090744324_ForceSslForAllPages.Designer.cs">
-      <DependentUpon>201804090744324_ForceSslForAllPages.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201804200835273_V310Resources.cs" />
-    <Compile Include="Migrations\201804200835273_V310Resources.Designer.cs">
-      <DependentUpon>201804200835273_V310Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201804252356096_TopicSlugs.cs" />
-    <Compile Include="Migrations\201804252356096_TopicSlugs.Designer.cs">
-      <DependentUpon>201804252356096_TopicSlugs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201805250724399_V315Resources.cs" />
-    <Compile Include="Migrations\201805250724399_V315Resources.Designer.cs">
-      <DependentUpon>201805250724399_V315Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201806051221399_RefundReturnRequests.cs" />
-    <Compile Include="Migrations\201806051221399_RefundReturnRequests.Designer.cs">
-      <DependentUpon>201806051221399_RefundReturnRequests.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201806231547270_ScheduleTaskHistory.cs" />
-    <Compile Include="Migrations\201806231547270_ScheduleTaskHistory.Designer.cs">
-      <DependentUpon>201806231547270_ScheduleTaskHistory.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201807051830375_MoveCustomerFields.cs" />
-    <Compile Include="Migrations\201807051830375_MoveCustomerFields.Designer.cs">
-      <DependentUpon>201807051830375_MoveCustomerFields.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201807122120062_TopicAcl.cs" />
-    <Compile Include="Migrations\201807122120062_TopicAcl.Designer.cs">
-      <DependentUpon>201807122120062_TopicAcl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201807191020207_OrderItemDeliveryTime.cs" />
-    <Compile Include="Migrations\201807191020207_OrderItemDeliveryTime.Designer.cs">
-      <DependentUpon>201807191020207_OrderItemDeliveryTime.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201807201157391_DownloadVersions.cs" />
-    <Compile Include="Migrations\201807201157391_DownloadVersions.Designer.cs">
-      <DependentUpon>201807201157391_DownloadVersions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201807311708428_ProductPreviewPicture.cs" />
-    <Compile Include="Migrations\201807311708428_ProductPreviewPicture.Designer.cs">
-      <DependentUpon>201807311708428_ProductPreviewPicture.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201808051818238_Merge4.cs" />
-    <Compile Include="Migrations\201808051818238_Merge4.Designer.cs">
-      <DependentUpon>201808051818238_Merge4.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201809171309522_NewsletterSubscriptionLanguage.cs" />
-    <Compile Include="Migrations\201809171309522_NewsletterSubscriptionLanguage.Designer.cs">
-      <DependentUpon>201809171309522_NewsletterSubscriptionLanguage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201809261026134_ForumGroupAcl.cs" />
-    <Compile Include="Migrations\201809261026134_ForumGroupAcl.Designer.cs">
-      <DependentUpon>201809261026134_ForumGroupAcl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201810011954195_ForumPostVote.cs" />
-    <Compile Include="Migrations\201810011954195_ForumPostVote.Designer.cs">
-      <DependentUpon>201810011954195_ForumPostVote.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201810231214068_DataExchangeEnhancements.cs" />
-    <Compile Include="Migrations\201810231214068_DataExchangeEnhancements.Designer.cs">
-      <DependentUpon>201810231214068_DataExchangeEnhancements.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201811061745204_IsSystemProductIndex.cs" />
-    <Compile Include="Migrations\201811061745204_IsSystemProductIndex.Designer.cs">
-      <DependentUpon>201811061745204_IsSystemProductIndex.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201811082148279_LocalizedPropertyKeyGroupIndex.cs" />
-    <Compile Include="Migrations\201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs">
-      <DependentUpon>201811082148279_LocalizedPropertyKeyGroupIndex.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201811161142587_TaskHistoryErrorLength.cs" />
-    <Compile Include="Migrations\201811161142587_TaskHistoryErrorLength.Designer.cs">
-      <DependentUpon>201811161142587_TaskHistoryErrorLength.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201811202204501_ProductIndexSeekExport.cs" />
-    <Compile Include="Migrations\201811202204501_ProductIndexSeekExport.Designer.cs">
-      <DependentUpon>201811202204501_ProductIndexSeekExport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201902211855242_TopicHtmlIdAndBodyCss.cs" />
-    <Compile Include="Migrations\201902211855242_TopicHtmlIdAndBodyCss.Designer.cs">
-      <DependentUpon>201902211855242_TopicHtmlIdAndBodyCss.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201904110735029_Menus.cs" />
-    <Compile Include="Migrations\201904110735029_Menus.Designer.cs">
-      <DependentUpon>201904110735029_Menus.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201905020948354_WidgetTopics.cs" />
-    <Compile Include="Migrations\201905020948354_WidgetTopics.Designer.cs">
-      <DependentUpon>201905020948354_WidgetTopics.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201905101159134_V320Resources.cs" />
-    <Compile Include="Migrations\201905101159134_V320Resources.Designer.cs">
-      <DependentUpon>201905101159134_V320Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201905271110370_V321Resources.cs" />
-    <Compile Include="Migrations\201905271110370_V321Resources.Designer.cs">
-      <DependentUpon>201905271110370_V321Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201906252008551_QuantityUnitNamePlural.cs" />
-    <Compile Include="Migrations\201906252008551_QuantityUnitNamePlural.Designer.cs">
-      <DependentUpon>201906252008551_QuantityUnitNamePlural.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201907032251575_CategoryExternalLink.cs" />
-    <Compile Include="Migrations\201907032251575_CategoryExternalLink.Designer.cs">
-      <DependentUpon>201907032251575_CategoryExternalLink.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201907250103367_RuleSystem.cs" />
-    <Compile Include="Migrations\201907250103367_RuleSystem.Designer.cs">
-      <DependentUpon>201907250103367_RuleSystem.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201908050758298_MoveFurtherCustomerFields.cs" />
-    <Compile Include="Migrations\201908050758298_MoveFurtherCustomerFields.Designer.cs">
-      <DependentUpon>201908050758298_MoveFurtherCustomerFields.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201908150749388_V322Resources.cs" />
-    <Compile Include="Migrations\201908150749388_V322Resources.Designer.cs">
-      <DependentUpon>201908150749388_V322Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201907221803421_GranularPermissions.cs" />
-    <Compile Include="Migrations\201907221803421_GranularPermissions.Designer.cs">
-      <DependentUpon>201907221803421_GranularPermissions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201908211821559_Merge5.cs" />
-    <Compile Include="Migrations\201908211821559_Merge5.Designer.cs">
-      <DependentUpon>201908211821559_Merge5.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201908211825244_ProductTagPublished.cs" />
-    <Compile Include="Migrations\201908211825244_ProductTagPublished.Designer.cs">
-      <DependentUpon>201908211825244_ProductTagPublished.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201908261226350_MenuItemMultistore.cs" />
-    <Compile Include="Migrations\201908261226350_MenuItemMultistore.Designer.cs">
-      <DependentUpon>201908261226350_MenuItemMultistore.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201909291043284_BlogAndNewsItemPictures.cs" />
-    <Compile Include="Migrations\201909291043284_BlogAndNewsItemPictures.Designer.cs">
-      <DependentUpon>201909291043284_BlogAndNewsItemPictures.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201910021805242_RemoveOldPermissions.cs" />
-    <Compile Include="Migrations\201910021805242_RemoveOldPermissions.Designer.cs">
-      <DependentUpon>201910021805242_RemoveOldPermissions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201910162004581_Merge6.cs" />
-    <Compile Include="Migrations\201910162004581_Merge6.Designer.cs">
-      <DependentUpon>201910162004581_Merge6.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201911090805330_ProductVisibility.cs" />
-    <Compile Include="Migrations\201911090805330_ProductVisibility.Designer.cs">
-      <DependentUpon>201911090805330_ProductVisibility.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201911120909434_Merge7.cs" />
-    <Compile Include="Migrations\201911120909434_Merge7.Designer.cs">
-      <DependentUpon>201911120909434_Merge7.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201911141820264_ScheduleTaskPriority.cs" />
-    <Compile Include="Migrations\201911141820264_ScheduleTaskPriority.Designer.cs">
-      <DependentUpon>201911141820264_ScheduleTaskPriority.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201912051209105_MessageTemplateEmailAddress.cs" />
-    <Compile Include="Migrations\201912051209105_MessageTemplateEmailAddress.Designer.cs">
-      <DependentUpon>201912051209105_MessageTemplateEmailAddress.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201912111821362_AddNewPermissions.cs" />
-    <Compile Include="Migrations\201912111821362_AddNewPermissions.Designer.cs">
-      <DependentUpon>201912111821362_AddNewPermissions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202001141118171_SpecificationAttributeColorAndPicture.cs" />
-    <Compile Include="Migrations\202001141118171_SpecificationAttributeColorAndPicture.Designer.cs">
-      <DependentUpon>202001141118171_SpecificationAttributeColorAndPicture.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202001221054109_ManufacturerBottomDescription.cs" />
-    <Compile Include="Migrations\202001221054109_ManufacturerBottomDescription.Designer.cs">
-      <DependentUpon>202001221054109_ManufacturerBottomDescription.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202001301039020_DiscountRuleSets.cs" />
-    <Compile Include="Migrations\202001301039020_DiscountRuleSets.Designer.cs">
-      <DependentUpon>202001301039020_DiscountRuleSets.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002172101120_PictureMediaRename.cs" />
-    <Compile Include="Migrations\202002172101120_PictureMediaRename.Designer.cs">
-      <DependentUpon>202002172101120_PictureMediaRename.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002180228163_PictureMediaRename1.cs" />
-    <Compile Include="Migrations\202002180228163_PictureMediaRename1.Designer.cs">
-      <DependentUpon>202002180228163_PictureMediaRename1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002280005340_MediaManager.cs" />
-    <Compile Include="Migrations\202002280005340_MediaManager.Designer.cs">
-      <DependentUpon>202002280005340_MediaManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002191252074_RemoveDiscountRequirements.cs" />
-    <Compile Include="Migrations\202002191252074_RemoveDiscountRequirements.Designer.cs">
-      <DependentUpon>202002191252074_RemoveDiscountRequirements.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002211011108_GenericMessageTemplate.cs" />
-    <Compile Include="Migrations\202002211011108_GenericMessageTemplate.Designer.cs">
-      <DependentUpon>202002211011108_GenericMessageTemplate.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002241354543_ProductCondition.cs" />
-    <Compile Include="Migrations\202002241354543_ProductCondition.Designer.cs">
-      <DependentUpon>202002241354543_ProductCondition.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002251510114_ManufacturerSubjectToAcl.cs" />
-    <Compile Include="Migrations\202002251510114_ManufacturerSubjectToAcl.Designer.cs">
-      <DependentUpon>202002251510114_ManufacturerSubjectToAcl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202002271206204_ShipmentTrackingUrl.cs" />
-    <Compile Include="Migrations\202002271206204_ShipmentTrackingUrl.Designer.cs">
-      <DependentUpon>202002271206204_ShipmentTrackingUrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202003022018038_Merge8.cs" />
-    <Compile Include="Migrations\202003022018038_Merge8.Designer.cs">
-      <DependentUpon>202003022018038_Merge8.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202003052100521_CustomerRoleMappings.cs" />
-    <Compile Include="Migrations\202003052100521_CustomerRoleMappings.Designer.cs">
-      <DependentUpon>202003052100521_CustomerRoleMappings.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202003112359492_MediaManager2.cs" />
-    <Compile Include="Migrations\202003112359492_MediaManager2.Designer.cs">
-      <DependentUpon>202003112359492_MediaManager2.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202003251118391_CategoryRuleSets.cs" />
-    <Compile Include="Migrations\202003251118391_CategoryRuleSets.Designer.cs">
-      <DependentUpon>202003251118391_CategoryRuleSets.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202003171812584_CookieManager.cs" />
-    <Compile Include="Migrations\202003171812584_CookieManager.Designer.cs">
-      <DependentUpon>202003171812584_CookieManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202003311314082_CookieManagerCountries.cs" />
-    <Compile Include="Migrations\202003311314082_CookieManagerCountries.Designer.cs">
-      <DependentUpon>202003311314082_CookieManagerCountries.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202004301922188_RemoveCustomerCustomerRoles.cs" />
-    <Compile Include="Migrations\202004301922188_RemoveCustomerCustomerRoles.Designer.cs">
-      <DependentUpon>202004301922188_RemoveCustomerCustomerRoles.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202005111006305_CampaignSubjectToAcl.cs" />
-    <Compile Include="Migrations\202005111006305_CampaignSubjectToAcl.Designer.cs">
-      <DependentUpon>202005111006305_CampaignSubjectToAcl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202005201826512_MediaManager3.cs" />
-    <Compile Include="Migrations\202005201826512_MediaManager3.Designer.cs">
-      <DependentUpon>202005201826512_MediaManager3.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202006250801086_V400Resources.cs" />
-    <Compile Include="Migrations\202006250801086_V400Resources.Designer.cs">
-      <DependentUpon>202006250801086_V400Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202007160058551_MediaFileIndexReorg.cs" />
-    <Compile Include="Migrations\202007160058551_MediaFileIndexReorg.Designer.cs">
-      <DependentUpon>202007160058551_MediaFileIndexReorg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202007241131557_V401Resources.cs" />
-    <Compile Include="Migrations\202007241131557_V401Resources.Designer.cs">
-      <DependentUpon>202007241131557_V401Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202007291847004_NewPropertiesAndIndexes.cs" />
-    <Compile Include="Migrations\202007291847004_NewPropertiesAndIndexes.Designer.cs">
-      <DependentUpon>202007291847004_NewPropertiesAndIndexes.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202007301117363_AddCustomerRoleOrderAmount.cs" />
-    <Compile Include="Migrations\202007301117363_AddCustomerRoleOrderAmount.Designer.cs">
-      <DependentUpon>202007301117363_AddCustomerRoleOrderAmount.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202008181949580_RenamedCustomerRoleOrderTotal.cs" />
-    <Compile Include="Migrations\202008181949580_RenamedCustomerRoleOrderTotal.designer.cs">
-      <DependentUpon>202008181949580_RenamedCustomerRoleOrderTotal.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202009021705132_Merge9.cs" />
-    <Compile Include="Migrations\202009021705132_Merge9.designer.cs">
-      <DependentUpon>202009021705132_Merge9.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202009041122208_ShopIcons.cs" />
-    <Compile Include="Migrations\202009041122208_ShopIcons.designer.cs">
-      <DependentUpon>202009041122208_ShopIcons.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202009090817220_DeliveryTimeMinMaxDays.cs" />
-    <Compile Include="Migrations\202009090817220_DeliveryTimeMinMaxDays.designer.cs">
-      <DependentUpon>202009090817220_DeliveryTimeMinMaxDays.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202010011005387_TopicCookieType.cs" />
-    <Compile Include="Migrations\202010011005387_TopicCookieType.designer.cs">
-      <DependentUpon>202010011005387_TopicCookieType.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202010030939136_AttributeChoiceBehaviour.cs" />
-    <Compile Include="Migrations\202010030939136_AttributeChoiceBehaviour.designer.cs">
-      <DependentUpon>202010030939136_AttributeChoiceBehaviour.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202010121359446_RemoveBlogAndNewsLanguage.cs" />
-    <Compile Include="Migrations\202010121359446_RemoveBlogAndNewsLanguage.designer.cs">
-      <DependentUpon>202010121359446_RemoveBlogAndNewsLanguage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202011091154314_V410Resources.cs" />
-    <Compile Include="Migrations\202011091154314_V410Resources.designer.cs">
-      <DependentUpon>202011091154314_V410Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202012051645539_AddBlogAndNewsLanguage.cs" />
-    <Compile Include="Migrations\202012051645539_AddBlogAndNewsLanguage.designer.cs">
-      <DependentUpon>202012051645539_AddBlogAndNewsLanguage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202101251149352_V411Resources.cs" />
-    <Compile Include="Migrations\202101251149352_V411Resources.designer.cs">
-      <DependentUpon>202101251149352_V411Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202112171231491_V420Resources.cs" />
-    <Compile Include="Migrations\202112171231491_V420Resources.designer.cs">
-      <DependentUpon>202112171231491_V420Resources.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ObjectContextBase.SaveChanges.cs" />
-    <Compile Include="Setup\Builder\ActivityLogTypeMigrator.cs" />
-    <Compile Include="Setup\Builder\SettingsBuilder.cs" />
-    <Compile Include="Setup\Builder\SettingsMigrator.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.Products.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.Manufacturers.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.Categories.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.Variants.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.SpecificationAttributes.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.ActivityLogTypes.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.Countries.cs" />
-    <Compile Include="Setup\SeedDbMigrationEvent.cs" />
-    <Compile Include="Setup\DbMigrationContext.cs" />
-    <Compile Include="Extensions\IDbContextExtensions.cs" />
-    <Compile Include="Extensions\DataReaderExtensions.cs" />
-    <Compile Include="Extensions\DbContextExtensions.cs" />
-    <Compile Include="Extensions\MiscExtensions.cs" />
-    <Compile Include="Setup\DbMigrationException.cs" />
-    <Compile Include="Setup\DbSeedingMigrator.cs" />
-    <Compile Include="Setup\IDbMigrationExtensions.cs" />
-    <Compile Include="Setup\IDataSeeder.cs" />
-    <Compile Include="Setup\ILocaleResourcesProvider.cs" />
-    <Compile Include="Setup\InstallDatabaseInitializer.cs" />
-    <Compile Include="Setup\Builder\LocaleResourcesBuilder.cs" />
-    <Compile Include="Setup\Builder\LocaleResourcesMigrator.cs" />
-    <Compile Include="Setup\MigratorUtils.cs" />
-    <Compile Include="Setup\SeedData\SeedDataException.cs" />
-    <Compile Include="Setup\SeedData\SeedEntityExtensions.cs" />
-    <Compile Include="Setup\SeedData\SeedDataConfiguration.cs" />
-    <Compile Include="Setup\SeedData\InvariantSeedData.cs" />
-    <Compile Include="Setup\MigrateDatabaseInitializer.cs" />
-    <Compile Include="EfDataProviderFactory.cs" />
-    <Compile Include="IEfDataProvider.cs" />
-    <Compile Include="Mapping\Catalog\ProductBundleItemAttributeFilterMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductBundleItemMap.cs" />
-    <Compile Include="Mapping\Stores\StoreMap.cs" />
-    <Compile Include="Mapping\Stores\StoreMappingMap.cs" />
-    <Compile Include="Mapping\Themes\ThemeVariableMap.cs" />
-    <Compile Include="Migrations\MigrationsConfiguration.cs" />
-    <Compile Include="ObjectContextBase.cs" />
-    <Compile Include="Mapping\Catalog\BackInStockSubscriptionMap.cs" />
-    <Compile Include="Mapping\Catalog\ManufacturerTemplateMap.cs" />
-    <Compile Include="Mapping\Catalog\CategoryTemplateMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductTemplateMap.cs" />
-    <Compile Include="Mapping\Common\GenericAttributeMap.cs" />
-    <Compile Include="Mapping\Customers\ExternalAuthenticationRecordMap.cs" />
-    <Compile Include="Mapping\Directory\DeliveryTimeMap.cs" />
-    <Compile Include="Mapping\Security\AclRecordMap.cs" />
-    <Compile Include="Mapping\Seo\UrlRecordMap.cs" />
-    <Compile Include="Mapping\Shipping\ShipmentMap.cs" />
-    <Compile Include="Mapping\Shipping\ShipmentItemMap.cs" />
-    <Compile Include="Mapping\Tasks\ScheduleTaskMap.cs" />
-    <Compile Include="Setup\Builder\BuilderDbContextExtensions.cs" />
-    <Compile Include="SmartDbConfiguration.cs" />
-    <Compile Include="SmartObjectContextSaveHook.cs" />
-    <Compile Include="SqlServerDataProvider.cs" />
-    <Compile Include="SqlCeDataProvider.cs" />
-    <Compile Include="Mapping\Affiliates\AffiliateMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductTagMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductReviewHelpfulnessMap.cs" />
-    <Compile Include="Mapping\Common\AddressMap.cs" />
-    <Compile Include="Mapping\Blogs\BlogPostMap.cs" />
-    <Compile Include="Mapping\Blogs\BlogCommentMap.cs" />
-    <Compile Include="Mapping\News\NewsCommentMap.cs" />
-    <Compile Include="Mapping\News\NewsItemMap.cs" />
-    <Compile Include="Mapping\Customers\CustomerRoleMap.cs" />
-    <Compile Include="Mapping\Customers\RewardPointsHistoryMap.cs" />
-    <Compile Include="Mapping\Directory\MeasureWeightMap.cs" />
-    <Compile Include="Mapping\Directory\MeasureDimensionMap.cs" />
-    <Compile Include="Mapping\Directory\CurrencyMap.cs" />
-    <Compile Include="Mapping\Directory\CountryMap.cs" />
-    <Compile Include="Mapping\Discounts\DiscountUsageHistoryMap.cs" />
-    <Compile Include="Mapping\Discounts\DiscountMap.cs" />
-    <Compile Include="Mapping\Forums\ForumGroupMap.cs" />
-    <Compile Include="Mapping\Forums\ForumMap.cs" />
-    <Compile Include="Mapping\Forums\ForumPostMap.cs" />
-    <Compile Include="Mapping\Forums\ForumSubscriptionMap.cs" />
-    <Compile Include="Mapping\Forums\ForumTopicMap.cs" />
-    <Compile Include="Mapping\Forums\PrivateMessageMap.cs" />
-    <Compile Include="Mapping\Logging\ActivityLogMap.cs" />
-    <Compile Include="Mapping\Logging\ActivityLogTypeMap.cs" />
-    <Compile Include="Mapping\Media\DownloadMap.cs" />
-    <Compile Include="Mapping\Messages\CampaignMap.cs" />
-    <Compile Include="Mapping\Messages\EmailAccountMap.cs" />
-    <Compile Include="Mapping\Messages\MessageTemplateMap.cs" />
-    <Compile Include="Mapping\Messages\NewsLetterSubscriptionMap.cs" />
-    <Compile Include="Mapping\Messages\QueuedEmailMap.cs" />
-    <Compile Include="Mapping\Orders\CheckoutAttributeMap.cs" />
-    <Compile Include="Mapping\Orders\CheckoutAttributeValueMap.cs" />
-    <Compile Include="Mapping\Orders\ReturnRequestMap.cs" />
-    <Compile Include="Mapping\Orders\RecurringPaymentHistoryMap.cs" />
-    <Compile Include="Mapping\Orders\RecurringPaymentMap.cs" />
-    <Compile Include="Mapping\Orders\OrderItemMap.cs" />
-    <Compile Include="Mapping\Orders\OrderNoteMap.cs" />
-    <Compile Include="Mapping\Orders\GiftCardMap.cs" />
-    <Compile Include="Mapping\Orders\GiftCardUsageHistoryMap.cs" />
-    <Compile Include="Mapping\Orders\ShoppingCartItemMap.cs" />
-    <Compile Include="Mapping\Orders\OrderMap.cs" />
-    <Compile Include="Mapping\Polls\PollMap.cs" />
-    <Compile Include="Mapping\Polls\PollVotingRecordMap.cs" />
-    <Compile Include="Mapping\Polls\PollAnswerMap.cs" />
-    <Compile Include="Mapping\Security\PermissionRecordMap.cs" />
-    <Compile Include="Mapping\Directory\StateProvinceMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductReviewMap.cs" />
-    <Compile Include="Mapping\Customers\CustomerContentMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductAttributeMap.cs" />
-    <Compile Include="Mapping\Localization\LocalizedPropertyMap.cs" />
-    <Compile Include="Mapping\Catalog\TierPriceMap.cs" />
-    <Compile Include="Mapping\Catalog\RelatedProductMap.cs" />
-    <Compile Include="Mapping\Catalog\CrossSellProductMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductSpecificationAttributeMap.cs" />
-    <Compile Include="Mapping\Catalog\SpecificationAttributeOptionMap.cs" />
-    <Compile Include="Mapping\Catalog\SpecificationAttributeMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductVariantAttributeValueMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductVariantAttributeCombinationMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductVariantAttributeMap.cs" />
-    <Compile Include="Mapping\Media\MediaFileMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductMediaFileMap.cs" />
-    <Compile Include="Mapping\Catalog\ManufacturerMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductManufacturerMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductCategoryMap.cs" />
-    <Compile Include="Mapping\Catalog\CategoryMap.cs" />
-    <Compile Include="Mapping\Catalog\ProductMap.cs" />
-    <Compile Include="Mapping\Customers\CustomerMap.cs" />
-    <Compile Include="Mapping\Logging\LogMap.cs" />
-    <Compile Include="Mapping\Localization\LanguageMap.cs" />
-    <Compile Include="Mapping\Localization\LocaleStringResourceMap.cs" />
-    <Compile Include="Mapping\Configuration\SettingMap.cs" />
-    <Compile Include="Mapping\Shipping\ShippingMethodMap.cs" />
-    <Compile Include="Mapping\Tax\TaxCategoryMap.cs" />
-    <Compile Include="Mapping\Topics\TopicMap.cs" />
-    <Compile Include="SmartObjectContext.cs" />
-    <Compile Include="EfRepository.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities\NewsItemConverter.cs" />
-    <Compile Include="Utilities\DataMigrator.cs" />
-    <Compile Include="Utilities\FastPager.cs" />
-    <Compile Include="Utilities\BlogPostConverter.cs" />
-    <Compile Include="Utilities\MessageTemplateConverter.cs" />
-    <Compile Include="Utilities\SqlBlobStream.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
+    <Compile Include="..\..\AssemblySharedInfo.cs" Link="Properties\AssemblySharedInfo.cs" />
+    <Compile Include="..\..\AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <EmbeddedResource Include="Migrations\201705281903241_MoreIndexes.resx">
-      <DependentUpon>201705281903241_MoreIndexes.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201706020759565_UpdateMediaPath.resx">
-      <DependentUpon>201706020759565_UpdateMediaPath.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201707190940318_V302Resources.resx">
-      <DependentUpon>201707190940318_V302Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201707281452589_TierPriceCalcMethod.resx">
-      <DependentUpon>201707281452589_TierPriceCalcMethod.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201708251628482_SystemTopics.resx">
-      <DependentUpon>201708251628482_SystemTopics.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201709141000226_V303Resources.resx">
-      <DependentUpon>201709141000226_V303Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201709251538312_UpdateTrustedShopsTask.resx">
-      <DependentUpon>201709251538312_UpdateTrustedShopsTask.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201710102038287_CurrencyRounding.resx">
-      <DependentUpon>201710102038287_CurrencyRounding.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201710252016556_IndexOptionNames.resx">
-      <DependentUpon>201710252016556_IndexOptionNames.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201711112331162_ProductMainPictureId.resx">
-      <DependentUpon>201711112331162_ProductMainPictureId.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201711222311112_MoveFsMedia.resx">
-      <DependentUpon>201711222311112_MoveFsMedia.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201711291017168_SyncStringResources.resx">
-      <DependentUpon>201711291017168_SyncStringResources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201712081631552_Liquid.resx">
-      <DependentUpon>201712081631552_Liquid.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201712290151517_AddressFormat.resx">
-      <DependentUpon>201712290151517_AddressFormat.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201802081830029_ShippingMethodMultistore.resx">
-      <DependentUpon>201802081830029_ShippingMethodMultistore.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201802270844034_ExportAttributeMappings.resx">
-      <DependentUpon>201802270844034_ExportAttributeMappings.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201804060721031_Wallet.resx">
-      <DependentUpon>201804060721031_Wallet.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201804090744324_ForceSslForAllPages.resx">
-      <DependentUpon>201804090744324_ForceSslForAllPages.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201804200835273_V310Resources.resx">
-      <DependentUpon>201804200835273_V310Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201804252356096_TopicSlugs.resx">
-      <DependentUpon>201804252356096_TopicSlugs.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201805250724399_V315Resources.resx">
-      <DependentUpon>201805250724399_V315Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201806051221399_RefundReturnRequests.resx">
-      <DependentUpon>201806051221399_RefundReturnRequests.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201806231547270_ScheduleTaskHistory.resx">
-      <DependentUpon>201806231547270_ScheduleTaskHistory.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201807051830375_MoveCustomerFields.resx">
-      <DependentUpon>201807051830375_MoveCustomerFields.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201807122120062_TopicAcl.resx">
-      <DependentUpon>201807122120062_TopicAcl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201807191020207_OrderItemDeliveryTime.resx">
-      <DependentUpon>201807191020207_OrderItemDeliveryTime.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201807201157391_DownloadVersions.resx">
-      <DependentUpon>201807201157391_DownloadVersions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201807311708428_ProductPreviewPicture.resx">
-      <DependentUpon>201807311708428_ProductPreviewPicture.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201808051818238_Merge4.resx">
-      <DependentUpon>201808051818238_Merge4.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201809171309522_NewsletterSubscriptionLanguage.resx">
-      <DependentUpon>201809171309522_NewsletterSubscriptionLanguage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201809261026134_ForumGroupAcl.resx">
-      <DependentUpon>201809261026134_ForumGroupAcl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201810011954195_ForumPostVote.resx">
-      <DependentUpon>201810011954195_ForumPostVote.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201810231214068_DataExchangeEnhancements.resx">
-      <DependentUpon>201810231214068_DataExchangeEnhancements.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201811061745204_IsSystemProductIndex.resx">
-      <DependentUpon>201811061745204_IsSystemProductIndex.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201811082148279_LocalizedPropertyKeyGroupIndex.resx">
-      <DependentUpon>201811082148279_LocalizedPropertyKeyGroupIndex.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201811161142587_TaskHistoryErrorLength.resx">
-      <DependentUpon>201811161142587_TaskHistoryErrorLength.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201811202204501_ProductIndexSeekExport.resx">
-      <DependentUpon>201811202204501_ProductIndexSeekExport.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201902211855242_TopicHtmlIdAndBodyCss.resx">
-      <DependentUpon>201902211855242_TopicHtmlIdAndBodyCss.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201904110735029_Menus.resx">
-      <DependentUpon>201904110735029_Menus.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201905020948354_WidgetTopics.resx">
-      <DependentUpon>201905020948354_WidgetTopics.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201905101159134_V320Resources.resx">
-      <DependentUpon>201905101159134_V320Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201905271110370_V321Resources.resx">
-      <DependentUpon>201905271110370_V321Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201906252008551_QuantityUnitNamePlural.resx">
-      <DependentUpon>201906252008551_QuantityUnitNamePlural.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201907032251575_CategoryExternalLink.resx">
-      <DependentUpon>201907032251575_CategoryExternalLink.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201907250103367_RuleSystem.resx">
-      <DependentUpon>201907250103367_RuleSystem.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201907221803421_GranularPermissions.resx">
-      <DependentUpon>201907221803421_GranularPermissions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201908050758298_MoveFurtherCustomerFields.resx">
-      <DependentUpon>201908050758298_MoveFurtherCustomerFields.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201908150749388_V322Resources.resx">
-      <DependentUpon>201908150749388_V322Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201908211821559_Merge5.resx">
-      <DependentUpon>201908211821559_Merge5.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201908211825244_ProductTagPublished.resx">
-      <DependentUpon>201908211825244_ProductTagPublished.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201908261226350_MenuItemMultistore.resx">
-      <DependentUpon>201908261226350_MenuItemMultistore.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201909291043284_BlogAndNewsItemPictures.resx">
-      <DependentUpon>201909291043284_BlogAndNewsItemPictures.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201910021805242_RemoveOldPermissions.resx">
-      <DependentUpon>201910021805242_RemoveOldPermissions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201910162004581_Merge6.resx">
-      <DependentUpon>201910162004581_Merge6.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201911090805330_ProductVisibility.resx">
-      <DependentUpon>201911090805330_ProductVisibility.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201911120909434_Merge7.resx">
-      <DependentUpon>201911120909434_Merge7.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201911141820264_ScheduleTaskPriority.resx">
-      <DependentUpon>201911141820264_ScheduleTaskPriority.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201912051209105_MessageTemplateEmailAddress.resx">
-      <DependentUpon>201912051209105_MessageTemplateEmailAddress.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201912111821362_AddNewPermissions.resx">
-      <DependentUpon>201912111821362_AddNewPermissions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202001141118171_SpecificationAttributeColorAndPicture.resx">
-      <DependentUpon>202001141118171_SpecificationAttributeColorAndPicture.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202001221054109_ManufacturerBottomDescription.resx">
-      <DependentUpon>202001221054109_ManufacturerBottomDescription.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202001301039020_DiscountRuleSets.resx">
-      <DependentUpon>202001301039020_DiscountRuleSets.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002172101120_PictureMediaRename.resx">
-      <DependentUpon>202002172101120_PictureMediaRename.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002180228163_PictureMediaRename1.resx">
-      <DependentUpon>202002180228163_PictureMediaRename1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002280005340_MediaManager.resx">
-      <DependentUpon>202002280005340_MediaManager.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002191252074_RemoveDiscountRequirements.resx">
-      <DependentUpon>202002191252074_RemoveDiscountRequirements.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002211011108_GenericMessageTemplate.resx">
-      <DependentUpon>202002211011108_GenericMessageTemplate.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002241354543_ProductCondition.resx">
-      <DependentUpon>202002241354543_ProductCondition.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002251510114_ManufacturerSubjectToAcl.resx">
-      <DependentUpon>202002251510114_ManufacturerSubjectToAcl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202002271206204_ShipmentTrackingUrl.resx">
-      <DependentUpon>202002271206204_ShipmentTrackingUrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202003022018038_Merge8.resx">
-      <DependentUpon>202003022018038_Merge8.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202003052100521_CustomerRoleMappings.resx">
-      <DependentUpon>202003052100521_CustomerRoleMappings.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202003112359492_MediaManager2.resx">
-      <DependentUpon>202003112359492_MediaManager2.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202003251118391_CategoryRuleSets.resx">
-      <DependentUpon>202003251118391_CategoryRuleSets.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202003171812584_CookieManager.resx">
-      <DependentUpon>202003171812584_CookieManager.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202003311314082_CookieManagerCountries.resx">
-      <DependentUpon>202003311314082_CookieManagerCountries.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202004301922188_RemoveCustomerCustomerRoles.resx">
-      <DependentUpon>202004301922188_RemoveCustomerCustomerRoles.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202005111006305_CampaignSubjectToAcl.resx">
-      <DependentUpon>202005111006305_CampaignSubjectToAcl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202005201826512_MediaManager3.resx">
-      <DependentUpon>202005201826512_MediaManager3.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202006250801086_V400Resources.resx">
-      <DependentUpon>202006250801086_V400Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202007160058551_MediaFileIndexReorg.resx">
-      <DependentUpon>202007160058551_MediaFileIndexReorg.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202007241131557_V401Resources.resx">
-      <DependentUpon>202007241131557_V401Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202007291847004_NewPropertiesAndIndexes.resx">
-      <DependentUpon>202007291847004_NewPropertiesAndIndexes.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202007301117363_AddCustomerRoleOrderAmount.resx">
-      <DependentUpon>202007301117363_AddCustomerRoleOrderAmount.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202008181949580_RenamedCustomerRoleOrderTotal.resx">
-      <DependentUpon>202008181949580_RenamedCustomerRoleOrderTotal.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202009021705132_Merge9.resx">
-      <DependentUpon>202009021705132_Merge9.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202009041122208_ShopIcons.resx">
-      <DependentUpon>202009041122208_ShopIcons.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202009090817220_DeliveryTimeMinMaxDays.resx">
-      <DependentUpon>202009090817220_DeliveryTimeMinMaxDays.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202010011005387_TopicCookieType.resx">
-      <DependentUpon>202010011005387_TopicCookieType.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202010030939136_AttributeChoiceBehaviour.resx">
-      <DependentUpon>202010030939136_AttributeChoiceBehaviour.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202010121359446_RemoveBlogAndNewsLanguage.resx">
-      <DependentUpon>202010121359446_RemoveBlogAndNewsLanguage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202011091154314_V410Resources.resx">
-      <DependentUpon>202011091154314_V410Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202012051645539_AddBlogAndNewsLanguage.resx">
-      <DependentUpon>202012051645539_AddBlogAndNewsLanguage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202101251149352_V411Resources.resx">
-      <DependentUpon>202101251149352_V411Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202112171231491_V420Resources.resx">
-      <DependentUpon>202112171231491_V420Resources.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Sql\Indexes.sql" />
-    <EmbeddedResource Include="Sql\StoredProcedures.sql" />
+    <ProjectReference Include="..\SmartStore.Core\SmartStore.Core.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <EmbeddedResource Include="Sql\Indexes.SqlServer.sql" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Autofac" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Sql\Indexes.Inverse.sql" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Sql\Indexes.SqlServer.Inverse.sql" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Sql\StoredProcedures.Inverse.sql" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Caching\Credits.txt" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs b/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs
index 676365febc..f51fa6ae41 100644
--- a/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs
+++ b/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs
@@ -1,5 +1,5 @@
 using System.Data.Common;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.SqlClient;
 
 namespace SmartStore.Data
diff --git a/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs b/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs
index b331488ed7..e15427607f 100644
--- a/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs
+++ b/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs
@@ -1,5 +1,5 @@
 using System.Data.Common;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.SqlClient;
 
 namespace SmartStore.Data
diff --git a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs
index 796f12c1fa..8bbde2af3d 100644
--- a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs
+++ b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Globalization;
 using System.IO;
 using System.Linq;
diff --git a/src/Libraries/SmartStore.Data/Utilities/FastPager.cs b/src/Libraries/SmartStore.Data/Utilities/FastPager.cs
index 568157d7c4..40a151ec39 100644
--- a/src/Libraries/SmartStore.Data/Utilities/FastPager.cs
+++ b/src/Libraries/SmartStore.Data/Utilities/FastPager.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
diff --git a/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs b/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs
index 9e346c08ab..400c3de31f 100644
--- a/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs
+++ b/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.IO;
 
 namespace SmartStore.Data.Utilities
diff --git a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs
index da90c9f326..5b219e3616 100644
--- a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs
+++ b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs
@@ -1,7 +1,7 @@
 //Contributor:  Nicholas Mayne
 
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Services.Authentication.External
 {
diff --git a/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizerHelper.cs b/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizerHelper.cs
index 1ba5074438..5fe0aa886f 100644
--- a/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizerHelper.cs
+++ b/src/Libraries/SmartStore.Services/Authentication/External/ExternalAuthorizerHelper.cs
@@ -1,7 +1,7 @@
 //Contributor:  Nicholas Mayne
 
 using System.Collections.Generic;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Infrastructure;
 
 namespace SmartStore.Services.Authentication.External
diff --git a/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs
index e7eed71acb..7212f3fe3a 100644
--- a/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs
+++ b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs
@@ -1,6 +1,6 @@
 //Contributor:  Nicholas Mayne
 
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 
 namespace SmartStore.Services.Authentication.External
diff --git a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs
index 626d002326..cc82118957 100644
--- a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs
+++ b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Services.Customers;
diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs
index 7e2d61978f..f08edde5fa 100644
--- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs
+++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Rules;
diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs
index a4f14359d7..6b68322d4a 100644
--- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs
+++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Rules;
diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs
index 379fa39e69..b77e26ce07 100644
--- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs
+++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Rules;
diff --git a/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs b/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs
index b17f20784b..0c0a5e16b4 100644
--- a/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs
+++ b/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Orders;
 
diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs
index e4f1c20899..4df70a7455 100644
--- a/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs b/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs
index 1d5730b812..4c77d8bb26 100644
--- a/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/CompareProductsService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Services.Search;
diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs
index 7c7f4df528..27274dce01 100644
--- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Localization;
diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs
index da76ad1190..41f604a15a 100644
--- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Services.Catalog.Modelling;
diff --git a/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs b/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs
index 0e7e928198..dab4b121e6 100644
--- a/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/Importer/CategoryImporter.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
diff --git a/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs b/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs
index 218387e4cc..f700bb5c7c 100644
--- a/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/ManufacturerService.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Collections;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs
index c7cb504693..31fbf0b6ce 100644
--- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.Services.Search.Modelling;
 
diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs
index ebb79e92b8..c9572cc148 100644
--- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs
@@ -1,5 +1,4 @@
 using System.Web.Mvc;
-using Autofac.Integration.Mvc;
 
 namespace SmartStore.Services.Catalog.Modelling
 {
diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs
index e0454c592a..13b65a5604 100644
--- a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Directory;
diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs
index 8e54c8d8a1..54499bedf4 100644
--- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs
index 39b45da0fb..883151658f 100644
--- a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeService.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Collections;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductService.cs b/src/Libraries/SmartStore.Services/Catalog/ProductService.cs
index 622f9c56c6..9c1fd33134 100644
--- a/src/Libraries/SmartStore.Services/Catalog/ProductService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/ProductService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Collections;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs b/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs
index e7c26224f7..16678f6138 100644
--- a/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/RecentlyViewedProductsService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Services.Security;
diff --git a/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleEvaluatorTask.cs b/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleEvaluatorTask.cs
index 71056d3463..4a73052ced 100644
--- a/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleEvaluatorTask.cs
+++ b/src/Libraries/SmartStore.Services/Catalog/Rules/ProductRuleEvaluatorTask.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs
index 7344a6b0c6..d54157c3fd 100644
--- a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs
+++ b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs
@@ -3,11 +3,11 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Async;
 using System.Web.Mvc.Html;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Logging;
diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs
index 0e15cb8771..837ca2e20b 100644
--- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs
+++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Services.Cms.Blocks
 {
diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs
index 4560ff9cff..baffd42afd 100644
--- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs
+++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlock.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Services.Cms.Blocks
 {
diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs
index 58d74e18ec..5c7e50e7d1 100644
--- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs
+++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Services.Cms.Blocks
 {
diff --git a/src/Libraries/SmartStore.Services/Cms/IWidget.cs b/src/Libraries/SmartStore.Services/Cms/IWidget.cs
index 935756d117..dcc462468a 100644
--- a/src/Libraries/SmartStore.Services/Cms/IWidget.cs
+++ b/src/Libraries/SmartStore.Services/Cms/IWidget.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 
 namespace SmartStore.Services.Cms
diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs
index ae89d1d75b..49049577aa 100644
--- a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs
+++ b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Blogs;
diff --git a/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs b/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs
index 748535a4f4..484769752e 100644
--- a/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs
+++ b/src/Libraries/SmartStore.Services/Cms/Menus/MenuStorage.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Libraries/SmartStore.Services/Common/IMobileDeviceHelper.cs b/src/Libraries/SmartStore.Services/Common/IMobileDeviceHelper.cs
index 16a24b174e..d2abe825f0 100644
--- a/src/Libraries/SmartStore.Services/Common/IMobileDeviceHelper.cs
+++ b/src/Libraries/SmartStore.Services/Common/IMobileDeviceHelper.cs
@@ -1,4 +1,4 @@
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Services.Common
 {
diff --git a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs
index 9f1705d9a3..f5ce5d457f 100644
--- a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs
+++ b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Utilities;
 using uap = UAParser;
 
diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs
index 486f1a42b1..ab01c03b04 100644
--- a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs
+++ b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs
@@ -8,8 +8,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Services.Customers
 {
diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs
index 4aff7b3b81..06a6e244ad 100644
--- a/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs
+++ b/src/Libraries/SmartStore.Services/Customers/CustomerReportService.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs
index 10c842935b..a8c6e5ff93 100644
--- a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs
+++ b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs
index 7a246b92a4..637d99ecd3 100644
--- a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs
+++ b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs
@@ -1,7 +1,7 @@
 using SmartStore.Core.Plugins;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Services.Customers
 {
diff --git a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupEvaluatorTask.cs b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupEvaluatorTask.cs
index 8a8481effa..b8834a4d98 100644
--- a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupEvaluatorTask.cs
+++ b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupEvaluatorTask.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs
index 2b54efadc3..aeab863263 100644
--- a/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs
+++ b/src/Libraries/SmartStore.Services/Customers/Rules/TargetGroupService.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs
index 076b161bf9..0b5283a318 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
index 946769b317..f86939f3dd 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
index 6fc708c721..9c95af4124 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportExtensions.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Domain;
 using SmartStore.Core.Domain.DataExchange;
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs
index 628dc0894c..c0dc198f69 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs
@@ -6,7 +6,7 @@
 using System.Dynamic;
 using System.IO;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Services.DataExchange.Csv;
 using SmartStore.Services.DataExchange.Excel;
 
diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs
index ab3fb9563b..5abee15811 100644
--- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs
+++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Entity.Core.Metadata.Edm;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
diff --git a/src/Libraries/SmartStore.Services/Forums/ForumService.cs b/src/Libraries/SmartStore.Services/Forums/ForumService.cs
index 6430f209ce..0c4d5398aa 100644
--- a/src/Libraries/SmartStore.Services/Forums/ForumService.cs
+++ b/src/Libraries/SmartStore.Services/Forums/ForumService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Customers;
@@ -13,7 +13,7 @@
 using SmartStore.Services.Seo;
 using SmartStore.Core.Domain.Seo;
 using SmartStore.Core.Domain.Localization;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using SmartStore.Data.Utilities;
 
diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs
index c383f2c992..a864cc6955 100644
--- a/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs
+++ b/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using SmartStore.Core.Domain.Localization;
 
diff --git a/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs b/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs
index 260e3c0282..6036dbf4cd 100644
--- a/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs
+++ b/src/Libraries/SmartStore.Services/Media/Album/FolderService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Collections;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs b/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs
index e809483acc..2fed4ae996 100644
--- a/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs
+++ b/src/Libraries/SmartStore.Services/Media/Album/SystemAlbumProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Libraries/SmartStore.Services/Media/DownloadService.cs b/src/Libraries/SmartStore.Services/Media/DownloadService.cs
index 89297b15b0..be9189edfb 100644
--- a/src/Libraries/SmartStore.Services/Media/DownloadService.cs
+++ b/src/Libraries/SmartStore.Services/Media/DownloadService.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using NuGet;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/Media/Events.cs b/src/Libraries/SmartStore.Services/Media/Events.cs
index 583f34a90a..e17feb5e3a 100644
--- a/src/Libraries/SmartStore.Services/Media/Events.cs
+++ b/src/Libraries/SmartStore.Services/Media/Events.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
 using System.IO;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Services.Media.Imaging;
 
 namespace SmartStore.Services.Media
diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs
index 0ac54584ec..9f01531ad5 100644
--- a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs
+++ b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core.IO;
diff --git a/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs b/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs
index e460dd94ef..5cc8b524f3 100644
--- a/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs
+++ b/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs
index 37cf4491b0..39e66554ca 100644
--- a/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs
+++ b/src/Libraries/SmartStore.Services/Media/MediaService.Folder.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.IO;
 using System.Linq;
 using System.Linq.Dynamic.Core;
diff --git a/src/Libraries/SmartStore.Services/Media/MediaService.cs b/src/Libraries/SmartStore.Services/Media/MediaService.cs
index dc6ef6ce92..bd77924dae 100644
--- a/src/Libraries/SmartStore.Services/Media/MediaService.cs
+++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Drawing;
 using System.IO;
 using System.Linq;
diff --git a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs
index 21f31b28c4..fd756cb16a 100644
--- a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs
+++ b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs
@@ -1,6 +1,6 @@
 using System.Globalization;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Services.Configuration;
diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs
index ba0c18c8e4..6bd5642c97 100644
--- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs
+++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using SmartStore.Linq;
diff --git a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs
index 0fd3e2f053..45f6430996 100644
--- a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs
+++ b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Data.Common;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Data.SqlClient;
 using System.IO;
 using System.Threading.Tasks;
diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs
index bd5b52efcf..15832d3613 100644
--- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs
+++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using System.Web.UI;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs
index fae7b431e9..b80908e7f9 100644
--- a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs
+++ b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs
index 0c1c48f8ab..561af5effe 100644
--- a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs
+++ b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading.Tasks;
 using SmartStore.Core.Data;
diff --git a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs
index d3875f252d..aa32b67672 100644
--- a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs
+++ b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core.Domain.Messages;
diff --git a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs
index 7c2ab26c7b..7af4bce9f9 100644
--- a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs
+++ b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Expressions;
 using Newtonsoft.Json;
diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs
index 37045b041f..b315aa41da 100644
--- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs
+++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs
@@ -5,7 +5,7 @@
 using System.Dynamic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs b/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs
index 8e0a9846fc..c2cd0733e0 100644
--- a/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs
+++ b/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Net.Mail;
 using System.Threading.Tasks;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs b/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs
index eccd83e7ab..1c926c2315 100644
--- a/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs
+++ b/src/Libraries/SmartStore.Services/Messages/QueuedMessagesSendTask.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Services.Tasks;
 
 namespace SmartStore.Services.Messages
diff --git a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs
index 84fd3b046f..10a46f917a 100644
--- a/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs
+++ b/src/Libraries/SmartStore.Services/Orders/CheckoutAttributeFormatter.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs b/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs
index a3e30eea97..dc3f882fd2 100644
--- a/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs
+++ b/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Globalization;
 using System.Linq;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs
index 2b439f7b26..114cb406f4 100644
--- a/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs
+++ b/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Plugins;
 
diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs b/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs
index f157ef74d9..42fc4ff667 100644
--- a/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs
+++ b/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Core.Plugins;
diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs b/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs
index bfa3fd2948..00919a0d21 100644
--- a/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs
+++ b/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Localization;
 using SmartStore.Core.Plugins;
diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs b/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs
index 493a48b521..ff7a384dfc 100644
--- a/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs
+++ b/src/Libraries/SmartStore.Services/Pdf/Content/PdfHtmlContent.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs b/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs
index 6065e91a84..b67f15638c 100644
--- a/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs
+++ b/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs
@@ -3,8 +3,8 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Web;
-using System.Web.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
 using SmartStore.Core;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Services/Rules/DefaultRuleOptionsProvider.cs b/src/Libraries/SmartStore.Services/Rules/DefaultRuleOptionsProvider.cs
index dda9ef39d8..5e226ead4f 100644
--- a/src/Libraries/SmartStore.Services/Rules/DefaultRuleOptionsProvider.cs
+++ b/src/Libraries/SmartStore.Services/Rules/DefaultRuleOptionsProvider.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Globalization;
 using System.Linq;
 using SmartStore.Core;
diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs
index 480c5190d0..a597d2a94c 100644
--- a/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs
+++ b/src/Libraries/SmartStore.Services/Search/Catalog/CatalogSearchService.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
-using System.Data.Entity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Autofac;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Seo;
diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs b/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs
index 6e709dca0d..f564249aa8 100644
--- a/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs
+++ b/src/Libraries/SmartStore.Services/Search/Catalog/LinqCatalogSearchService.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs
index f03d97bd69..2ce5c25b17 100644
--- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs
+++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Search;
diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs
index 817f082d51..2955c47b64 100644
--- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs
+++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs
@@ -1,5 +1,4 @@
 using System.Web.Mvc;
-using Autofac.Integration.Mvc;
 
 namespace SmartStore.Services.Search.Modelling
 {
diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs
index 407dc43f9c..3331fccefb 100644
--- a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs
+++ b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs
@@ -3,7 +3,7 @@
 using System.Collections.Specialized;
 using System.Globalization;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Search;
diff --git a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs
index 0cff069cf5..b35c3c199c 100644
--- a/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs
+++ b/src/Libraries/SmartStore.Services/Search/Forum/ForumSearchService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Autofac;
 using SmartStore.Core.Domain.Forums;
 using SmartStore.Core.Logging;
diff --git a/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs b/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs
index 0d9257c4f1..81fcc585d1 100644
--- a/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs
+++ b/src/Libraries/SmartStore.Services/Search/Forum/LinqForumSearchService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Forums;
diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryFactory.cs
index 6310fbbfa4..e87188684b 100644
--- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryFactory.cs
+++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryFactory.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Forums;
diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs
index cc3e935fe7..1f1f8ae325 100644
--- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs
+++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs
@@ -1,5 +1,4 @@
 using System.Web.Mvc;
-using Autofac.Integration.Mvc;
 
 namespace SmartStore.Services.Search.Modelling
 {
diff --git a/src/Libraries/SmartStore.Services/Search/SearchQueryFactoryBase.cs b/src/Libraries/SmartStore.Services/Search/SearchQueryFactoryBase.cs
index 0fa710c25d..6492c6ceea 100644
--- a/src/Libraries/SmartStore.Services/Search/SearchQueryFactoryBase.cs
+++ b/src/Libraries/SmartStore.Services/Search/SearchQueryFactoryBase.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Collections;
 using SmartStore.Utilities;
 
diff --git a/src/Libraries/SmartStore.Services/Search/SearchServiceBase.cs b/src/Libraries/SmartStore.Services/Search/SearchServiceBase.cs
index 1eb0f59027..07710a9324 100644
--- a/src/Libraries/SmartStore.Services/Search/SearchServiceBase.cs
+++ b/src/Libraries/SmartStore.Services/Search/SearchServiceBase.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Search;
 using SmartStore.Services.Customers;
diff --git a/src/Libraries/SmartStore.Services/Security/EncryptionService.cs b/src/Libraries/SmartStore.Services/Security/EncryptionService.cs
index 34ffb82a27..38961f0dac 100644
--- a/src/Libraries/SmartStore.Services/Security/EncryptionService.cs
+++ b/src/Libraries/SmartStore.Services/Security/EncryptionService.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web.Security;
+using Microsoft.AspNetCore.Identity;
 using SmartStore.Core.Domain.Security;
 
 namespace SmartStore.Services.Security
diff --git a/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs b/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs
index 3f627046c2..68f3896752 100644
--- a/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs
+++ b/src/Libraries/SmartStore.Services/Security/InstallPermissionsStarter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Security;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Libraries/SmartStore.Services/Security/PermissionService.cs b/src/Libraries/SmartStore.Services/Security/PermissionService.cs
index 55f515ea91..8703de4cf9 100644
--- a/src/Libraries/SmartStore.Services/Security/PermissionService.cs
+++ b/src/Libraries/SmartStore.Services/Security/PermissionService.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using SmartStore.Collections;
diff --git a/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs b/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs
index 7e75a9f4fa..9a43d2bac6 100644
--- a/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs
+++ b/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Core.Domain.Seo;
 
diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs
index 82f7514c67..dc8689ee4d 100644
--- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs
+++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapBuildContext.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs
index 088ed43b75..528815157b 100644
--- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs
+++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs
@@ -3,8 +3,8 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading;
-using System.Data.Entity;
-using System.Web.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml.Linq;
 using System.IO;
 using System.Threading.Tasks;
diff --git a/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs b/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs
index 52f1a590fb..ee34d108f5 100644
--- a/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs
+++ b/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs
@@ -1,4 +1,4 @@
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Shipping.Tracking;
 
diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
index 377945466a..2fceb2adfb 100644
--- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
+++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj
@@ -1,845 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{210541AD-F659-47DA-8763-16F36C5CD2F4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Services</RootNamespace>
     <AssemblyName>SmartStore.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\EFMigrations\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\PluginDev\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AngleSharp, Version=0.9.9.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="CronExpressionDescriptor, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CronExpressionDescriptor.2.15.0\lib\netstandard2.0\CronExpressionDescriptor.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EPPlus, Version=4.5.3.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPPlus.4.5.3.1\lib\net40\EPPlus.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor, Version=2.8.0.152, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ImageProcessor.2.8.0\lib\net452\ImageProcessor.dll</HintPath>
-    </Reference>
-    <Reference Include="ImageProcessor.Plugins.WebP, Version=1.3.0.152, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ImageProcessor.Plugins.WebP.1.3.0\lib\net452\ImageProcessor.Plugins.WebP.dll</HintPath>
-    </Reference>
-    <Reference Include="LumenWorks.Framework.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5ad3ea2f85776344, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll</HintPath>
-    </Reference>
-    <Reference Include="MaxMind.Db, Version=2.0.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll</HintPath>
-    </Reference>
-    <Reference Include="MaxMind.GeoIP2, Version=3.0.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.XmlTransform, Version=3.0.0.34420, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
-    </Reference>
-    <Reference Include="NCrontab, Version=3.2.20120.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NReco.PdfGenerator, Version=1.2.0.0, Culture=neutral, PublicKeyToken=231663d50a41b451, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NReco.PdfGenerator.1.2.0\lib\net45\NReco.PdfGenerator.dll</HintPath>
-    </Reference>
-    <Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="PreMailer.Net, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\PreMailer.Net.2.0.1\lib\net45\PreMailer.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UAParser, Version=3.1.44.0, Culture=neutral, PublicKeyToken=f7377bf021646069, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UAParser.3.1.44\lib\net45\UAParser.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Blogs\BlogMessageFactoryExtensions.cs" />
-    <Compile Include="Cart\Rules\Impl\CartItemQuantityRule.cs" />
-    <Compile Include="Cart\Rules\Impl\CartProductCountRule.cs" />
-    <Compile Include="Cart\Rules\Impl\WeekdayRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ProductFromCategoryInCartRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ProductFromManufacturerInCartRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ProductOnWishlistRule.cs" />
-    <Compile Include="Cart\Rules\Impl\RewardPointsBalanceRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ProductReviewCountRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ProductInCartRule.cs" />
-    <Compile Include="Cart\Rules\Impl\PaidByRule.cs" />
-    <Compile Include="Cart\Rules\Impl\PurchasedFromManufacturerRule.cs" />
-    <Compile Include="Cart\Rules\Impl\PurchasedProductRule.cs" />
-    <Compile Include="Cart\Rules\Impl\PaymentMethodRule.cs" />
-    <Compile Include="Cart\Rules\Impl\SpentAmountRule.cs" />
-    <Compile Include="Cart\Rules\Impl\OrderCountRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ShippingCountryRule.cs" />
-    <Compile Include="Cart\Rules\Impl\CartSubtotalRule.cs" />
-    <Compile Include="Cart\Rules\Impl\ShippingMethodRule.cs" />
-    <Compile Include="Cart\Rules\Impl\IPCountryRule.cs" />
-    <Compile Include="Cart\Rules\Impl\BillingCountryRule.cs" />
-    <Compile Include="Cart\Rules\Impl\UserAgent\BrowserMinorVersionRule.cs" />
-    <Compile Include="Cart\Rules\Impl\UserAgent\BrowserMajorVersionRule.cs" />
-    <Compile Include="Cart\Rules\Impl\UserAgent\BrowserRule.cs" />
-    <Compile Include="Cart\Rules\Impl\UserAgent\OSRule.cs" />
-    <Compile Include="Cart\Rules\Impl\UserAgent\DeviceRule.cs" />
-    <Compile Include="Cart\Rules\Impl\UserAgent\IsMobileRule.cs" />
-    <Compile Include="Cart\RenderingOrderTotalsEvent.cs" />
-    <Compile Include="Cart\ValidatingCartEvent.cs" />
-    <Compile Include="Catalog\CategoryTreeChangeHandler.cs" />
-    <Compile Include="Catalog\CatalogMessageFactoryExtensions.cs" />
-    <Compile Include="Catalog\Extensions\ProductUrlHelper.cs" />
-    <Compile Include="Catalog\Extensions\ProductUrlHelperExtensions.cs" />
-    <Compile Include="Catalog\Importer\CategoryImporter.cs" />
-    <Compile Include="Catalog\Importer\ProductImporter.cs" />
-    <Compile Include="Catalog\Modelling\CheckoutAttributeQueryItem.cs" />
-    <Compile Include="Catalog\Modelling\GiftCardQueryItem.cs" />
-    <Compile Include="Catalog\Modelling\IProductVariantQueryFactory.cs" />
-    <Compile Include="Catalog\Modelling\ProductVariantQuery.cs" />
-    <Compile Include="Catalog\Extensions\ProductVariantQueryExtensions.cs" />
-    <Compile Include="Catalog\Modelling\ProductVariantQueryFactory.cs" />
-    <Compile Include="Catalog\Modelling\ProductVariantQueryItem.cs" />
-    <Compile Include="Catalog\Modelling\ProductVariantQueryModelBinder.cs" />
-    <Compile Include="Catalog\PriceCalculationContext.cs" />
-    <Compile Include="Catalog\Rules\IProductRuleProvider.cs" />
-    <Compile Include="Catalog\Rules\ProductRuleEvaluatorTask.cs" />
-    <Compile Include="Catalog\Rules\SearchFilterDescriptor.cs" />
-    <Compile Include="Catalog\Rules\ProductRuleProvider.cs" />
-    <Compile Include="Catalog\Rules\SearchFilterExpressionGroup.cs" />
-    <Compile Include="Cms\Blocks\BlockHandlerBase.cs" />
-    <Compile Include="Cms\Blocks\BlockMetadata.cs" />
-    <Compile Include="Cms\Blocks\IBindableBlock.cs" />
-    <Compile Include="Cms\Blocks\IBindableBlockHandler.cs" />
-    <Compile Include="Cms\Blocks\IBlock.cs" />
-    <Compile Include="Cms\Blocks\IBlockContainer.cs" />
-    <Compile Include="Cms\Blocks\IBlockEntity.cs" />
-    <Compile Include="Cms\Blocks\IBlockHandler.cs" />
-    <Compile Include="Cms\Blocks\StoryAssetAttribute.cs" />
-    <Compile Include="Cms\ILinkResolver.cs" />
-    <Compile Include="Cms\LinkResolverInvalidator.cs" />
-    <Compile Include="Cms\Menus\IMenuStorage.cs" />
-    <Compile Include="Cms\LinkResolver.cs" />
-    <Compile Include="Cms\LinkResolverResult.cs" />
-    <Compile Include="Cms\Menus\MenuInfo.cs" />
-    <Compile Include="Cms\Menus\MenuStorage.cs" />
-    <Compile Include="Common\IUserAgent.cs" />
-    <Compile Include="Common\TempFileCleanupTask.cs" />
-    <Compile Include="Common\UAParserUserAgent.cs" />
-    <Compile Include="Customers\CustomerMessageFactoryExtensions.cs" />
-    <Compile Include="Customers\CustomerSearchQuery.cs" />
-    <Compile Include="Customers\Events\CustomerAnonymizedEvent.cs" />
-    <Compile Include="Customers\Events\CustomerExportedEvent.cs" />
-    <Compile Include="Customers\Events\CustomerLogedInEvent.cs" />
-    <Compile Include="Customers\Events\CustomerRegisteredEvent.cs" />
-    <Compile Include="Customers\CookieManager.cs" />
-    <Compile Include="Customers\GdprTool.cs" />
-    <Compile Include="Customers\ICookieManager.cs" />
-    <Compile Include="Customers\IGdprTool.cs" />
-    <Compile Include="Customers\Importer\CustomerImporter.cs" />
-    <Compile Include="Customers\Rules\ITargetGroupService.cs" />
-    <Compile Include="Customers\Rules\TargetGroupFilterDescriptor.cs" />
-    <Compile Include="Customers\Rules\TargetGroupService.cs" />
-    <Compile Include="Customers\Rules\TargetGroupEvaluatorTask.cs" />
-    <Compile Include="DataExchange\Export\Deployment\DataDeploymentResult.cs" />
-    <Compile Include="DataExchange\Export\Deployment\PublicFolderPublisher.cs" />
-    <Compile Include="DataExchange\Export\ExportFileStream.cs" />
-    <Compile Include="DataExchange\Import\ColumnMapping\ColumnMap.cs" />
-    <Compile Include="DataExchange\Import\ColumnMapping\ColumnMapConverter.cs" />
-    <Compile Include="DataExchange\Csv\CsvConfigurationConverter.cs" />
-    <Compile Include="DataExchange\Csv\CsvConfiguration.cs" />
-    <Compile Include="DataExchange\Csv\CsvDataReader.cs" />
-    <Compile Include="DataExchange\Csv\CsvWriter.cs" />
-    <Compile Include="DataExchange\Export\Deployment\EmailFilePublisher.cs" />
-    <Compile Include="DataExchange\Export\Deployment\FileSystemFilePublisher.cs" />
-    <Compile Include="DataExchange\Export\Deployment\FtpFilePublisher.cs" />
-    <Compile Include="DataExchange\Export\Deployment\HttpFilePublisher.cs" />
-    <Compile Include="DataExchange\Export\Deployment\IFilePublisher.cs" />
-    <Compile Include="DataExchange\Excel\ExcelDataReader.cs" />
-    <Compile Include="DataExchange\Export\Events\RowExportingEvent.cs" />
-    <Compile Include="DataExchange\Export\ExportConfigurationInfo.cs" />
-    <Compile Include="DataExchange\Import\DataImporter.cs" />
-    <Compile Include="DataExchange\Import\EntityImporterBase.cs" />
-    <Compile Include="DataExchange\Import\Events\ImportBatchExecutedEvent.cs" />
-    <Compile Include="DataExchange\Import\Events\ImportExecutingEvent.cs" />
-    <Compile Include="DataExchange\Import\Events\ImportExecutedEvent.cs" />
-    <Compile Include="DataExchange\Import\IEntityImporter.cs" />
-    <Compile Include="DataExchange\Import\ImportExtraData.cs" />
-    <Compile Include="DataExchange\Import\ImportExecuteContext.cs" />
-    <Compile Include="DataExchange\Import\ImportFile.cs" />
-    <Compile Include="DataExchange\Import\Internal\DataImporterContext.cs" />
-    <Compile Include="DataExchange\Import\DataImportTask.cs" />
-    <Compile Include="DataExchange\Import\DataTable\IDataTable.cs" />
-    <Compile Include="DataExchange\Import\DataTable\LightweightDataTable.cs" />
-    <Compile Include="DataExchange\Import\IDataImporter.cs" />
-    <Compile Include="DataExchange\Import\ImportExtensions.cs" />
-    <Compile Include="DataExchange\Import\ImportProfileService.cs" />
-    <Compile Include="DataExchange\Import\IImportProfileService.cs" />
-    <Compile Include="DataExchange\Import\ImportMessage.cs" />
-    <Compile Include="DataExchange\Import\ImportResult.cs" />
-    <Compile Include="DataExchange\Export\ExportProviderBase.cs" />
-    <Compile Include="DataExchange\Export\DataExporter.cs" />
-    <Compile Include="DataExchange\Export\Internal\DataExporterContext.cs" />
-    <Compile Include="DataExchange\Export\DynamicEntityHelper.cs" />
-    <Compile Include="DataExchange\Export\Internal\CategoryExportContext.cs" />
-    <Compile Include="DataExchange\Export\Internal\CustomerExportContext.cs" />
-    <Compile Include="DataExchange\Export\Internal\ManufacturerExportContext.cs" />
-    <Compile Include="DataExchange\Export\DataExportResult.cs" />
-    <Compile Include="DataExchange\Export\ExportXmlHelper.cs" />
-    <Compile Include="DataExchange\Export\IDataExporter.cs" />
-    <Compile Include="DataExchange\Export\Internal\DynamicEntity.cs" />
-    <Compile Include="DataExchange\ISyncMappingService.cs" />
-    <Compile Include="DataExchange\SyncMappingService.cs" />
-    <Compile Include="DataExchange\Export\Internal\OrderExportContext.cs" />
-    <Compile Include="DataExchange\Export\ProductExportContext.cs" />
-    <Compile Include="DataExchange\Export\ExportExecuteContext.cs" />
-    <Compile Include="DataExchange\Export\ExportExtensions.cs" />
-    <Compile Include="DataExchange\Export\ExportFeaturesAttribute.cs" />
-    <Compile Include="DataExchange\Export\ExportDataSegmenter.cs" />
-    <Compile Include="DataExchange\Export\DataExportTask.cs" />
-    <Compile Include="Directory\GeoCountryLookup.cs" />
-    <Compile Include="Directory\QuantityUnitService.cs" />
-    <Compile Include="Directory\IQuantityUnitService.cs" />
-    <Compile Include="DataExchange\Export\ExportProfileService.cs" />
-    <Compile Include="DataExchange\Export\IExportProvider.cs" />
-    <Compile Include="DataExchange\Export\IExportProfileService.cs" />
-    <Compile Include="DataExchange\Import\ImportDataSegmenter.cs" />
-    <Compile Include="DataExchange\Import\ImportRow.cs" />
-    <Compile Include="Events\DefaultMessageBus.cs" />
-    <Compile Include="Events\IMessageBroker.cs" />
-    <Compile Include="Events\IMessageBus.cs" />
-    <Compile Include="Events\ConsumerRegistry.cs" />
-    <Compile Include="Events\ConsumerResolver.cs" />
-    <Compile Include="Events\EventPublisher.cs" />
-    <Compile Include="Forums\ForumMessageFactoryExtensions.cs" />
-    <Compile Include="Hooks\LocalizedEntityRelationHook.cs" />
-    <Compile Include="Hooks\SearchQueryAliasHook.cs" />
-    <Compile Include="Hooks\SlugSupportedHook.cs" />
-    <Compile Include="Hooks\AuditableHook.cs" />
-    <Compile Include="Hooks\FixProductMainPictureHook.cs" />
-    <Compile Include="Hooks\SettingSaveHook.cs" />
-    <Compile Include="Hooks\UpdateCustomerFullNameHook.cs" />
-    <Compile Include="Hooks\StoreSaveHook.cs" />
-    <Compile Include="Hooks\StoreMappingEntityHook.cs" />
-    <Compile Include="IScopedService.cs" />
-    <Compile Include="Localization\LocalizedEntityHelper.cs" />
-    <Compile Include="Localization\LocalizedValue.cs" />
-    <Compile Include="Localization\LocalizedUrlHelper.cs" />
-    <Compile Include="Logging\DbLogService.cs" />
-    <Compile Include="Logging\ILogService.cs" />
-    <Compile Include="Media\Events.cs" />
-    <Compile Include="Media\Imaging\BitDepth.cs" />
-    <Compile Include="Media\Imaging\IImage.cs" />
-    <Compile Include="Media\Imaging\IImageFactory.cs" />
-    <Compile Include="Media\Imaging\IImageFormat.cs" />
-    <Compile Include="Media\Imaging\IImageInfo.cs" />
-    <Compile Include="Media\Imaging\IImageTransformer.cs" />
-    <Compile Include="Media\Imaging\DefaultImageProcessor.cs" />
-    <Compile Include="Media\Imaging\ImageWrapper.cs" />
-    <Compile Include="Media\Imaging\Impl\IPImage.cs" />
-    <Compile Include="Media\Imaging\Impl\IPImageFactory.cs" />
-    <Compile Include="Media\Imaging\Impl\IPImageFormat.cs" />
-    <Compile Include="Media\Imaging\Impl\IPImageTransformer.cs" />
-    <Compile Include="Media\Imaging\ResizeOptions.cs" />
-    <Compile Include="Media\Imaging\UnsupportedImageFormat.cs" />
-    <Compile Include="Media\MediaExceptionFactory.cs" />
-    <Compile Include="Media\MediaFileSystem.cs" />
-    <Compile Include="Media\MediaPathData.cs" />
-    <Compile Include="Media\Imaging\ProcessImageException.cs" />
-    <Compile Include="Media\Imaging\ProcessImageQuery.cs" />
-    <Compile Include="Media\Imaging\ProcessImageResult.cs" />
-    <Compile Include="Media\Migration\MediaMigrator3.cs" />
-    <Compile Include="Media\Storage\DatabaseMediaStorageProvider.cs" />
-    <Compile Include="Media\Storage\FileSystemMediaStorageProvider.cs" />
-    <Compile Include="Media\Storage\IMediaStorageProvider.cs" />
-    <Compile Include="Media\MediaHelper.cs" />
-    <Compile Include="Media\Storage\IMediaMover.cs" />
-    <Compile Include="Media\Storage\ISupportsMediaMoving.cs" />
-    <Compile Include="Media\Storage\MediaMoverContext.cs" />
-    <Compile Include="Media\Extensions\IMediaServiceExtensions.cs" />
-    <Compile Include="Media\Extensions\IMediaTrackerExtensions.cs" />
-    <Compile Include="Media\Extensions\MediaFileExtensions.cs" />
-    <Compile Include="Media\Storage\MediaMover.cs" />
-    <Compile Include="Media\Storage\MediaStorageItem.cs" />
-    <Compile Include="Media\TransientMediaClearTask.cs" />
-    <Compile Include="Media\MediaService.Folder.cs" />
-    <Compile Include="Media\MediaServiceFileSystemAdapter.cs" />
-    <Compile Include="Media\Album\AlbumRegistry.cs" />
-    <Compile Include="Media\Album\IAlbumProvider.cs" />
-    <Compile Include="Media\Album\IAlbumRegistry.cs" />
-    <Compile Include="Media\Album\IFolderService.cs" />
-    <Compile Include="Media\Extensions\IFolderServiceExtensions.cs" />
-    <Compile Include="Media\Album\AlbumInfo.cs" />
-    <Compile Include="Media\Album\MediaFolderInfo.cs" />
-    <Compile Include="Media\Album\MediaFolderNode.cs" />
-    <Compile Include="Media\Album\FolderService.cs" />
-    <Compile Include="Media\Album\SystemAlbumProvider.cs" />
-    <Compile Include="Media\Handlers\ImageHandler.cs" />
-    <Compile Include="Media\Handlers\ImageHandlerBase.cs" />
-    <Compile Include="Media\Handlers\IMediaHandler.cs" />
-    <Compile Include="Media\Handlers\MediaHandlerContext.cs" />
-    <Compile Include="Media\IMediaService.cs" />
-    <Compile Include="Media\IMediaUrlGenerator.cs" />
-    <Compile Include="Media\MediaFileInfo.cs" />
-    <Compile Include="Media\MediaModule.cs" />
-    <Compile Include="Media\MediaUrlGenerator.cs" />
-    <Compile Include="Media\Search\FileCountResult.cs" />
-    <Compile Include="Media\Search\IMediaSearcher.cs" />
-    <Compile Include="Media\Search\MediaSearcher.cs" />
-    <Compile Include="Media\Search\MediaSearchQuery.cs" />
-    <Compile Include="Media\MediaService.cs" />
-    <Compile Include="Media\MediaTypes\MediaType.cs" />
-    <Compile Include="Media\MediaTypes\IMediaTypeResolver.cs" />
-    <Compile Include="Media\MediaTypes\MediaTypeResolver.cs" />
-    <Compile Include="Media\Migration\MediaMigrator.cs" />
-    <Compile Include="Media\Migration\SeedingDbMigrationConsumer.cs" />
-    <Compile Include="Media\Search\MediaSearchResult.cs" />
-    <Compile Include="Media\Tracking\IMediaTrackDetector.cs" />
-    <Compile Include="Media\Tracking\IMediaTracker.cs" />
-    <Compile Include="Media\Tracking\MediaTracker.cs" />
-    <Compile Include="Media\Tracking\MediaTrackerHook.cs" />
-    <Compile Include="Media\Tracking\TrackedMediaPropertyTable.cs" />
-    <Compile Include="Messages\Importer\NewsLetterSubscriptionImporter.cs" />
-    <Compile Include="Messages\Events.cs" />
-    <Compile Include="Messages\IMessageFactory.cs" />
-    <Compile Include="Messages\IMessageModelProvider.cs" />
-    <Compile Include="Messages\IModelPart.cs" />
-    <Compile Include="Messages\MessageFactory.cs" />
-    <Compile Include="Messages\MessageContext.cs" />
-    <Compile Include="Messages\MessageModelProvider.OrderParts.cs" />
-    <Compile Include="Messages\MessageModelProvider.Utils.cs" />
-    <Compile Include="Messages\MessageModelProvider.cs" />
-    <Compile Include="Messages\NewsletterSubscriber.cs" />
-    <Compile Include="Messages\TemplateModel.cs" />
-    <Compile Include="Messages\QueuedMessagesClearTask.cs" />
-    <Compile Include="Messages\CreateAttachmentsConsumer.cs" />
-    <Compile Include="News\NewsMessageFactoryExtensions.cs" />
-    <Compile Include="Orders\AddToCartContext.cs" />
-    <Compile Include="Orders\OrderMessageFactoryExtensions.cs" />
-    <Compile Include="Cart\Rules\CartRuleContext.cs" />
-    <Compile Include="Cart\Rules\CartRuleDescriptor.cs" />
-    <Compile Include="Cart\Rules\CartRuleProvider.cs" />
-    <Compile Include="Cart\Rules\IRule.cs" />
-    <Compile Include="Cart\Rules\ListRuleBase.cs" />
-    <Compile Include="Cart\Rules\Impl\CartTotalRule.cs" />
-    <Compile Include="Cart\Rules\CompositeRule.cs" />
-    <Compile Include="Cart\Rules\Impl\CurrencyRule.cs" />
-    <Compile Include="Cart\Rules\Impl\CustomerRoleRule.cs" />
-    <Compile Include="Cart\Rules\Impl\LanguageRule.cs" />
-    <Compile Include="Cart\Rules\Impl\RuleSetRule.cs" />
-    <Compile Include="Cart\Rules\Impl\StoreRule.cs" />
-    <Compile Include="Orders\ShoppingCartTotal.cs" />
-    <Compile Include="Orders\ValidatingCartEventConsumer.cs" />
-    <Compile Include="Payments\CapturePaymentHook.cs" />
-    <Compile Include="Payments\IPaymentMethodFilter.cs" />
-    <Compile Include="Pdf\Content\PdfHtmlContent.cs" />
-    <Compile Include="Pdf\Content\IPdfContent.cs" />
-    <Compile Include="Pdf\Content\PdfUrlContent.cs" />
-    <Compile Include="Pdf\IPdfConverter.cs" />
-    <Compile Include="Directory\EcbExchangeRateProvider.cs" />
-    <Compile Include="Catalog\AdjustInventoryResult.cs" />
-    <Compile Include="Hooks\SoftDeletableHook.cs" />
-    <Compile Include="Affiliates\AffiliateService.cs" />
-    <Compile Include="Affiliates\IAffiliateService.cs" />
-    <Compile Include="Authentication\External\AuthorizeState.cs" />
-    <Compile Include="Authentication\External\AuthorizationResult.cs" />
-    <Compile Include="Authentication\External\ExternalAuthorizerHelper.cs" />
-    <Compile Include="Authentication\External\IOpenAuthenticationService.cs" />
-    <Compile Include="Authentication\External\IExternalAuthenticationMethod.cs" />
-    <Compile Include="Authentication\External\OpenAuthenticationService.cs" />
-    <Compile Include="Authentication\External\IExternalAuthorizer.cs" />
-    <Compile Include="Authentication\External\ExternalAuthorizer.cs" />
-    <Compile Include="Authentication\External\IExternalProviderAuthorizer.cs" />
-    <Compile Include="Authentication\External\OpenAuthentificationExtentions.cs" />
-    <Compile Include="Authentication\External\RegistrationDetails.cs" />
-    <Compile Include="Authentication\External\OpenAuthenticationStatus.cs" />
-    <Compile Include="Authentication\External\UserClaims.cs" />
-    <Compile Include="Authentication\External\IClaimsTranslator.cs" />
-    <Compile Include="Authentication\External\OpenAuthenticationParameters.cs" />
-    <Compile Include="Blogs\BlogService.cs" />
-    <Compile Include="Blogs\BlogExtensions.cs" />
-    <Compile Include="Blogs\IBlogService.cs" />
-    <Compile Include="Caching\ClearCacheTask.cs" />
-    <Compile Include="Catalog\BackInStockSubscriptionService.cs" />
-    <Compile Include="Catalog\CategoryService.cs" />
-    <Compile Include="Catalog\CategoryExtensions.cs" />
-    <Compile Include="Catalog\CompareProductsService.cs" />
-    <Compile Include="Catalog\CategoryTemplateService.cs" />
-    <Compile Include="Catalog\IBackInStockSubscriptionService.cs" />
-    <Compile Include="Catalog\IManufacturerTemplateService.cs" />
-    <Compile Include="Catalog\ManufacturerTemplateService.cs" />
-    <Compile Include="Catalog\ICategoryTemplateService.cs" />
-    <Compile Include="Catalog\IProductTemplateService.cs" />
-    <Compile Include="Catalog\ProductTemplateService.cs" />
-    <Compile Include="Catalog\ICopyProductService.cs" />
-    <Compile Include="Catalog\CopyProductService.cs" />
-    <Compile Include="Catalog\IProductTagService.cs" />
-    <Compile Include="Catalog\ProductTagService.cs" />
-    <Compile Include="Catalog\IRecentlyViewedProductsService.cs" />
-    <Compile Include="Hooks\ProductVariantAttributeHook.cs" />
-    <Compile Include="Hooks\ProductVariantAttributeValueHook.cs" />
-    <Compile Include="Catalog\RecentlyViewedProductsService.cs" />
-    <Compile Include="Catalog\TierPriceExtensions.cs" />
-    <Compile Include="Catalog\ProductExtensions.cs" />
-    <Compile Include="Catalog\PriceFormatter.cs" />
-    <Compile Include="Catalog\IPriceCalculationService.cs" />
-    <Compile Include="Catalog\IProductAttributeFormatter.cs" />
-    <Compile Include="Catalog\IProductAttributeParser.cs" />
-    <Compile Include="Catalog\PriceCalculationService.cs" />
-    <Compile Include="Catalog\IPriceFormatter.cs" />
-    <Compile Include="Catalog\ProductAttributeFormatter.cs" />
-    <Compile Include="Catalog\ProductAttributeParser.cs" />
-    <Compile Include="Cms\IWidget.cs" />
-    <Compile Include="Cms\IWidgetService.cs" />
-    <Compile Include="Cms\WidgetExtensions.cs" />
-    <Compile Include="Cms\WidgetService.cs" />
-    <Compile Include="CommonServices.cs" />
-    <Compile Include="Common\AddressService.cs" />
-    <Compile Include="Common\AddressExtensions.cs" />
-    <Compile Include="Common\IGenericAttributeService.cs" />
-    <Compile Include="Common\GenericAttributeService.cs" />
-    <Compile Include="Common\IMaintenanceService.cs" />
-    <Compile Include="Common\IMobileDeviceHelper.cs" />
-    <Compile Include="Common\GenericAttributeExtensions.cs" />
-    <Compile Include="Common\MaintenanceService.cs" />
-    <Compile Include="Common\MobileDeviceHelper.cs" />
-    <Compile Include="Common\IAddressService.cs" />
-    <Compile Include="Customers\ICustomerRegistrationService.cs" />
-    <Compile Include="Customers\CustomerRegistrationService.cs" />
-    <Compile Include="Customers\ICustomerReportService.cs" />
-    <Compile Include="Customers\CustomerReportService.cs" />
-    <Compile Include="Customers\Tasks\DeleteGuestsTask.cs" />
-    <Compile Include="Directory\CurrencyExtensions.cs" />
-    <Compile Include="Directory\IGeoCountryLookup.cs" />
-    <Compile Include="Directory\IDeliveryTimeService.cs" />
-    <Compile Include="Directory\DeliveryTimeService.cs" />
-    <Compile Include="Forums\ForumExtensions.cs" />
-    <Compile Include="ICommonServices.cs" />
-    <Compile Include="Hooks\LocalizedEntityHook.cs" />
-    <Compile Include="Logging\DeleteLogsTask.cs" />
-    <Compile Include="Media\Imaging\CachedImage.cs" />
-    <Compile Include="Media\Imaging\IImageCache.cs" />
-    <Compile Include="Media\Imaging\IImageProcessor.cs" />
-    <Compile Include="Media\Imaging\ImageCache.cs" />
-    <Compile Include="Messages\NewsLetterSubscriptionService.cs" />
-    <Compile Include="News\NewsService.cs" />
-    <Compile Include="News\INewsService.cs" />
-    <Compile Include="Customers\CustomerExtensions.cs" />
-    <Compile Include="Directory\UpdateExchangeRateTask.cs" />
-    <Compile Include="Directory\IExchangeRateProvider.cs" />
-    <Compile Include="Discounts\DiscountExtentions.cs" />
-    <Compile Include="Discounts\DiscountService.cs" />
-    <Compile Include="Discounts\IDiscountService.cs" />
-    <Compile Include="Authentication\FormsAuthenticationService.cs" />
-    <Compile Include="Forums\ForumService.cs" />
-    <Compile Include="Forums\IForumService.cs" />
-    <Compile Include="Helpers\IDateTimeHelper.cs" />
-    <Compile Include="Helpers\DateTimeSettings.cs" />
-    <Compile Include="Helpers\DateTimeHelper.cs" />
-    <Compile Include="Authentication\IAuthenticationService.cs" />
-    <Compile Include="Directory\CountryService.cs" />
-    <Compile Include="Directory\CurrencyService.cs" />
-    <Compile Include="Customers\CustomerContentService.cs" />
-    <Compile Include="Customers\CustomerService.cs" />
-    <Compile Include="Catalog\ICompareProductsService.cs" />
-    <Compile Include="Directory\ICountryService.cs" />
-    <Compile Include="Directory\ICurrencyService.cs" />
-    <Compile Include="Customers\ICustomerContentService.cs" />
-    <Compile Include="Customers\ICustomerService.cs" />
-    <Compile Include="Directory\IMeasureService.cs" />
-    <Compile Include="Directory\IStateProvinceService.cs" />
-    <Compile Include="Localization\LocalizationExtensions.cs" />
-    <Compile Include="Directory\MeasureService.cs" />
-    <Compile Include="Logging\CustomerActivityService.cs" />
-    <Compile Include="Media\IDownloadService.cs" />
-    <Compile Include="Media\DownloadService.cs" />
-    <Compile Include="Messages\CampaignService.cs" />
-    <Compile Include="Messages\ICampaignService.cs" />
-    <Compile Include="Messages\EmailAccountService.cs" />
-    <Compile Include="Messages\IEmailAccountService.cs" />
-    <Compile Include="Messages\IMessageTemplateService.cs" />
-    <Compile Include="Messages\INewsLetterSubscriptionService.cs" />
-    <Compile Include="Messages\IQueuedEmailService.cs" />
-    <Compile Include="Messages\MessageTemplateService.cs" />
-    <Compile Include="Messages\QueuedEmailService.cs" />
-    <Compile Include="Messages\QueuedMessagesSendTask.cs" />
-    <Compile Include="Orders\AutoUpdateOrderItemContext.cs" />
-    <Compile Include="Orders\AppliedGiftCard.cs" />
-    <Compile Include="Orders\CheckoutAttributeFormatter.cs" />
-    <Compile Include="Orders\CheckoutAttributeParser.cs" />
-    <Compile Include="Orders\CheckoutAttributeService.cs" />
-    <Compile Include="Orders\CheckoutState.cs" />
-    <Compile Include="Orders\EventPublisherExtensions.cs" />
-    <Compile Include="Orders\OrderExtensions.cs" />
-    <Compile Include="Orders\IOrderReportService.cs" />
-    <Compile Include="Orders\OrderReportService.cs" />
-    <Compile Include="Orders\IOrderProcessingService.cs" />
-    <Compile Include="Orders\OrderProcessingService.cs" />
-    <Compile Include="Orders\IOrderService.cs" />
-    <Compile Include="Orders\IOrderTotalCalculationService.cs" />
-    <Compile Include="Orders\IGiftCardService.cs" />
-    <Compile Include="Orders\IShoppingCartService.cs" />
-    <Compile Include="Orders\ICheckoutAttributeFormatter.cs" />
-    <Compile Include="Orders\ICheckoutAttributeParser.cs" />
-    <Compile Include="Orders\ICheckoutAttributeService.cs" />
-    <Compile Include="Orders\CheckoutAttributeExtensions.cs" />
-    <Compile Include="Orders\GiftCardService.cs" />
-    <Compile Include="Orders\OrderService.cs" />
-    <Compile Include="Orders\OrderTotalCalculationService.cs" />
-    <Compile Include="Orders\PlaceOrderResult.cs" />
-    <Compile Include="Orders\ShoppingCartExtensions.cs" />
-    <Compile Include="Orders\ShoppingCartService.cs" />
-    <Compile Include="Payments\PaymentMethodBase.cs" />
-    <Compile Include="Payments\PaymentPluginBase.cs" />
-    <Compile Include="Payments\PreProcessPaymentResult.cs" />
-    <Compile Include="Payments\ProcessPaymentResultBase.cs" />
-    <Compile Include="Payments\RefundPaymentResult.cs" />
-    <Compile Include="Payments\RefundPaymentRequest.cs" />
-    <Compile Include="Payments\CapturePaymentRequest.cs" />
-    <Compile Include="Payments\CapturePaymentResult.cs" />
-    <Compile Include="Payments\CancelRecurringPaymentRequest.cs" />
-    <Compile Include="Payments\CancelRecurringPaymentResult.cs" />
-    <Compile Include="Payments\PaymentExtentions.cs" />
-    <Compile Include="Payments\VoidPaymentRequest.cs" />
-    <Compile Include="Payments\VoidPaymentResult.cs" />
-    <Compile Include="Payments\PostProcessPaymentRequest.cs" />
-    <Compile Include="Payments\IPaymentMethod.cs" />
-    <Compile Include="Payments\IPaymentService.cs" />
-    <Compile Include="Payments\ProcessPaymentRequest.cs" />
-    <Compile Include="Payments\PaymentMethodType.cs" />
-    <Compile Include="Payments\PaymentService.cs" />
-    <Compile Include="Payments\ProcessPaymentResult.cs" />
-    <Compile Include="Payments\RecurringPaymentType.cs" />
-    <Compile Include="Pdf\Options\IPdfOptions.cs" />
-    <Compile Include="Pdf\Options\PdfHeaderFooterOptions.cs" />
-    <Compile Include="Pdf\PdfConvertSettings.cs" />
-    <Compile Include="Pdf\PdfPageMargins.cs" />
-    <Compile Include="Pdf\Options\PdfTocOptions.cs" />
-    <Compile Include="Pdf\Options\PdfPageOptions.cs" />
-    <Compile Include="Pdf\PdfPageSize.cs" />
-    <Compile Include="Pdf\PdfPagePrientation.cs" />
-    <Compile Include="Pdf\WkHtmlToPdfConverter.cs" />
-    <Compile Include="Polls\IPollService.cs" />
-    <Compile Include="Polls\PollService.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Customers\ChangePasswordRequest.cs" />
-    <Compile Include="Customers\PasswordChangeResult.cs" />
-    <Compile Include="Hooks\AclEntityHook.cs" />
-    <Compile Include="Rules\DefaultRuleOptionsProvider.cs" />
-    <Compile Include="ScopedServiceBase.cs" />
-    <Compile Include="Search\Catalog\CatalogSearchQuery.cs" />
-    <Compile Include="Search\Extensions\FacetUtility.cs" />
-    <Compile Include="Search\Extensions\UrlHelperExtensions.cs" />
-    <Compile Include="Search\Catalog\Modelling\CatalogSearchQueryAliasMapper.cs" />
-    <Compile Include="Search\Catalog\Modelling\CatalogSearchQueryFactory.cs" />
-    <Compile Include="Search\Catalog\CatalogSearchResult.cs" />
-    <Compile Include="Search\Catalog\CatalogSearchService.cs" />
-    <Compile Include="Search\Catalog\Modelling\CatalogSearchQueryModelBinder.cs" />
-    <Compile Include="Search\Extensions\FacetUrlHelper.cs" />
-    <Compile Include="Search\Catalog\Modelling\ICatalogSearchQueryAliasMapper.cs" />
-    <Compile Include="Search\Catalog\Modelling\ICatalogSearchQueryFactory.cs" />
-    <Compile Include="Search\Catalog\ICatalogSearchService.cs" />
-    <Compile Include="Search\Catalog\LinqCatalogSearchService.cs" />
-    <Compile Include="Search\Catalog\CatalogSearchEvents.cs" />
-    <Compile Include="Search\Forum\ForumSearchService.cs" />
-    <Compile Include="Search\Forum\ForumSearchResult.cs" />
-    <Compile Include="Search\Forum\ForumSearchQuery.cs" />
-    <Compile Include="Search\Forum\ForumSearchEvents.cs" />
-    <Compile Include="Search\Forum\IForumSearchService.cs" />
-    <Compile Include="Search\Forum\LinqForumSearchService.cs" />
-    <Compile Include="Search\Forum\Modelling\ForumSearchQueryModelBinder.cs" />
-    <Compile Include="Search\Forum\Modelling\ForumSearchQueryAliasMapper.cs" />
-    <Compile Include="Search\Forum\Modelling\ForumSearchQueryFactory.cs" />
-    <Compile Include="Search\Forum\Modelling\IForumSearchQueryAliasMapper.cs" />
-    <Compile Include="Search\Forum\Modelling\IForumSearchQueryFactory.cs" />
-    <Compile Include="Search\SearchQueryFactoryBase.cs" />
-    <Compile Include="Search\SearchServiceBase.cs" />
-    <Compile Include="Search\Rendering\FacetTemplateProvider.cs" />
-    <Compile Include="Search\Rendering\IFacetTemplateProvider.cs" />
-    <Compile Include="Search\Rendering\IFacetTemplateSelector.cs" />
-    <Compile Include="Security\AclService.cs" />
-    <Compile Include="Security\EncryptionService.cs" />
-    <Compile Include="Security\IAclService.cs" />
-    <Compile Include="Security\IEncryptionService.cs" />
-    <Compile Include="Customers\CustomerRegistrationRequest.cs" />
-    <Compile Include="Customers\CustomerRegistrationResult.cs" />
-    <Compile Include="Directory\StateProvinceService.cs" />
-    <Compile Include="Security\PermissionService.cs" />
-    <Compile Include="Security\InstallPermissionsStarter.cs" />
-    <Compile Include="Security\StandardPermissionProvider.cs" />
-    <Compile Include="Seo\IUrlRecordService.cs" />
-    <Compile Include="Seo\IXmlSitemapPublisher.cs" />
-    <Compile Include="Seo\NamedEntity.cs" />
-    <Compile Include="Seo\SeoExtensions.cs" />
-    <Compile Include="Seo\IXmlSitemapGenerator.cs" />
-    <Compile Include="Seo\XmlSitemapBuildContext.cs" />
-    <Compile Include="Seo\XmlSitemapPartition.cs" />
-    <Compile Include="Seo\Tasks\RebuildXmlSitemapTask.cs" />
-    <Compile Include="Seo\XmlSitemapGenerator.cs" />
-    <Compile Include="Seo\XmlSitemapNode.cs" />
-    <Compile Include="Seo\UrlRecordService.cs" />
-    <Compile Include="ServiceCacheBuster.cs" />
-    <Compile Include="Shipping\IShipmentService.cs" />
-    <Compile Include="Shipping\ShipmentService.cs" />
-    <Compile Include="Shipping\ShippingExtentions.cs" />
-    <Compile Include="Shipping\IShippingService.cs" />
-    <Compile Include="Shipping\GetShippingOptionRequest.cs" />
-    <Compile Include="Shipping\GetShippingOptionResponse.cs" />
-    <Compile Include="Shipping\IShippingRateComputationMethod.cs" />
-    <Compile Include="Shipping\ShippingRateComputationMethodType.cs" />
-    <Compile Include="Shipping\ShippingService.cs" />
-    <Compile Include="Shipping\Tracking\ShipmentStatusEvent.cs" />
-    <Compile Include="Shipping\Tracking\GeneralShipmentTracker.cs" />
-    <Compile Include="Shipping\Tracking\IShipmentTracker.cs" />
-    <Compile Include="Stores\IStoreMappingService.cs" />
-    <Compile Include="Stores\IStoreService.cs" />
-    <Compile Include="Stores\StoreMappingService.cs" />
-    <Compile Include="Stores\StoreService.cs" />
-    <Compile Include="Tasks\CronExpression.cs" />
-    <Compile Include="Tasks\ITaskExecutor.cs" />
-    <Compile Include="Tasks\ITaskScheduler.cs" />
-    <Compile Include="Tasks\ScheduleTaskService.cs" />
-    <Compile Include="Tasks\IScheduleTaskService.cs" />
-    <Compile Include="Tasks\ITask.cs" />
-    <Compile Include="Tasks\TaskExecutionContext.cs" />
-    <Compile Include="Tasks\TaskExecutor.cs" />
-    <Compile Include="Tasks\TaskExtensions.cs" />
-    <Compile Include="Tasks\TaskScheduler.cs" />
-    <Compile Include="Tasks\TaskSchedulerStarter.cs" />
-    <Compile Include="Tax\CalculateTaxRequest.cs" />
-    <Compile Include="Tax\CalculateTaxResult.cs" />
-    <Compile Include="Tax\FreeTaxProvider.cs" />
-    <Compile Include="Tax\ITaxCategoryService.cs" />
-    <Compile Include="Tax\ITaxProvider.cs" />
-    <Compile Include="Tax\ITaxService.cs" />
-    <Compile Include="Tax\TaxCategoryService.cs" />
-    <Compile Include="Tax\TaxService.cs" />
-    <Compile Include="Themes\IThemeVariablesService.cs" />
-    <Compile Include="Themes\ThemeValidationException.cs" />
-    <Compile Include="Themes\ThemeVariablesService.cs" />
-    <Compile Include="Topics\ITopicService.cs" />
-    <Compile Include="Topics\TopicService.cs" />
-    <Compile Include="Localization\LocalizedEntityService.cs" />
-    <Compile Include="Localization\ILocalizedEntityService.cs" />
-    <Compile Include="Catalog\IProductAttributeService.cs" />
-    <Compile Include="Catalog\ISpecificationAttributeService.cs" />
-    <Compile Include="Catalog\ProductAttributeExtensions.cs" />
-    <Compile Include="Catalog\ICategoryService.cs" />
-    <Compile Include="Localization\ILanguageService.cs" />
-    <Compile Include="Localization\ILocalizationService.cs" />
-    <Compile Include="Catalog\IManufacturerService.cs" />
-    <Compile Include="Catalog\IProductService.cs" />
-    <Compile Include="Localization\LanguageService.cs" />
-    <Compile Include="Localization\LocalizationService.cs" />
-    <Compile Include="Catalog\ManufacturerService.cs" />
-    <Compile Include="Catalog\ProductAttributeService.cs" />
-    <Compile Include="Catalog\ProductService.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Configuration\SettingService.cs" />
-    <Compile Include="Catalog\SpecificationAttributeService.cs" />
-    <Compile Include="Web References\EuropeCheckVatService\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144}</Project>
-      <Name>SmartStore.Data</Name>
-    </ProjectReference>
+    <Compile Include="..\..\AssemblySharedInfo.cs" Link="Properties\AssemblySharedInfo.cs" />
+    <Compile Include="..\..\AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <WebReferences Include="Web References\" />
+    <ProjectReference Include="..\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\SmartStore.Data\SmartStore.Data.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <None Include="Web References\EuropeCheckVatService\checkVatService.wsdl" />
-    <None Include="Web References\EuropeCheckVatService\matchCode.datasource">
-      <DependentUpon>Reference.map</DependentUpon>
-    </None>
-    <None Include="Web References\EuropeCheckVatService\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\EuropeCheckVatService\</RelPath>
-      <UpdateFromURL>https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>SmartStore_Services_EuropeCheckVatService_checkVatService</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Cart\Readme.txt">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs
index af80694d8c..b26b37da3b 100644
--- a/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Services.Stores;
 
diff --git a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs
index c9990757c2..415915ff71 100644
--- a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs
@@ -4,7 +4,7 @@
 using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs
index f286db5350..e5a647baca 100644
--- a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Logging;
 using SmartStore.Collections;
 using SmartStore.Core.Caching;
diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs b/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs
index c2de669aea..da70933653 100644
--- a/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs
+++ b/src/Libraries/SmartStore.Services/Tasks/TaskSchedulerStarter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Events;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Logging;
diff --git a/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs b/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs
index 22737cf44d..8fa884da06 100644
--- a/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs
+++ b/src/Libraries/SmartStore.Services/Tax/FreeTaxProvider.cs
@@ -1,5 +1,5 @@
 using SmartStore;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 
 namespace SmartStore.Services.Tax
diff --git a/src/Libraries/SmartStore.Services/Tax/ITaxProvider.cs b/src/Libraries/SmartStore.Services/Tax/ITaxProvider.cs
index 30bc53bd26..418d37296a 100644
--- a/src/Libraries/SmartStore.Services/Tax/ITaxProvider.cs
+++ b/src/Libraries/SmartStore.Services/Tax/ITaxProvider.cs
@@ -1,4 +1,4 @@
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 
 namespace SmartStore.Services.Tax
diff --git a/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs b/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs
index 5f9b98f6a3..11cd3fe72b 100644
--- a/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs
+++ b/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs
@@ -11,7 +11,7 @@
 using System.Xml;
 using SmartStore.Core;
 using System.Net;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using System.IO;
 
 namespace SmartStore.Services.Themes
diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs
index f3f9e19667..3de60ef6d1 100644
--- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.AmazonPay.Services;
 using SmartStore.Core.Html;
 using SmartStore.Core.Logging;
diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs
index 014492316e..87e07595d2 100644
--- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Text;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.AmazonPay.Models;
 using SmartStore.AmazonPay.Services;
 using SmartStore.ComponentModel;
diff --git a/src/Plugins/SmartStore.AmazonPay/DependencyRegistrar.cs b/src/Plugins/SmartStore.AmazonPay/DependencyRegistrar.cs
index 080b9f19eb..0d752888fb 100644
--- a/src/Plugins/SmartStore.AmazonPay/DependencyRegistrar.cs
+++ b/src/Plugins/SmartStore.AmazonPay/DependencyRegistrar.cs
@@ -1,5 +1,4 @@
 using Autofac;
-using Autofac.Integration.Mvc;
 using SmartStore.AmazonPay.Filters;
 using SmartStore.AmazonPay.Services;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Plugins/SmartStore.AmazonPay/Filters/AmazonPayCheckoutFilter.cs b/src/Plugins/SmartStore.AmazonPay/Filters/AmazonPayCheckoutFilter.cs
index eb5dd84142..82ab7b3a32 100644
--- a/src/Plugins/SmartStore.AmazonPay/Filters/AmazonPayCheckoutFilter.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Filters/AmazonPayCheckoutFilter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.AmazonPay.Services;
 
 namespace SmartStore.AmazonPay.Filters
diff --git a/src/Plugins/SmartStore.AmazonPay/Models/ConfigurationModel.cs b/src/Plugins/SmartStore.AmazonPay/Models/ConfigurationModel.cs
index 45a1c1cd25..4b3c52a4e4 100644
--- a/src/Plugins/SmartStore.AmazonPay/Models/ConfigurationModel.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Models/ConfigurationModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.AmazonPay.Services;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Plugins/SmartStore.AmazonPay/Plugin.cs b/src/Plugins/SmartStore.AmazonPay/Plugin.cs
index 8b6904f964..16800a30b7 100644
--- a/src/Plugins/SmartStore.AmazonPay/Plugin.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Plugin.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.AmazonPay.Controllers;
 using SmartStore.AmazonPay.Services;
 using SmartStore.Core.Domain.Cms;
diff --git a/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs b/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs
index 3cfe49b1b8..e8f72d824b 100644
--- a/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs
+++ b/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.AmazonPay
diff --git a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs
index 88d41c6aad..4a9561c74a 100644
--- a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using AmazonPay;
 using AmazonPay.Responses;
 using AmazonPay.StandardPaymentRequests;
diff --git a/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs b/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs
index 05e0589571..c3f71ac030 100644
--- a/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs
@@ -1,5 +1,5 @@
 using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using AmazonPay;
 using SmartStore.AmazonPay.Models;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Plugins/SmartStore.AmazonPay/Services/Internal/AmazonPayExtensions.cs b/src/Plugins/SmartStore.AmazonPay/Services/Internal/AmazonPayExtensions.cs
index 0956b119b8..a11c70637c 100644
--- a/src/Plugins/SmartStore.AmazonPay/Services/Internal/AmazonPayExtensions.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Services/Internal/AmazonPayExtensions.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.AmazonPay.Services;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs b/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs
index dc02828931..936826c6a0 100644
--- a/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs
+++ b/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Cms;
 using SmartStore.Web.Models.ShoppingCart;
diff --git a/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs b/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs
index 2c6a23810d..54cb7e9b65 100644
--- a/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs
+++ b/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Net;
 using System.Text;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SmartStore.Core.Logging;
diff --git a/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs b/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs
index a79d2de550..1ceb05b84b 100644
--- a/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs
+++ b/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Clickatell.Models;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Plugins;
diff --git a/src/Plugins/SmartStore.Clickatell/RouteProvider.cs b/src/Plugins/SmartStore.Clickatell/RouteProvider.cs
index 6271b445db..fa4d3fed15 100644
--- a/src/Plugins/SmartStore.Clickatell/RouteProvider.cs
+++ b/src/Plugins/SmartStore.Clickatell/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.Clickatell
diff --git a/src/Plugins/SmartStore.DevTools/Blocks/SampleBlock.cs b/src/Plugins/SmartStore.DevTools/Blocks/SampleBlock.cs
index 1e48a0e388..c0512e2eba 100644
--- a/src/Plugins/SmartStore.DevTools/Blocks/SampleBlock.cs
+++ b/src/Plugins/SmartStore.DevTools/Blocks/SampleBlock.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using Newtonsoft.Json;
diff --git a/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs b/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
index 0f51d70cd4..d614d3cfb9 100644
--- a/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
+++ b/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs
@@ -1,6 +1,5 @@
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using Autofac;
-using Autofac.Integration.Mvc;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Infrastructure.DependencyManagement;
diff --git a/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs b/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs
index 6f7c34c4b9..4872fc6bae 100644
--- a/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs
+++ b/src/Plugins/SmartStore.DevTools/DevToolsPlugin.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Plugins;
diff --git a/src/Plugins/SmartStore.DevTools/Filters/MachineNameFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/MachineNameFilter.cs
index 6d969ed842..e9ddbc00de 100644
--- a/src/Plugins/SmartStore.DevTools/Filters/MachineNameFilter.cs
+++ b/src/Plugins/SmartStore.DevTools/Filters/MachineNameFilter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services;
 using SmartStore.Services.Customers;
 using SmartStore.Web.Framework.UI;
diff --git a/src/Plugins/SmartStore.DevTools/Filters/ProfilerFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/ProfilerFilter.cs
index 71d65d003c..dbbba0fb17 100644
--- a/src/Plugins/SmartStore.DevTools/Filters/ProfilerFilter.cs
+++ b/src/Plugins/SmartStore.DevTools/Filters/ProfilerFilter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services;
 using SmartStore.Services.Common;
 using SmartStore.Services.Customers;
diff --git a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs
index 624f28253b..7a58c5febd 100644
--- a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs
+++ b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Logging;
 
 namespace SmartStore.DevTools.Filters
diff --git a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleCheckoutFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleCheckoutFilter.cs
index b2ff97632d..1c29e50b32 100644
--- a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleCheckoutFilter.cs
+++ b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleCheckoutFilter.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Logging;
 
 namespace SmartStore.DevTools.Filters
diff --git a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleResultFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleResultFilter.cs
index d4d0c9fee8..7830ce222e 100644
--- a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleResultFilter.cs
+++ b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleResultFilter.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework.Modelling;
 
 namespace SmartStore.DevTools.Filters
diff --git a/src/Plugins/SmartStore.DevTools/Filters/WidgetZoneFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/WidgetZoneFilter.cs
index 498341f28e..fe806a9f57 100644
--- a/src/Plugins/SmartStore.DevTools/Filters/WidgetZoneFilter.cs
+++ b/src/Plugins/SmartStore.DevTools/Filters/WidgetZoneFilter.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Caching;
 using SmartStore.Services;
 using SmartStore.Services.Customers;
diff --git a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
index 9cb991484f..c5c1761895 100644
--- a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
+++ b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using StackExchange.Profiling;
diff --git a/src/Plugins/SmartStore.DevTools/RouteProvider.cs b/src/Plugins/SmartStore.DevTools/RouteProvider.cs
index 1d35543960..22dbb86ab5 100644
--- a/src/Plugins/SmartStore.DevTools/RouteProvider.cs
+++ b/src/Plugins/SmartStore.DevTools/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.DevTools
diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj
index 4a2abff1a9..0295f9860f 100644
--- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj
+++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj
@@ -1,357 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <ItemDefinitionGroup>
-    <Reference>
-      <Private>False</Private>
-    </Reference>
-    <ProjectReference>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{542B9C12-E2A1-49BB-9134-0E3484F9D669}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.DevTools</RootNamespace>
     <AssemblyName>SmartStore.DevTools</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UpgradeBackupLocation />
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.DevTools\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.DevTools\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\EFMigrations\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="FluentValidation.Mvc, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="MiniProfiler, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MiniProfiler.4.2.1\lib\net461\MiniProfiler.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MiniProfiler.EF6, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MiniProfiler.EF6.4.2.1\lib\net461\MiniProfiler.EF6.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="MiniProfiler.Shared, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MiniProfiler.Shared.4.2.1\lib\net461\MiniProfiler.Shared.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Caching" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
+    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="AdminMenu.cs" />
-    <Compile Include="Blocks\SampleBlock.cs" />
-    <Compile Include="Controllers\DevToolsController.cs" />
-    <Compile Include="Controllers\MyCheckoutController.cs" />
-    <Compile Include="DependencyRegistrar.cs" />
-    <Compile Include="Events\CustomTab.cs" />
-    <Compile Include="Examples\OutputCacheInvalidationObserver.cs" />
-    <Compile Include="Filters\MachineNameFilter.cs" />
-    <Compile Include="Filters\Samples\SampleProductDetailActionFilter.cs" />
-    <Compile Include="Filters\WidgetZoneFilter.cs" />
-    <Compile Include="Filters\Samples\SampleCheckoutFilter.cs" />
-    <Compile Include="Filters\ProfilerFilter.cs" />
-    <Compile Include="Filters\Samples\SampleResultFilter.cs" />
-    <Compile Include="Filters\Samples\SampleActionFilter.cs" />
-    <Compile Include="DevToolsPlugin.cs" />
-    <Compile Include="Models\BackendExtensionModel.cs" />
-    <Compile Include="Models\ConfigurationModel.cs" />
-    <Compile Include="ProfilerHttpModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RouteProvider.cs" />
-    <Compile Include="Security\DevToolsPermissionProvider.cs" />
-    <Compile Include="Services\CustomFacetTemplateSelector.cs" />
-    <Compile Include="Services\MiniProfilerChronometer.cs" />
-    <Compile Include="Settings\ProfilerSettings.cs" />
-    <Compile Include="Starter.cs" />
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144}</Project>
-      <Name>SmartStore.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541AD-F659-47DA-8763-16F36C5CD2F4}</Project>
-      <Name>SmartStore.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj">
-      <Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
-      <Name>SmartStore.Web.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Presentation\SmartStore.Web\SmartStore.Web.csproj">
-      <Project>{4f1f649c-1020-45be-a487-f416d9297ff3}</Project>
-      <Name>SmartStore.Web</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Description.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <Content Include="Localization\resources.de-de.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.en-us.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\MyCheckout\MyBillingAddress.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\MiniProfiler.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\Configure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\Web.config">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\WidgetZone.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\BackendExtension.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\MachineName.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\ProductEditTab.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\Story\BlockTemplates\Sample\Edit.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\Story\BlockTemplates\Sample\Public.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\DevTools\MyCustomFacetTemplate.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <OutputPath>bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="$(SolutionDir)\FixRazorIntellisense.targets" Condition="'$(Configuration)' == 'PluginDev'" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>63704</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:52742/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://www.smartstore.net</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <PropertyGroup>
-    <PostBuildEvent>del "$(TargetDir)MiniProfiler.pdb" /q /s
-del "$(TargetDir)MiniProfiler.EntityFramework6.pdb" /q /s</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Plugins/SmartStore.DevTools/Starter.cs b/src/Plugins/SmartStore.DevTools/Starter.cs
index 9a186299a8..ef2938bad2 100644
--- a/src/Plugins/SmartStore.DevTools/Starter.cs
+++ b/src/Plugins/SmartStore.DevTools/Starter.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Web.Infrastructure.DynamicModuleHelper;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Web.Framework;
 using StackExchange.Profiling;
diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs
index 398f771ff5..584a0c8dc4 100644
--- a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs
+++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using System.Web.Script.Serialization;
 using DotNetOpenAuth.AspNet;
 using DotNetOpenAuth.AspNet.Clients;
diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs
index 41594bc23e..8ad3b3ab12 100644
--- a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs
+++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs
@@ -6,8 +6,8 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using DotNetOpenAuth.AspNet;
 using Newtonsoft.Json.Linq;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs b/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs
index 0c7b986ed9..07f89bc859 100644
--- a/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs
+++ b/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs
@@ -1,4 +1,4 @@
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Authentication.External;
 using SmartStore.Services.Localization;
diff --git a/src/Plugins/SmartStore.FacebookAuth/RouteProvider.cs b/src/Plugins/SmartStore.FacebookAuth/RouteProvider.cs
index 1d9b8cf532..7579be3045 100644
--- a/src/Plugins/SmartStore.FacebookAuth/RouteProvider.cs
+++ b/src/Plugins/SmartStore.FacebookAuth/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.FacebookAuth
diff --git a/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs
index 86d04f21c1..61a96c1744 100644
--- a/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs
+++ b/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs
index 017ce39426..ef155a7c2b 100644
--- a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs
+++ b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Cms;
 using SmartStore.Core.Plugins;
 using SmartStore.GoogleAnalytics.Services;
diff --git a/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs b/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs
index 8796b44e6f..7c03a71ea4 100644
--- a/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs
+++ b/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -19,20 +19,16 @@ public ConfigurationModel()
 
 
         [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.GoogleId")]
-        [AllowHtml]
         public string GoogleId { get; set; }
 
         [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.TrackingScript")]
-        [AllowHtml]
         //tracking code
         public string TrackingScript { get; set; }
 
         [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.EcommerceScript")]
-        [AllowHtml]
         public string EcommerceScript { get; set; }
 
         [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.EcommerceDetailScript")]
-        [AllowHtml]
         public string EcommerceDetailScript { get; set; }
 
     }
diff --git a/src/Plugins/SmartStore.GoogleAnalytics/RouteProvider.cs b/src/Plugins/SmartStore.GoogleAnalytics/RouteProvider.cs
index 2c37b5fe76..f3c0a57aa6 100644
--- a/src/Plugins/SmartStore.GoogleAnalytics/RouteProvider.cs
+++ b/src/Plugins/SmartStore.GoogleAnalytics/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.GoogleAnalytics
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs
index 1b20158c12..c8653282af 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Common;
 using SmartStore.GoogleMerchantCenter.Models;
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs
index e4700a9642..3913521410 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Data;
 using SmartStore.Data.Setup;
 using SmartStore.GoogleMerchantCenter.Data.Migrations;
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs
index 81c634f39c..c2542a95ec 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.GoogleMerchantCenter.Domain;
 
 namespace SmartStore.GoogleMerchantCenter.Data
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs
index 46fdc6a4f9..7945306f45 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs
@@ -14,7 +14,6 @@ public GoogleProductRecord()
             Export = true;
         }
 
-        [Index]
         public int ProductId { get; set; }
 
         public string Taxonomy { get; set; }
@@ -26,12 +25,10 @@ public GoogleProductRecord()
         public string Pattern { get; set; }
         public string ItemGroupId { get; set; }
 
-        [Index]
         public bool IsTouched { get; set; }
         public DateTime CreatedOnUtc { get; set; }
         public DateTime UpdatedOnUtc { get; set; }
 
-        [Index]
         public bool Export { get; set; }
 
         public int Multipack { get; set; }
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs
index 19cea6a178..22cd5759f1 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs
@@ -1,5 +1,5 @@
 using System.Data.Entity.Migrations;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Plugins;
 using SmartStore.GoogleMerchantCenter.Data.Migrations;
 using SmartStore.GoogleMerchantCenter.Providers;
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs
index 3d5f89eda8..016f9ffc21 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml.Serialization;
 using FluentValidation;
 using FluentValidation.Attributes;
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs
index 6220b658da..e8caf74457 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Catalog;
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs
index 32b09e96ef..150bee8c56 100644
--- a/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs
+++ b/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.GoogleMerchantCenter
diff --git a/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs b/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs
index e7af8235c0..03b8e0fab7 100644
--- a/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs
+++ b/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Autofac;
 using FluentValidation;
 using FluentValidation.Results;
diff --git a/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs b/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs
index 9bab769070..4a0a9a506a 100644
--- a/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs
+++ b/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.OfflinePayment.Settings;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
@@ -11,7 +11,6 @@ public abstract class ConfigurationModelBase : ModelBase
     {
         public string PrimaryStoreCurrencyCode { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Plugins.SmartStore.OfflinePayment.DescriptionText")]
         public string DescriptionText { get; set; }
 
diff --git a/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs b/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs
index b32748e19d..c63c5810ed 100644
--- a/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs
+++ b/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using SmartStore.Core.Localization;
 using SmartStore.Web.Framework;
@@ -66,30 +66,24 @@ public ManualPaymentInfoModel()
         }
 
         [SmartResourceDisplayName("Payment.SelectCreditCard")]
-        [AllowHtml]
         public string CreditCardType { get; set; }
         [SmartResourceDisplayName("Payment.SelectCreditCard")]
         public IList<SelectListItem> CreditCardTypes { get; set; }
 
         [SmartResourceDisplayName("Payment.CardholderName")]
-        [AllowHtml]
         public string CardholderName { get; set; }
 
         [SmartResourceDisplayName("Payment.CardNumber")]
-        [AllowHtml]
         public string CardNumber { get; set; }
 
         [SmartResourceDisplayName("Payment.ExpirationDate")]
-        [AllowHtml]
         public string ExpireMonth { get; set; }
         [SmartResourceDisplayName("Payment.ExpirationDate")]
-        [AllowHtml]
         public string ExpireYear { get; set; }
         public IList<SelectListItem> ExpireMonths { get; set; }
         public IList<SelectListItem> ExpireYears { get; set; }
 
         [SmartResourceDisplayName("Payment.CardCode")]
-        [AllowHtml]
         public string CardCode { get; set; }
     }
 
@@ -104,7 +98,6 @@ public class PrepaymentPaymentInfoModel : PaymentInfoModelBase
     public class PurchaseOrderNumberPaymentInfoModel : PaymentInfoModelBase
     {
         [SmartResourceDisplayName("Plugins.Payments.PurchaseOrder.PurchaseOrderNumber")]
-        [AllowHtml]
         public string PurchaseOrderNumber { get; set; }
     }
 
diff --git a/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs b/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs
index bfcb3744d3..235f5b310d 100644
--- a/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs
+++ b/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Core.Plugins;
 using SmartStore.OfflinePayment.Settings;
diff --git a/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs b/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs
index d5ed1a3a59..5052573d78 100644
--- a/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs
+++ b/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
diff --git a/src/Plugins/SmartStore.OfflinePayment/RouteProvider.cs b/src/Plugins/SmartStore.OfflinePayment/RouteProvider.cs
index 2960e936a4..1eaa5a1af4 100644
--- a/src/Plugins/SmartStore.OfflinePayment/RouteProvider.cs
+++ b/src/Plugins/SmartStore.OfflinePayment/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.OfflinePayment
diff --git a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj
index b392fe891f..49cd8257a6 100644
--- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj
+++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj
@@ -1,271 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <ItemDefinitionGroup>
-    <Reference>
-      <Private>False</Private>
-    </Reference>
-    <ProjectReference>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{692E9D31-1393-47BF-B372-63F671052F89}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.OfflinePayment</RootNamespace>
     <AssemblyName>SmartStore.OfflinePayment</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UseIISExpress>true</UseIISExpress>
-    <UpgradeBackupLocation />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\EFMigrations\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Controllers\OfflinePaymentController.cs" />
-    <Compile Include="Models\ConfigurationModel.cs" />
-    <Compile Include="Models\PaymentInfoModel.cs" />
-    <Compile Include="Plugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\DirectDebitProvider.cs" />
-    <Compile Include="Providers\ManualProvider.cs" />
-    <Compile Include="Providers\PurchaseOrderNumberProvider.cs" />
-    <Compile Include="Providers\PrepaymentStoreProvider.cs" />
-    <Compile Include="Providers\PayInStoreProvider.cs" />
-    <Compile Include="Providers\InvoiceProvider.cs" />
-    <Compile Include="Providers\OfflinePaymentProviderBase.cs" />
-    <Compile Include="Providers\CashOnDeliveryProvider.cs" />
-    <Compile Include="RouteProvider.cs" />
-    <Compile Include="Settings\OfflinePaymentSettings.cs" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
+    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541AD-F659-47DA-8763-16F36C5CD2F4}</Project>
-      <Name>SmartStore.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj">
-      <Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
-      <Name>SmartStore.Web.Framework</Name>
-    </ProjectReference>
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\icon-Payments.CashOnDelivery.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Description.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.de-de.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.en-us.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="changelog.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="packages.config" />
-    <Content Include="web.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\Web.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\OfflinePayment\GenericConfigure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\OfflinePayment\GenericPaymentInfo.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\OfflinePayment\ManualConfigure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\OfflinePayment\ManualPaymentInfo.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\OfflinePayment\DirectDebitPaymentInfo.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\OfflinePayment\PurchaseOrderNumberPaymentInfo.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="$(SolutionDir)\FixRazorIntellisense.targets" Condition="'$(Configuration)' == 'PluginDev'" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>51143</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:56865/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://www.smartstore.net</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs
index b1722773e2..f82e0761ee 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs
@@ -5,8 +5,8 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs
index 7627f1be3d..47fc85f2bb 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.PayPal.Models;
 using SmartStore.PayPal.Settings;
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs
index fa7295802e..0741c5f8c1 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Discounts;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs
index df1da9f9cf..5fbab510fa 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs
index 9da0dd3d08..0f17017f91 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs
index 564bf916fa..b7824832c1 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Net;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Logging;
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs
index 9e38694835..aa60f3b4ad 100644
--- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs
+++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Core.Logging;
 using SmartStore.PayPal.Models;
diff --git a/src/Plugins/SmartStore.PayPal/DependencyRegistrar.cs b/src/Plugins/SmartStore.PayPal/DependencyRegistrar.cs
index 6a262381ca..8bd5ce61b1 100644
--- a/src/Plugins/SmartStore.PayPal/DependencyRegistrar.cs
+++ b/src/Plugins/SmartStore.PayPal/DependencyRegistrar.cs
@@ -1,5 +1,4 @@
 using Autofac;
-using Autofac.Integration.Mvc;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Infrastructure.DependencyManagement;
 using SmartStore.PayPal.Filters;
diff --git a/src/Plugins/SmartStore.PayPal/Events/InstalmentsMessageZoneEventConsumer.cs b/src/Plugins/SmartStore.PayPal/Events/InstalmentsMessageZoneEventConsumer.cs
index 8dd4c31fc1..f449b4fedf 100644
--- a/src/Plugins/SmartStore.PayPal/Events/InstalmentsMessageZoneEventConsumer.cs
+++ b/src/Plugins/SmartStore.PayPal/Events/InstalmentsMessageZoneEventConsumer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Domain.Messages;
diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs
index ff494de305..14a7528ac9 100644
--- a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs
+++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Services;
 using SmartStore.Services.Common;
diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs
index c68f172505..91ab0355a2 100644
--- a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs
+++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.PayPal.Settings;
 using SmartStore.Services;
diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs
index 1d2dc1c344..ff7db5bda6 100644
--- a/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs
+++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs
index d0d51d502c..78ec760421 100644
--- a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs
+++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Services;
diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs
index b962c689e2..52fb0e87fd 100644
--- a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs
+++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework.UI;
 
 namespace SmartStore.PayPal.Filters
diff --git a/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs b/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs
index aa10dac96c..a9d70c611d 100644
--- a/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs
+++ b/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.PayPal.Services;
 using SmartStore.PayPal.Settings;
 using SmartStore.Web.Framework;
diff --git a/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs b/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs
index cd001f5558..06903dc4f6 100644
--- a/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs
+++ b/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using SmartStore.Core.Localization;
 using SmartStore.Web.Framework;
@@ -18,33 +18,27 @@ public PayPalDirectPaymentInfoModel()
         }
 
         [SmartResourceDisplayName("Payment.SelectCreditCard")]
-        [AllowHtml]
         public string CreditCardType { get; set; }
 
         [SmartResourceDisplayName("Payment.SelectCreditCard")]
         public IList<SelectListItem> CreditCardTypes { get; set; }
 
         [SmartResourceDisplayName("Payment.CardholderName")]
-        [AllowHtml]
         public string CardholderName { get; set; }
 
         [SmartResourceDisplayName("Payment.CardNumber")]
-        [AllowHtml]
         public string CardNumber { get; set; }
 
         [SmartResourceDisplayName("Payment.ExpirationDate")]
-        [AllowHtml]
         public string ExpireMonth { get; set; }
 
         [SmartResourceDisplayName("Payment.ExpirationDate")]
-        [AllowHtml]
         public string ExpireYear { get; set; }
 
         public IList<SelectListItem> ExpireMonths { get; set; }
         public IList<SelectListItem> ExpireYears { get; set; }
 
         [SmartResourceDisplayName("Payment.CardCode")]
-        [AllowHtml]
         public string CardCode { get; set; }
     }
 
diff --git a/src/Plugins/SmartStore.PayPal/Plugin.cs b/src/Plugins/SmartStore.PayPal/Plugin.cs
index 5379e80504..1428298bfe 100644
--- a/src/Plugins/SmartStore.PayPal/Plugin.cs
+++ b/src/Plugins/SmartStore.PayPal/Plugin.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Plugins;
 using SmartStore.PayPal.Providers;
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs
index ecc68c7cd0..0208077b7c 100644
--- a/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs
+++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs
index c6b2da707b..81b7d38be8 100644
--- a/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs
+++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs
index d217db5343..4332ba9c12 100644
--- a/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs
+++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs
index 02fbb10855..b95a30eeff 100644
--- a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs
+++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs
@@ -6,8 +6,8 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
diff --git a/src/Plugins/SmartStore.PayPal/RouteProvider.cs b/src/Plugins/SmartStore.PayPal/RouteProvider.cs
index 01da8fd84d..0881c3ceb6 100644
--- a/src/Plugins/SmartStore.PayPal/RouteProvider.cs
+++ b/src/Plugins/SmartStore.PayPal/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.PayPal
diff --git a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs
index dd5d2847fb..2db27bce06 100644
--- a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs
+++ b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SmartStore.Core.Data;
diff --git a/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs b/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs
index 2173dbbb72..0a1dbb29fd 100644
--- a/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs
+++ b/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services.Configuration;
 using SmartStore.Services.Shipping;
 using SmartStore.Shipping.Models;
diff --git a/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs b/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs
index 1b4033e202..544b9a32d1 100644
--- a/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs
+++ b/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs b/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs
index 5bc81716fc..5ebad0752c 100644
--- a/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs
+++ b/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Localization;
diff --git a/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs b/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs
index 96de1e9066..15c6ce27af 100644
--- a/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs
+++ b/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Localization;
 using SmartStore.Core.Plugins;
diff --git a/src/Plugins/SmartStore.Shipping/RouteProvider.cs b/src/Plugins/SmartStore.Shipping/RouteProvider.cs
index fd87b94fe1..2bb6f81884 100644
--- a/src/Plugins/SmartStore.Shipping/RouteProvider.cs
+++ b/src/Plugins/SmartStore.Shipping/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.Shipping
diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj
index 77449e7c90..42bb3af04e 100644
--- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj
+++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj
@@ -1,275 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <ItemDefinitionGroup>
-    <Reference>
-      <Private>False</Private>
-    </Reference>
-    <ProjectReference>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{ACC1E122-B2C8-4441-BDED-D4A77763331A}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Shipping</RootNamespace>
     <AssemblyName>SmartStore.Shipping</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UseIISExpress>true</UseIISExpress>
-    <UpgradeBackupLocation />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\Presentation\SmartStore.Web\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.Mvc">
-      <HintPath>..\..\..\lib\Telerik\Telerik.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Controllers\FixedRateController.cs" />
-    <Compile Include="Models\FixedRateModel.cs" />
-    <Compile Include="Plugin.cs" />
-    <Compile Include="Controllers\ByTotalController.cs" />
-    <Compile Include="Data\Migrations\201403072202413_Initial.cs" />
-    <Compile Include="Data\Migrations\201403072202413_Initial.Designer.cs">
-      <DependentUpon>201403072202413_Initial.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Migrations\Configuration.cs" />
-    <Compile Include="Data\ByTotalObjectContext.cs" />
-    <Compile Include="Data\ByTotalRecordMap.cs" />
-    <Compile Include="DependencyRegistrar.cs" />
-    <Compile Include="Domain\ShippingByTotalRecord.cs" />
-    <Compile Include="Models\ByTotalListModel.cs" />
-    <Compile Include="Models\ByTotalModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\ByTotalProvider.cs" />
-    <Compile Include="Providers\FixedRateProvider.cs" />
-    <Compile Include="RouteProvider.cs" />
-    <Compile Include="Services\IShippingByTotalService.cs" />
-    <Compile Include="Services\ShippingByTotalService.cs" />
-    <Compile Include="Settings\ShippingByTotalSettings.cs" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
+    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541AD-F659-47DA-8763-16F36C5CD2F4}</Project>
-      <Name>SmartStore.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144}</Project>
-      <Name>SmartStore.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj">
-      <Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
-      <Name>SmartStore.Web.Framework</Name>
-    </ProjectReference>
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Migrations\201403072202413_Initial.resx">
-      <DependentUpon>201403072202413_Initial.cs</DependentUpon>
-    </EmbeddedResource>
-    <Content Include="Views\ByTotal\Configure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="packages.config" />
-    <Content Include="web.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\Web.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\FixedRate\Configure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Description.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.de-de.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.en-us.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="$(SolutionDir)\FixRazorIntellisense.targets" Condition="'$(Configuration)' == 'PluginDev'" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>51377</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:53076/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://www.smartstore.net</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs b/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs
index 3012800f78..ecdb55139c 100644
--- a/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs
+++ b/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data.Entity.Migrations;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Domain.Tax;
diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs
index c81b90679e..50c0cc9b30 100644
--- a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs
+++ b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Data;
 using SmartStore.Data.Setup;
 using SmartStore.ShippingByWeight.Data.Migrations;
diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs
index 8f906b6226..ccf38c7fd5 100644
--- a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs
+++ b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.ShippingByWeight.Domain;
 
 namespace SmartStore.ShippingByWeight.Data
diff --git a/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs b/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs
index 31bd7fb8df..91f68351fe 100644
--- a/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs
+++ b/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Plugins/SmartStore.ShippingByWeight/RouteProvider.cs b/src/Plugins/SmartStore.ShippingByWeight/RouteProvider.cs
index 486bab5f1d..1b0804e98c 100644
--- a/src/Plugins/SmartStore.ShippingByWeight/RouteProvider.cs
+++ b/src/Plugins/SmartStore.ShippingByWeight/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.ShippingByWeight
diff --git a/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs b/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs
index 9f5be9be9a..add2d75f4e 100644
--- a/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs
+++ b/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Domain.Tax;
 using SmartStore.Services.Directory;
diff --git a/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs b/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs
index 4cbdaa4c6c..bb24483a7a 100644
--- a/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs
+++ b/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services.Configuration;
 using SmartStore.Services.Tax;
 using SmartStore.Tax.Models;
diff --git a/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs b/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs
index f145987d0f..f4401e5143 100644
--- a/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs
+++ b/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity.ModelConfiguration;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SmartStore.Tax.Domain;
 
 namespace SmartStore.Tax.Data
diff --git a/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs b/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs
index 76f79510e0..5786ab1d73 100644
--- a/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs
+++ b/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs
@@ -1,4 +1,4 @@
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using SmartStore.Data;
 using SmartStore.Data.Setup;
 using SmartStore.Tax.Data.Migrations;
diff --git a/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs b/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs
index 65e6053f46..3741198c8b 100644
--- a/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs
+++ b/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs b/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs
index 8a2c010e64..cd7c65cc95 100644
--- a/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs
+++ b/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Tax;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Configuration;
diff --git a/src/Plugins/SmartStore.Tax/RouteProvider.cs b/src/Plugins/SmartStore.Tax/RouteProvider.cs
index f9e56d6632..391f0fe13c 100644
--- a/src/Plugins/SmartStore.Tax/RouteProvider.cs
+++ b/src/Plugins/SmartStore.Tax/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.Tax
diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj
index 4f0f0c8a61..8af454e5f6 100644
--- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj
+++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj
@@ -1,277 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <ItemDefinitionGroup>
-    <Reference>
-      <Private>False</Private>
-    </Reference>
-    <ProjectReference>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemDefinitionGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{94D1BEEB-64A3-4EB6-9017-D66AFAF4F2B2}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Tax</RootNamespace>
     <AssemblyName>SmartStore.Tax</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UseIISExpress>true</UseIISExpress>
-    <UpgradeBackupLocation />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\Presentation\SmartStore.Web\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.Mvc, Version=2012.2.607.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Telerik\Telerik.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Controllers\TaxByRegionController.cs" />
-    <Compile Include="Controllers\TaxFixedRateController.cs" />
-    <Compile Include="Data\Migrations\201403112350417_Initial.cs" />
-    <Compile Include="Data\Migrations\201403112350417_Initial.Designer.cs">
-      <DependentUpon>201403112350417_Initial.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Migrations\Configuration.cs" />
-    <Compile Include="Data\TaxRateMap.cs" />
-    <Compile Include="Data\TaxRateObjectContext.cs" />
-    <Compile Include="DependencyRegistrar.cs" />
-    <Compile Include="Domain\TaxRate.cs" />
-    <Compile Include="Models\FixedTaxRateModel.cs" />
-    <Compile Include="Models\ByRegionTaxRateListModel.cs" />
-    <Compile Include="Models\ByRegionTaxRateModel.cs" />
-    <Compile Include="Plugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\ByRegionTaxProvider.cs" />
-    <Compile Include="Providers\FixedRateTaxProvider.cs" />
-    <Compile Include="RouteProvider.cs" />
-    <Compile Include="Services\Extensions.cs" />
-    <Compile Include="Services\ITaxRateService.cs" />
-    <Compile Include="Services\TaxRateService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144}</Project>
-      <Name>SmartStore.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541AD-F659-47DA-8763-16F36C5CD2F4}</Project>
-      <Name>SmartStore.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj">
-      <Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
-      <Name>SmartStore.Web.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Content Include="Description.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.de-de.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Localization\resources.en-us.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
+    <ProjectReference Include="..\..\Presentation\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
-    <Content Include="web.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\Web.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\TaxFixedRate\Configure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Views\TaxByRegion\Configure.cshtml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Migrations\201403112350417_Initial.resx">
-      <DependentUpon>201403112350417_Initial.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <Import Project="$(SolutionDir)\FixRazorIntellisense.targets" Condition="'$(Configuration)' == 'PluginDev'" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>51143</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:56865/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://www.smartstore.net</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs
index 7b6b0f63be..f53855a986 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Plugins;
 using SmartStore.Core.Security;
 using SmartStore.Services.Payments;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs
index 67b5927002..4f0f7df709 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs
@@ -8,7 +8,7 @@
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs
index 6cc3c35344..6c200116cd 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs
index 97aec40b54..6607f70267 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Blogs;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs
index 4271b1f00a..e4e7c16ba8 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Blogs;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs
index 8a8ced7e0f..8fe85b992a 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs
index 3740544c0f..4436369cf6 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs
index bee90353c4..d9d4d87d0f 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs
index 42da3db029..11b9aca451 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs
index 247c78e490..cf22d5dcd1 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs
@@ -1,6 +1,6 @@
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs
index 3d36a43a54..f2fdc96092 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs
index 2fd99d7da9..a9c14e2da5 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs
index dcbadc3a51..31e3e65448 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Discounts;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs
index 57718455cb..a51e365995 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs
index 1dd34341da..d9ec25c9f2 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Services.Common;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs
index 0c4a0b3149..9eaedaa02f 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs
index e895b018ef..0ea93776fd 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Services.Localization;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs
index 64f4e274c0..5a4905dc9f 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs
index 0554a6d8aa..2ca9d2f1a7 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs
index 463a664274..186506794b 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs
index 3194927122..51308d1587 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs
@@ -6,7 +6,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs
index 006634321c..f74bdbeaf0 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs
index d412456cb4..982cd17d42 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Messages;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs
index 7d04aedc07..f9d90b144b 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Security;
 using SmartStore.Services.Orders;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs
index d7464b9155..17780eb3aa 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Security;
 using SmartStore.Services.Orders;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs
index 7c5e3b6cc3..2f7b84eb6b 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs
index 27f26cd4af..2023e928ba 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs
@@ -1,6 +1,6 @@
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs
index 30a632b403..ff6758e82f 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs
index 73357da55e..13504951a5 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs
index 3b0d397166..8dd660256d 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs
index 7222c931e6..f81d316c0c 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs
index f21fdbe8b2..0383c41e1a 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs
index 674c5f82bc..2cfb14458a 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs
index 4f318e3abb..8fb74c670f 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs
index 48aa52f74e..c07a9d77a2 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs
index 0f923bb726..09d5420ed6 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs
index f95e6c1332..c84c8c2fe0 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs
index 9e41d3eb35..dd279a6e45 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs
index 03eea6136d..e054fe44f1 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Http.ModelBinding;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs
index c381d0da4d..cea19f153f 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs
index 7b9125bf41..d851745aee 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs
index 22f0f7a91a..fba02f785e 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs
@@ -1,6 +1,6 @@
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Security;
 using SmartStore.Services.Orders;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs
index 198bf3fccb..05a46322de 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Security;
 using SmartStore.Services.Customers;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs
index 7f9cdcc9d1..560f9c3432 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Configuration;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs
index ad59cbfe48..4c2e019fee 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs
index 1c3e24941e..0a330788f8 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs
index 6395a7e891..609440be83 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs
index 6d59fea159..1319cd9144 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs
index 91d59be2b3..8e924485a5 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs
index 3801ab926f..64f969f636 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs
index af3078d3b8..69dcc05454 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Stores;
 using SmartStore.Services.Stores;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs
index bd6e188a73..4f89f9a56a 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Stores;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs
index 887b6ee2c6..e52b88919c 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.DataExchange;
 using SmartStore.Services.DataExchange;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs
index 90079f3462..46373c101c 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Tax;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs
index 7cfecd460b..c23b533df9 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs
index 2aa505279d..13a9d92d6c 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Seo;
 using SmartStore.Services.Seo;
 using SmartStore.Web.Framework.WebApi.OData;
diff --git a/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs b/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs
index 79c56d5f25..bdc40f9e06 100644
--- a/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs
+++ b/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Security;
 using SmartStore.Web.Framework;
diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs
index 05bb0133b9..c3b5bb2c35 100644
--- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs
+++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs
@@ -1,6 +1,6 @@
 using System.Net.Http;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using System.Web.OData.Builder;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs b/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs
index e090d816b1..7c3ed7af79 100644
--- a/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs
+++ b/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Http.Filters;
+using Microsoft.AspNetCore.Mvc.Filters;
 
 namespace SmartStore.WebApi
 {
diff --git a/src/Plugins/SmartStore.WebApi/RouteProvider.cs b/src/Plugins/SmartStore.WebApi/RouteProvider.cs
index f782ad71e4..ef7d453c6a 100644
--- a/src/Plugins/SmartStore.WebApi/RouteProvider.cs
+++ b/src/Plugins/SmartStore.WebApi/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 using SmartStore.Web.Framework.WebApi;
 
diff --git a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs
index 5675411cb9..c49aeca11a 100644
--- a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs
+++ b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Net.Http;
-using System.Web.Http.Controllers;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using System.Web.OData.Routing;
 using System.Web.OData.Routing.Conventions;
 using SmartStore.Utilities;
diff --git a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs
index 4abef43f37..ca850e8087 100644
--- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs
+++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Http.Description;
 using System.Web.OData;
 using System.Web.OData.Routing;
diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs
index 8a3c155430..a516094b32 100644
--- a/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs
+++ b/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Net.Http;
-using System.Web.Http.Controllers;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using System.Web.Http.ModelBinding;
 using SmartStore.Services.Search;
 using SmartStore.Services.Search.Modelling;
diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs
index 136ac34e0e..cb1d90540f 100644
--- a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs
+++ b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs
@@ -3,9 +3,9 @@
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Fakes;
diff --git a/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs
index 7232a13e11..48c44574a7 100644
--- a/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Bundling/BundlePublisher.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Optimization;
+using WebOptimizer;
 using SmartStore.Core.Infrastructure;
 
 namespace SmartStore.Web.Framework.Bundling
diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs
index e390c90952..7e8654bfb2 100644
--- a/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Web.Framework.Filters;
 using SmartStore.Web.Framework.Security;
diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs
index 063643c745..6b07b3b2f2 100644
--- a/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs
@@ -1,8 +1,8 @@
 using System.Globalization;
 using System.IO;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Html;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Services.Common;
diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs
index 29b187f3c7..628d6e8682 100644
--- a/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Security;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs
index 00aefaf66c..85995a414a 100644
--- a/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services.Payments;
 
 namespace SmartStore.Web.Framework.Controllers
diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs
index cadbef89cf..2bae3e3a6b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Localization;
 using SmartStore.Core.Logging;
 using SmartStore.Services;
diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs
index 07e7cecf96..9f6137eb9c 100644
--- a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs
+++ b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs
@@ -3,14 +3,12 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using Autofac;
 using Autofac.Builder;
 using Autofac.Core;
 using Autofac.Core.Registration;
-using Autofac.Integration.Mvc;
-using Autofac.Integration.WebApi;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
 using SmartStore.Core.Async;
diff --git a/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs b/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs
index 91f9b08a0e..fd2b9eb749 100644
--- a/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Events/TabStripCreated.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Web.Framework.Localization;
 using SmartStore.Web.Framework.UI;
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs
index efb5eecbae..0dcfe98535 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs
@@ -6,11 +6,10 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Html;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs
index 86ddff19a9..16c2d07538 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Utilities;
 
 namespace SmartStore.Web.Framework
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs
index 6d042beca7..700d0a9704 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs
index 9677aa41a9..d14e0044df 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 
 namespace SmartStore.Web.Framework
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs
index 19d0128b72..ca875341d5 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Services.Orders;
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs
index 2f77e252da..b49ea8658d 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs
index cf55ba8490..8a53d2aea0 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.IO;
 
 namespace SmartStore
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs
index 17834cb11b..f764a8e84f 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/TagBuilderExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Globalization;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs
index dbcebdbc32..e7a95895b2 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Telerik.Web.Mvc;
 using Telerik.Web.Mvc.Extensions;
 using Telerik.Web.Mvc.UI.Fluent;
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs
index e88283e4f3..d363115a89 100644
--- a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs
@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Services.Cms;
 using SmartStore.Services.Media;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs
index ed1663b5be..c54e068d09 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Services.Affiliates;
 using SmartStore.Services.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs
index 6ce3ae8ce2..4e52585358 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs
@@ -1,5 +1,5 @@
 using System.IO.Compression;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Filters
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs
index ca99c83119..72a2377832 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Services;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs
index d0ecd40b0c..b5ad83c33b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Services.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs
index e24540ab11..59a9f221f9 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/FormValueRequiredAttribute.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Filters
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs
index a15a40a478..3d113a2632 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/GdprConsentAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Logging;
 using SmartStore.Services;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs
index 09aeb115aa..2fc0986822 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Logging;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs
index d89f8c6eb7..2c2b11d449 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 
 namespace SmartStore.Web.Framework.Filters
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs
index ee45056709..6058b793ad 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/JsonNetAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Data;
 using SmartStore.Services.Helpers;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/MaxMediaFileSizeAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/MaxMediaFileSizeAttribute.cs
index 6be3a52e41..fe69b9feea 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/MaxMediaFileSizeAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/MaxMediaFileSizeAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Services.Media;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs
index 2cc6b8665f..9b2aa94564 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Logging;
 
 namespace SmartStore.Web.Framework.Filters
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs
index e6d3dea060..2181900cd1 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Data;
 using SmartStore.Core.Security;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs
index 3b7905ca67..aeff0f32a9 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Web.Framework.Filters
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs
index 43cbd1dce2..8fa132f21b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs
index aa57f5c33f..9a2f197e3f 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs
index a9392a363c..b12ad988fc 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs
index 93eddf7752..b7198a2f5f 100644
--- a/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Data;
 
 namespace SmartStore.Web.Framework.Filters
diff --git a/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs b/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs
index 13a5991802..5b54daf9ef 100644
--- a/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs
+++ b/src/Presentation/SmartStore.Web.Framework/FrameworkCacheConsumer.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Data;
diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs b/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs
index 972cb931f1..5f2f1fb799 100644
--- a/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Localization/ErrorMessageProvider.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Globalization;
-using System.Web.ModelBinding;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace SmartStore.Web.Framework.Localization
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs
index bdb4489842..3cd0988e14 100644
--- a/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Localization/LanguageSeoCodeAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs
index dba94ca1cc..cb20b02a24 100644
--- a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Globalization;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs
index aeb0c37107..c96eca616a 100644
--- a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.Localization
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs
index d7f61ca73d..139c397fdd 100644
--- a/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Localization/SetWorkingCultureAttribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/CommaSeparatedModelBinder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/CommaSeparatedModelBinder.cs
index a5cdc490cd..fbb348096b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/CommaSeparatedModelBinder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/CommaSeparatedModelBinder.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Modelling
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs
index 9ae7515a84..e17832e8f3 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Core.Infrastructure;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs
index ed232f2cf9..53c84b36be 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Web;
-using System.Web.Hosting;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.IO;
 using SmartStore.Utilities;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs
index bbf053767c..10c67f4ede 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Net;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Web.Framework.Modelling
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs
index 10574118e1..88124e2a03 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Web.Framework.Modelling
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs
index aa85bc4b20..295151c30b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/JsonNetResult.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using SmartStore.ComponentModel;
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs
index a112f0b355..bfe9b78115 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RootActionViewResult.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Modelling.Results
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs
index 2d44042448..a33a4f21e7 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/RssActionResult.cs
@@ -1,5 +1,5 @@
 using System.ServiceModel.Syndication;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml;
 
 // ReSharper disable once CheckNamespace
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/XmlDownloadResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/XmlDownloadResult.cs
index 78ec6589ec..2792a46299 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/XmlDownloadResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/XmlDownloadResult.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml;
 using SmartStore.Utilities;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs
index 2f8edaa461..98c8824dd5 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartMetadataProvider.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Modelling
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs
index 350a009f70..f289b7054e 100644
--- a/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Modelling/SmartModelBinder.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Security;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Html;
 using SmartStore.Web.Framework.Security;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs
index 67611c5559..18dfaea407 100644
--- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Services.Pdf;
 
 namespace SmartStore.Web.Framework.Pdf
diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs
index c81c46d4e7..6769cc4aa0 100644
--- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services.Pdf;
 using SmartStore.Web.Framework.Controllers;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs
index 525e0b070e..7f6efebecf 100644
--- a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs
@@ -1,5 +1,5 @@
 using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services.Pdf;
 using SmartStore.Utilities;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs
index ac2a4cd5fd..033a703277 100644
--- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs
@@ -1,5 +1,5 @@
 using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using System.Web.Mvc.Razor;
 using System.Web.WebPages.Razor;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginStarter.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginStarter.cs
index cd7d9e63a2..0ff19201b5 100644
--- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginStarter.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginStarter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs
index 39fbe63e21..1810e43b00 100644
--- a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Payments;
 using SmartStore.Web.Framework.Localization;
@@ -18,11 +18,9 @@ public class ProviderModel : ModelBase, ILocalizedModel<ProviderLocalizedModel>
         public string SystemName { get; set; }
 
         [SmartResourceDisplayName("Common.FriendlyName")]
-        [AllowHtml]
         public string FriendlyName { get; set; }
 
         [SmartResourceDisplayName("Common.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -68,11 +66,9 @@ public class ProviderLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Common.FriendlyName")]
-        [AllowHtml]
         public string FriendlyName { get; set; }
 
         [SmartResourceDisplayName("Common.Description")]
-        [AllowHtml]
         public string Description { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs b/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs
index b936aaad1e..f7a592d1f7 100644
--- a/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.Routing
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs
index 8906a4a3c8..99f0a42546 100644
--- a/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Infrastructure;
 
 namespace SmartStore.Web.Framework.Routing
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs
index 4493d1d338..e973911fd4 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Security;
 
 namespace SmartStore.Web.Framework.Security
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs
index 9568d12685..d7109b32a7 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Security;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs
index d00153bfac..9a933e4521 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs
@@ -1,5 +1,5 @@
 using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs
index d1f65774f2..efa92ca512 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs
@@ -6,8 +6,8 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
 using System.Text;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Logging;
 using SmartStore.Services.Localization;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs
index 8bad998c40..79bee79777 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
-using System.Web;
-using System.Web.Security;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
 using Newtonsoft.Json;
 using SmartStore.Utilities;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs
index b064401d34..c77437ac43 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/ValidateHoneypotAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Security;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs
index 34939ca5e2..b967c4d99b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Security/SanitizeHtmlAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Security
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPath.cs b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPath.cs
index 4f1335b535..70914212f7 100644
--- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPath.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPath.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.Seo
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs
index c5ebc451c7..adb00c337a 100644
--- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Data;
diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs
index e83872c01a..ceaf787357 100644
--- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.Seo
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs
index d39485def5..fb8ea6df7b 100644
--- a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs
@@ -6,15 +6,12 @@ namespace SmartStore.Web.Framework.Seo
     public interface ISeoModel : ILocalizedModel<SeoModelLocal>
     {
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         string MetaTitle { get; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         string MetaDescription { get; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         string MetaKeywords { get; }
     }
 
@@ -23,15 +20,12 @@ public class SeoModelLocal : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
     }
 }
diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs
index f17ffe3e30..70b3917475 100644
--- a/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Web.Hosting;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Security;
diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs
index 9ab06a0c57..c0d7f9b858 100644
--- a/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Configuration;
 using SmartStore.Services;
 using SmartStore.Web.Framework.Controllers;
diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs
index e84d13adb9..f3881ea581 100644
--- a/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.Settings
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs
index 9c1adb51de..19536aa6b9 100644
--- a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Services.Configuration;
diff --git a/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs b/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs
index a38bedbe52..315c9f8324 100644
--- a/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs
+++ b/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Infrastructure;
 
 namespace SmartStore.Web.Framework
diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj
index 3af5f9ff89..21c2126225 100644
--- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj
+++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj
@@ -1,521 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{75FD4163-333C-4DD5-854D-2EF294E45D94}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Web.Framework</RootNamespace>
     <AssemblyName>SmartStore.Web.Framework</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\EFMigrations\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\PluginDev\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AdvancedStringBuilder, Version=0.1.0.0, Culture=neutral, PublicKeyToken=e818a2fc08933ddb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll</HintPath>
-    </Reference>
-    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Integration.WebApi, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.WebApi2.5.0.0\lib\net461\Autofac.Integration.WebApi.dll</HintPath>
-    </Reference>
-    <Reference Include="AutoprefixerHost, Version=1.1.10.0, Culture=neutral, PublicKeyToken=35c9a5d231b2f02d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.Autoprefixer, Version=1.12.1.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.Core, Version=1.10.0.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.SassAndScss, Version=1.12.1.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll</HintPath>
-    </Reference>
-    <Reference Include="CommonServiceLocator, Version=2.0.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.5\lib\net47\CommonServiceLocator.dll</HintPath>
-    </Reference>
-    <Reference Include="DotLiquid, Version=2.0.254.0, Culture=neutral, PublicKeyToken=82e46016ecf9f07c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DotLiquid.2.0.254\lib\net45\DotLiquid.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll</HintPath>
-    </Reference>
-    <Reference Include="JavaScriptEngineSwitcher.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="LibSassHost, Version=1.2.6.0, Culture=neutral, PublicKeyToken=3e24e88796a38e46, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.OData.Core, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.OData.Edm, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Spatial, Version=6.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.OData, Version=5.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.OData.5.10.0\lib\net45\System.Web.OData.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Telerik.Web.Mvc, Version=2012.2.607.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Telerik\Telerik.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Controllers\ManageController.cs" />
-    <Compile Include="Controllers\AdminControllerBase.cs" />
-    <Compile Include="Controllers\ViewNotFoundException.cs" />
-    <Compile Include="Extensions\ActionResultExtensions.cs" />
-    <Compile Include="Extensions\HtmlPrefixScopeExtensions.cs" />
-    <Compile Include="Extensions\HtmlZoneExtensions.cs" />
-    <Compile Include="Extensions\LocalizedValueExtensions.cs" />
-    <Compile Include="Extensions\TagBuilderExtensions.cs" />
-    <Compile Include="Filters\GdprConsentAttribute.cs" />
-    <Compile Include="Filters\CookieConsentFilter.cs" />
-    <Compile Include="Filters\JsonNetAttribute.cs" />
-    <Compile Include="Filters\MaxMediaFileSizeAttribute.cs" />
-    <Compile Include="Filters\ResponseFilterStream.cs" />
-    <Compile Include="FrameworkCacheConsumer.cs" />
-    <Compile Include="Localization\SetWorkingCultureAttribute.cs" />
-    <Compile Include="Modelling\ChoiceListItem.cs" />
-    <Compile Include="Modelling\MediaTemplateModel.cs" />
-    <Compile Include="Modelling\Results\CachedFileResult.cs" />
-    <Compile Include="Modelling\Results\FileResponder.cs" />
-    <Compile Include="Modelling\Results\FileTransmitter.cs" />
-    <Compile Include="Modelling\Results\IFileResponse.cs" />
-    <Compile Include="Modelling\Results\JsonNetResult.cs" />
-    <Compile Include="Modelling\Results\PermissiveRedirectResult.cs" />
-    <Compile Include="Modelling\Results\RootActionViewResult.cs" />
-    <Compile Include="Plugins\PluginRazorHost.cs" />
-    <Compile Include="Plugins\PluginStarter.cs" />
-    <Compile Include="Security\Honeypot\HtmlHoneypotExtensions.cs" />
-    <Compile Include="Security\Honeypot\ValidateHoneypotAttribute.cs" />
-    <Compile Include="Security\Honeypot\Honeypot.cs" />
-    <Compile Include="Security\SameSiteBrowserDetector.cs" />
-    <Compile Include="Security\SanitizeHtmlAttribute.cs" />
-    <Compile Include="Seo\GenericPath.cs" />
-    <Compile Include="Seo\ISeoModel.cs" />
-    <Compile Include="Settings\SaveSettingAttribute.cs" />
-    <Compile Include="Settings\LoadSettingAttribute.cs" />
-    <Compile Include="Templating\Events.cs" />
-    <Compile Include="Templating\Liquid\Drops\DictionaryDrop.cs" />
-    <Compile Include="Templating\Liquid\Drops\EnumerableWrapper.cs" />
-    <Compile Include="Templating\Liquid\Drops\ObjectDrop.cs" />
-    <Compile Include="Templating\Liquid\Drops\SafeDropBase.cs" />
-    <Compile Include="Templating\Liquid\Drops\TestDrop.cs" />
-    <Compile Include="Templating\Liquid\Filters\AdditionalFilters.cs" />
-    <Compile Include="Templating\Liquid\LiquidTemplate.cs" />
-    <Compile Include="Templating\Liquid\LiquidTemplateEngine.cs" />
-    <Compile Include="Templating\Liquid\LiquidUtil.cs" />
-    <Compile Include="Templating\Liquid\Tags\Zone.cs" />
-    <Compile Include="Theming\AdminThemedAttribute.cs" />
-    <Compile Include="Filters\HandleExceptionFilter.cs" />
-    <Compile Include="Filters\NotifyAttribute.cs" />
-    <Compile Include="Controllers\PublicControllerBase.cs" />
-    <Compile Include="Controllers\PluginControllerBase.cs" />
-    <Compile Include="Filters\CheckAffiliateAttribute.cs" />
-    <Compile Include="Controllers\ContollerExtensions.cs" />
-    <Compile Include="Filters\CustomerLastActivityAttribute.cs" />
-    <Compile Include="Filters\ParameterBasedOnFormNameAndValueAttribute.cs" />
-    <Compile Include="Filters\ParameterBasedOnFormNameAttribute.cs" />
-    <Compile Include="Controllers\SmartController.cs" />
-    <Compile Include="Filters\StoreIpAddressAttribute.cs" />
-    <Compile Include="Filters\UnitOfWorkAttribute.cs" />
-    <Compile Include="Events\TabStripCreated.cs" />
-    <Compile Include="Extensions\HtmlSelectListExtensions.cs" />
-    <Compile Include="Extensions\HttpExtensions.cs" />
-    <Compile Include="Extensions\HttpSessionStateExtensions.cs" />
-    <Compile Include="Extensions\NameValueCollectionExtensions.cs" />
-    <Compile Include="Filters\HandleInstallFilter.cs" />
-    <Compile Include="Extensions\PostedFileResult.cs" />
-    <Compile Include="Extensions\TelerikExtensions.cs" />
-    <Compile Include="Localization\ErrorMessageProvider.cs" />
-    <Compile Include="Filters\CompressAttribute.cs" />
-    <Compile Include="Modelling\ModelBoundEvent.cs" />
-    <Compile Include="Plugins\ProviderModel.cs" />
-    <Compile Include="Pdf\Content\PdfRouteContent.cs" />
-    <Compile Include="Pdf\Content\PdfPartialViewContent.cs" />
-    <Compile Include="Pdf\Content\PdfViewContent.cs" />
-    <Compile Include="Pdf\PdfReceiptHeaderFooterModel.cs" />
-    <Compile Include="Pdf\PdfHeaderFooterVariables.cs" />
-    <Compile Include="Pdf\PdfResult.cs" />
-    <Compile Include="Plugins\PluginExtensions.cs" />
-    <Compile Include="Plugins\PluginMediator.cs" />
-    <Compile Include="Plugins\ProviderManager.cs" />
-    <Compile Include="SmartUrlRoutingModule.cs" />
-    <Compile Include="Theming\Assets\AssetTranslorUtil.cs" />
-    <Compile Include="Theming\Assets\AutoprefixPostProcessor.cs" />
-    <Compile Include="Theming\Assets\CachedAsset.cs" />
-    <Compile Include="Theming\Assets\DefaultAssetCache.cs" />
-    <Compile Include="Theming\Assets\IAssetCache.cs" />
-    <Compile Include="Theming\CssHttpHandler.cs" />
-    <Compile Include="Theming\IFileDependencyProvider.cs" />
-    <Compile Include="Theming\LocalizedDisplayMode.cs" />
-    <Compile Include="Theming\Assets\ModuleImportsVirtualFile.cs" />
-    <Compile Include="Theming\DefaultThemeFileResolver.cs" />
-    <Compile Include="Theming\InheritedVirtualThemeFile.cs" />
-    <Compile Include="Theming\Assets\BundlingVirtualPathProvider.cs" />
-    <Compile Include="Theming\Assets\AssetTranslator.cs" />
-    <Compile Include="Theming\TwoLevelViewLocationCache.cs" />
-    <Compile Include="Theming\WebViewPage.cs" />
-    <Compile Include="Theming\WebViewPageHelper.cs" />
-    <Compile Include="UI\Choices\ChoiceItemModel.cs" />
-    <Compile Include="UI\Choices\GenericChoiceModel.cs" />
-    <Compile Include="UI\Choices\ChoiceModel.cs" />
-    <Compile Include="UI\Components\BoxSpacing.cs" />
-    <Compile Include="UI\Components\EntityPicker\EntityPicker.cs" />
-    <Compile Include="UI\Components\EntityPicker\EntityPickerBuilder.cs" />
-    <Compile Include="UI\Components\FileUploader\FileUploaderBuilder.cs" />
-    <Compile Include="UI\Components\FileUploader\FileUploader.cs" />
-    <Compile Include="UI\Components\Menu\CatalogMenuProvider.cs" />
-    <Compile Include="UI\Components\Menu\Menu.cs" />
-    <Compile Include="UI\Components\Menu\MenuBuilder.cs" />
-    <Compile Include="UI\Components\Menu\MenuRenderer.cs" />
-    <Compile Include="UI\Components\NavigatableComponent.cs" />
-    <Compile Include="UI\Components\ViewBasedComponentRenderer.cs" />
-    <Compile Include="UI\Components\Menu\AdminMenuProvider.cs" />
-    <Compile Include="UI\Components\Menu\MenuPublisher.cs" />
-    <Compile Include="UI\HtmlAttribute.cs" />
-    <Compile Include="UI\Extensions\HtmlAttributeExtensions.cs" />
-    <Compile Include="Localization\LanguageSeoCodeAttribute.cs" />
-    <Compile Include="Localization\IText.cs" />
-    <Compile Include="Localization\Text.cs" />
-    <Compile Include="Bundling\BundlePublisher.cs" />
-    <Compile Include="Bundling\IBundleProvider.cs" />
-    <Compile Include="Bundling\IBundlePublisher.cs" />
-    <Compile Include="Modelling\CommaSeparatedModelBinder.cs" />
-    <Compile Include="Theming\SmartVirtualPathProvider.cs" />
-    <Compile Include="Filters\PublicStoreAllowNavigationAttribute.cs" />
-    <Compile Include="Routing\GuidConstraint.cs" />
-    <Compile Include="Seo\GenericPathRoute.cs" />
-    <Compile Include="Seo\GenericPathRouteExtensions.cs" />
-    <Compile Include="Settings\StoreDependingSettingData.cs" />
-    <Compile Include="Settings\StoreDependingSettingHelper.cs" />
-    <Compile Include="Theming\Assets\SmartStyleBundle.cs" />
-    <Compile Include="Theming\ThemeHelper.cs" />
-    <Compile Include="Theming\ThemeVarsVirtualFile.cs" />
-    <Compile Include="Theming\ThemingVirtualPathProvider.cs" />
-    <Compile Include="Theming\ThemeHtmlExtensions.cs" />
-    <Compile Include="Theming\ThemeVarsRepository.cs" />
-    <Compile Include="UI\Components\ComponentRendererUtils.cs" />
-    <Compile Include="UI\Components\Menu\MenuExtensions.cs" />
-    <Compile Include="UI\Components\Menu\MenuModel.cs" />
-    <Compile Include="UI\Components\Menu\NodePathState.cs" />
-    <Compile Include="UI\Components\Window\WindowRenderer.cs" />
-    <Compile Include="UI\Components\Window\WindowBuilder.cs" />
-    <Compile Include="UI\Components\Window\Window.cs" />
-    <Compile Include="UI\Breadcrumb.cs" />
-    <Compile Include="UI\Icons\IconDescription.cs" />
-    <Compile Include="UI\Icons\IconExplorer.cs" />
-    <Compile Include="UI\Icons\IIcon.cs" />
-    <Compile Include="UI\IWidgetProvider.cs" />
-    <Compile Include="UI\IWidgetSelector.cs" />
-    <Compile Include="UI\BundleBuilder.cs" />
-    <Compile Include="UI\Extensions\ScaffoldExtensions.cs" />
-    <Compile Include="Security\AdminValidateIpAddressAttribute.cs" />
-    <Compile Include="Security\FilePermissionHelper.cs" />
-    <Compile Include="Filters\StoreClosedAttribute.cs" />
-    <Compile Include="Filters\StoreLastVisitedPageAttribute.cs" />
-    <Compile Include="Controllers\PaymentControllerBase.cs" />
-    <Compile Include="Filters\FormValueRequiredAttribute.cs" />
-    <Compile Include="Localization\LocalizedRoute.cs" />
-    <Compile Include="Localization\LocalizedRouteExtensions.cs" />
-    <Compile Include="Modelling\ModelBase.cs" />
-    <Compile Include="Security\AdminAuthorizeAttribute.cs" />
-    <Compile Include="Filters\FormValueExistsAttribute.cs" />
-    <Compile Include="DependencyRegistrar.cs" />
-    <Compile Include="Modelling\Results\XmlDownloadResult.cs" />
-    <Compile Include="Extensions\DateTimeExtensions.cs" />
-    <Compile Include="Extensions\HtmlExtensions.cs" />
-    <Compile Include="Modelling\IModelAttribute.cs" />
-    <Compile Include="Localization\ILocalizedModel.cs" />
-    <Compile Include="Modelling\DeleteConfirmationModel.cs" />
-    <Compile Include="Routing\IRouteProvider.cs" />
-    <Compile Include="Routing\IRoutePublisher.cs" />
-    <Compile Include="SmartDependencyResolver.cs" />
-    <Compile Include="Routing\RoutePublisher.cs" />
-    <Compile Include="Modelling\SmartMetadataProvider.cs" />
-    <Compile Include="Modelling\SmartModelBinder.cs" />
-    <Compile Include="Localization\SmartResourceDisplayName.cs" />
-    <Compile Include="UI\Menus\MenuInvalidator.cs" />
-    <Compile Include="UI\Menus\MenuService.cs" />
-    <Compile Include="UI\Menus\Providers\CatalogMenuInvalidator.cs" />
-    <Compile Include="UI\Menus\Providers\CatalogMenuItemProvider.cs" />
-    <Compile Include="UI\Menus\DatabaseMenuResolver.cs" />
-    <Compile Include="UI\Menus\DependencyMenuResolver.cs" />
-    <Compile Include="UI\Menus\IMenuResolver.cs" />
-    <Compile Include="UI\Menus\Providers\MenuItemProviderMetadata.cs" />
-    <Compile Include="UI\Menus\Providers\RouteMenuItemProvider.cs" />
-    <Compile Include="UI\Menus\IMenu.cs" />
-    <Compile Include="UI\Menus\DatabaseMenu.cs" />
-    <Compile Include="UI\Menus\IMenuService.cs" />
-    <Compile Include="UI\Menus\MenuBase.cs" />
-    <Compile Include="UI\Menus\Providers\EntityMenuItemProvider.cs" />
-    <Compile Include="UI\Menus\Providers\IMenuItemProvider.cs" />
-    <Compile Include="UI\Menus\Providers\MenuItemProviderBase.cs" />
-    <Compile Include="UI\Menus\MenuBuiltEvent.cs" />
-    <Compile Include="UI\Menus\MenuFilter.cs" />
-    <Compile Include="UI\Spacing.cs" />
-    <Compile Include="UI\WidgetZoneModel.cs" />
-    <Compile Include="Validators\FluentValidatorExtensions.cs" />
-    <Compile Include="Validators\SmartBaseValidator.cs" />
-    <Compile Include="Validators\SmartValidatorFactory.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Modelling\Results\RssActionResult.cs" />
-    <Compile Include="Seo\SslRequirement.cs" />
-    <Compile Include="Seo\RewriteUrlAttribute.cs" />
-    <Compile Include="Localization\TelerikLocalizationService.cs" />
-    <Compile Include="Localization\TelerikLocalizationServiceFactory.cs" />
-    <Compile Include="Theming\ThemeableVirtualPathProviderViewEngine.cs" />
-    <Compile Include="Theming\ThemeableRazorViewEngine.cs" />
-    <Compile Include="Theming\ThemeContext.cs" />
-    <Compile Include="UI\Components\Enums.cs" />
-    <Compile Include="UI\Components\Component.cs" />
-    <Compile Include="UI\Components\ComponentBuilder.cs" />
-    <Compile Include="UI\Components\ComponentFactory.cs" />
-    <Compile Include="UI\Components\ComponentRenderer.cs" />
-    <Compile Include="Security\Captcha\CaptchaSettings.cs" />
-    <Compile Include="Security\Captcha\HtmlCaptchaExtensions.cs" />
-    <Compile Include="Security\Captcha\ValidateCaptchaAttribute.cs" />
-    <Compile Include="UI\ResourceLocation.cs" />
-    <Compile Include="UI\Extensions\LayoutExtensions.cs" />
-    <Compile Include="UI\IPageAssetsBuilder.cs" />
-    <Compile Include="UI\PageAssetsBuilder.cs" />
-    <Compile Include="UI\Extensions\DataListExtensions.cs" />
-    <Compile Include="UI\Components\HtmlHelperExtensions.cs" />
-    <Compile Include="UI\Components\IUiComponent.cs" />
-    <Compile Include="UI\Components\IContentContainer.cs" />
-    <Compile Include="UI\Components\IHtmlAttributesContainer.cs" />
-    <Compile Include="UI\INavigatable.cs" />
-    <Compile Include="UI\Components\Menu\IMenuProvider.cs" />
-    <Compile Include="UI\Components\Menu\MenuItem.cs" />
-    <Compile Include="UI\Components\Menu\MenuItemBuilder.cs" />
-    <Compile Include="UI\Components\NavigationItemBuilder.cs" />
-    <Compile Include="UI\Components\NavigatableComponentBuilder.cs" />
-    <Compile Include="UI\Extensions\NavigatableExtensions.cs" />
-    <Compile Include="UI\Components\NavigationItem.cs" />
-    <Compile Include="UI\Components\Pager\ForumTopicPagerRenderer.cs" />
-    <Compile Include="UI\Components\Pager\Pager.cs" />
-    <Compile Include="UI\Components\Pager\PagerBuilder.cs" />
-    <Compile Include="UI\Components\Pager\PagerItem.cs" />
-    <Compile Include="UI\Components\Pager\PagerRenderer.cs" />
-    <Compile Include="UI\Extensions\RouteValueDictionaryExtensions.cs" />
-    <Compile Include="UI\Components\TabStrip\TabStrip.cs" />
-    <Compile Include="UI\Components\TabStrip\TabStripBuilder.cs" />
-    <Compile Include="UI\Components\TabStrip\Tab.cs" />
-    <Compile Include="UI\Components\TabStrip\TabBuilder.cs" />
-    <Compile Include="UI\Components\TabStrip\TabFactory.cs" />
-    <Compile Include="UI\Components\TabStrip\TabStripRenderer.cs" />
-    <Compile Include="UI\WidgetProvider.cs" />
-    <Compile Include="UI\WidgetRouteInfo.cs" />
-    <Compile Include="Extensions\UrlHelperExtensions.cs" />
-    <Compile Include="Validators\ValidatorLanguageManager.cs" />
-    <Compile Include="WebApi\AutofacWebApiDependencyResolver.cs" />
-    <Compile Include="WebApi\AutofacWebApiDependencyScope.cs" />
-    <Compile Include="WebApi\Configuration\IWebApiConfigurationProvider.cs" />
-    <Compile Include="WebApi\Configuration\IWebApiConfigurationPublisher.cs" />
-    <Compile Include="WebApi\Configuration\WebApiConfigurationBroadcaster.cs" />
-    <Compile Include="WebApi\Configuration\WebApiConfigurationPublisher.cs" />
-    <Compile Include="WebApi\Extensions\ApiControllerExtensions.cs" />
-    <Compile Include="WebApi\Extensions\HttpRequestMessageExtensions.cs" />
-    <Compile Include="WebApi\OData\WebApiQueryableAttribute.cs" />
-    <Compile Include="WebApi\Security\HmacAuthentication.cs" />
-    <Compile Include="WebApi\Security\WebApiAuthenticateAttribute.cs" />
-    <Compile Include="WebApi\Caching\WebApiCachingControllingData.cs" />
-    <Compile Include="WebApi\Caching\WebApiCachingUserData.cs" />
-    <Compile Include="WebApi\WebApiContractResolver.cs" />
-    <Compile Include="WebApi\WebApiCore.cs" />
-    <Compile Include="WebApi\OData\WebApiEntityController.cs" />
-    <Compile Include="WebApi\WebApiSettings.cs" />
-    <Compile Include="WebApi\WebApiStartupTask.cs" />
-    <Compile Include="WebStoreContext.cs" />
-    <Compile Include="WebWorkContext.cs" />
+    <Compile Include="..\..\AssemblySharedInfo.cs" Link="Properties\AssemblySharedInfo.cs" />
+    <Compile Include="..\..\AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541ad-f659-47da-8763-16f36c5cd2f4}</Project>
-      <Name>SmartStore.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144}</Project>
-      <Name>SmartStore.Data</Name>
-    </ProjectReference>
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.422" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs
index 271d4c8e31..1f98402e80 100644
--- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs
+++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs
@@ -3,9 +3,9 @@
 using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.Hosting;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Collections;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs
index 3f6638c705..81b13443b2 100644
--- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplate.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using DotLiquid;
 using SmartStore.ComponentModel;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs
index d2ee3c46bd..870277673d 100644
--- a/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Templating/Liquid/LiquidTemplateEngine.cs
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using DotLiquid;
 using DotLiquid.FileSystems;
 using DotLiquid.NamingConventions;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs
index 59d32b7132..181ffebb44 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/AdminThemedAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 
 namespace SmartStore.Web.Framework.Theming
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs
index 9c9b79918f..5fd44288b4 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs
@@ -3,8 +3,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web.Caching;
-using System.Web.Hosting;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Infrastructure;
 
 namespace SmartStore.Web.Framework.Theming.Assets
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs
index c86420202b..fdf09b2e09 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs
@@ -3,10 +3,10 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Web;
-using System.Web.Caching;
-using System.Web.Hosting;
-using System.Web.Optimization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.AspNetCore.Hosting;
+using WebOptimizer;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Themes;
 using SmartStore.Core.IO;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs
index 3b357666e7..dffac40785 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/ModuleImportsVirtualFile.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Data;
 using SmartStore.Core.Plugins;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs
index 185c640531..0ae06b1d20 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/SmartStyleBundle.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Web.Optimization;
+using WebOptimizer;
 using BundleTransformer.Core;
 using BundleTransformer.Core.Builders;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs b/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs
index d0d3900fde..d4151a523e 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Web;
-using System.Web.Caching;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
 using BundleTransformer.Core;
 using BundleTransformer.Core.Assets;
 using BundleTransformer.Core.Configuration;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs b/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs
index f40f05d73c..11f992c7fb 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs
@@ -3,8 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Themes;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs b/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs
index a0c19b1495..572629c01f 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/InheritedVirtualThemeFile.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Themes;
 
 namespace SmartStore.Web.Framework.Theming
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs b/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs
index 58f46a29c1..ac5dcf81d6 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Web;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs
index f05bcca22a..fafd8fb7c0 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
-using System.Web;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Themes;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs
index 3349b0df00..b4abd2df0a 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Themes;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs
index bb16495453..630404e2d4 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs
@@ -3,8 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.Optimization;
+using Microsoft.AspNetCore.Http;
+using WebOptimizer;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Themes;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs
index 2933507b6a..1dd4624584 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Html;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs
index 255a417b68..edf795d72f 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Services.Themes;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs
index 9ac6d1fe4c..dead830600 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsVirtualFile.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 
 namespace SmartStore.Web.Framework.Theming
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs
index bc0fd04532..ef3788a8ff 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableRazorViewEngine.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Utilities;
 
 namespace SmartStore.Web.Framework.Theming
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs
index 7bfa8c1161..318d3c32d7 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Themes;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs
index 78195934d9..ac219c2bde 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs
@@ -3,8 +3,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web.Caching;
-using System.Web.Hosting;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.AspNetCore.Hosting;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Themes;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs b/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs
index 831cc4a036..971a27e068 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Utilities;
 
 namespace SmartStore.Web.Framework.Theming
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs
index 7fe8956162..750bdddeed 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs
index b8fa11ecfd..7b3af98681 100644
--- a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPageHelper.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain;
 using SmartStore.Core.Domain.Security;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs
index e6fba32534..6bc5971c1f 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web;
-using System.Web.Optimization;
+using Microsoft.AspNetCore.Http;
+using WebOptimizer;
 using BundleTransformer.Core.Bundles;
 using BundleTransformer.Core.Orderers;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs
index a2b7832a02..912209b575 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs
index c983dee479..66e7271bde 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs
index e6029660ad..c1a529b853 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Utilities;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs
index a429f6128f..4eb382a57c 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentFactory.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs
index 115ab3ca81..4c7c731d25 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs
@@ -1,8 +1,7 @@
 using System;
 using System.IO;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.UI;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs
index 842771f5d5..b440b3bcb5 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs
index e2d5dfb4a6..f0bdcc1e12 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Services.Media;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs
index 21a87bc743..6469eddabf 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Utilities.ObjectPools;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs
index f252990485..a1481b3d83 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Web.WebPages;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs
index 7a49919a7c..72a698f753 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuExtensions.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Cms;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs
index 668233de1d..a351dc2081 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs
@@ -1,5 +1,4 @@
 using System.Web.Mvc.Html;
-using System.Web.UI;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs
index 4822affcce..e7f4c75ba2 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Utilities;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs
index dfc5cb4ba3..09b9621ec2 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs
index 7242fec0a5..74c1c80731 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Html;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Utilities;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs
index 6d770bf586..e4bfa3af92 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
-using System.Web.UI;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs
index ba149e2de2..55349f8a1a 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabFactory.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs
index 670bcf4856..4be5dcceb1 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStrip.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Web.WebPages;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs
index b0a1cfdf26..8712dec191 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs
@@ -1,6 +1,5 @@
 using System;
-using System.Web.Mvc;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs
index 7a77fc0320..d261ace69f 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.UI;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework.Modelling;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs
index 29463fd2d7..8fb1b5997f 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs
index ea685065a5..3de33e3668 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Utilities;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs
index edf98c825f..95bf3b5aaa 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/LayoutExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/LayoutExtensions.cs
index 43d2049fd4..9011c42e86 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/LayoutExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/LayoutExtensions.cs
@@ -1,6 +1,6 @@
 using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Localization;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs
index 7cee633ff3..28f4021331 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Seo;
 using SmartStore.Services.Localization;
 using SmartStore.Web.Framework.Seo;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs
index a6265fed86..e8434a81e0 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs
index 4528787f3a..ad451f946e 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Text;
-using System.Web.Mvc;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Localization;
 using SmartStore.Services.Localization;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/HtmlAttribute.cs b/src/Presentation/SmartStore.Web.Framework/UI/HtmlAttribute.cs
index 848829d1e6..0763a46213 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/HtmlAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/HtmlAttribute.cs
@@ -2,7 +2,7 @@
  * Source: http://stackoverflow.com/questions/3800473/how-to-concisely-create-optional-html-attributes-with-razor-view-engine/4232630#4232630
 */
 using System;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Web.Framework
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs b/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs
index 2b25a4990f..7d6a7c1415 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs
index 34275c7e53..c181defa0c 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs
index 5c5c3bed07..e9e122a8dd 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 
 namespace SmartStore.Web.Framework.UI
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs
index b1f392bfd0..04efcc2553 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs
index c0c8b54525..9dc50d20c7 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 
 namespace SmartStore.Web.Framework.UI
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs
index 1b96e73908..aac1bc8ab0 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 using SmartStore.Core.Logging;
 using SmartStore.Services;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs
index 84d4ee3c9a..22a1c69383 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading.Tasks;
 using SmartStore.Core.Caching;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs
index a80b0957b2..0b366228c4 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs
@@ -3,12 +3,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Web;
-using System.Web.Hosting;
-using System.Web.Mvc;
-using System.Web.Optimization;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using WebOptimizer;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Seo;
 using SmartStore.Core.Domain.Themes;
diff --git a/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs
index e30149e103..c9ad0b3817 100644
--- a/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs
+++ b/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Newtonsoft.Json.Linq;
 using SmartStore.Collections;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs b/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs
index 48af92da70..d968b16e57 100644
--- a/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 
 namespace SmartStore.Web.Framework.Validators
diff --git a/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs b/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs
index 358471ec92..a7a25ff100 100644
--- a/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs
+++ b/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs
@@ -1,5 +1,5 @@
 using System.Globalization;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using FluentValidation.Resources;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs
index 3490bf69bf..58201fd5b6 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs
@@ -1,5 +1,5 @@
 using System.Web;
-using System.Web.Caching;
+using Microsoft.Extensions.Caching.Memory;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Plugins;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs
index 7aeba68fa7..6e703cb492 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web;
-using System.Web.Caching;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Caching.Memory;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs
index d6e0f936fc..43be2a4ef0 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData.Builder;
 using System.Web.OData.Routing.Conventions;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs
index ddcae71dde..c4c519e376 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs
@@ -4,7 +4,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.WebApi
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs
index fd97e3a26b..06a7cefebc 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs
@@ -3,7 +3,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Reflection;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 
 namespace SmartStore.Web.Framework.WebApi
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs
index a9f9652cb2..6901c60054 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.OData;
 using System.Web.OData.Formatter;
 using Autofac;
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs
index bd5da2861d..154a675d5a 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Net.Http;
-using System.Web.Http;
-using System.Web.Http.Filters;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using System.Web.OData;
 using SmartStore.Web.Framework.WebApi.Caching;
 
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs
index 761652fef7..1ad20711e6 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.Web.Framework.WebApi.Security
 {
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs
index 2194436571..a73b92eba0 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs
@@ -4,9 +4,9 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Security;
-using System.Web;
-using System.Web.Http;
-using System.Web.Http.Controllers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using System.Web.Http.Dependencies;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs
index 8fe2772ae6..129a7f7836 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Net.Http.Formatting;
-using System.Web.Http;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Http.Cors;
 using System.Web.OData.Builder;
 using System.Web.OData.Extensions;
diff --git a/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs b/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs
index 81f76a00a6..80d3f82c17 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Data;
diff --git a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs
index 6aa41a3a49..02b9a98fa5 100644
--- a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs
+++ b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs
index 72d300503a..6b171ec176 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Logging;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Logging;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs
index 30ca59f8d1..6fd7ae2546 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Tasks;
 using SmartStore.Core.Domain.Tasks;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs
index 9bc3eb4767..0610bc2c5d 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Affiliates;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Affiliates;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs
index c667c02534..f0a4db2a7a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Blogs;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Blogs;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs
index b191665c68..9df1939d2b 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Messages;
 using SmartStore.Core.Domain.Messages;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs
index 97ae996019..552644fbac 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Collections;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs
index 26dbe34655..f236382ab3 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Orders;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs
index 88b2d90188..bd86222fa1 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs
@@ -11,9 +11,9 @@
 using System.Security.Principal;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
-using System.Web.Hosting;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Admin.Models.Common;
 using SmartStore.ComponentModel;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs
index 005c2da204..8baeebd24e 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Directory;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs
index 1af8691b17..15b9439cea 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Directory;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs
index de3b8b4ea6..028b23db94 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Admin.Models.Common;
 using SmartStore.Admin.Models.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs
index 301385d5ef..ff31bec95d 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Customers;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs
index 7389e35ab2..46e427f247 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Directory;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs
index 5774588a6a..a26505d907 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Discounts;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Discounts;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs
index 10bd3ba9a0..e6a50cb53c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core.Security;
 using SmartStore.Services.Media;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs
index 9920ce7aaf..d331b7c479 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Messages;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Messages;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs
index 66b1a53782..966d56f5ca 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs
@@ -5,7 +5,7 @@
 using System.Net;
 using System.Net.Mime;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.DataExchange;
 using SmartStore.Admin.Models.Tasks;
 using SmartStore.ComponentModel;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs
index ea0763504a..137763760f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.ExternalAuthentication;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs
index 2a653819b3..516595e531 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Forums;
 using SmartStore.Core.Domain.Forums;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs
index deb1953217..d00fb22aff 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Orders;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Localization;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs
index f3ff837d51..01a185f900 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.ServiceModel.Syndication;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml;
 using SmartStore.Admin.Models.Common;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs
index 545329ad23..f3c96b0563 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs
@@ -5,7 +5,7 @@
 using System.Net;
 using System.Net.Mime;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.DataExchange;
 using SmartStore.Admin.Models.Tasks;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs
index 5d2e461e6d..2743eb76d5 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -10,7 +10,7 @@
 using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml;
 using Autofac;
 using Newtonsoft.Json;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs
index 85ad040de2..6919524d20 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Logging;
 using SmartStore.Core;
 using SmartStore.Core.Logging;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs
index adf4288a47..946eac2e64 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Collections;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs
index e6766f0357..83055a5bfb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Directory;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs
index 3fb02881b6..558001dec3 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs
index 8901d0677f..472adf4afb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Menus;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Data;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
index a93f275fa9..c255e8ff1f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web.Caching;
-using System.Web.Mvc;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Messages;
 using SmartStore.Core.Domain.Messages;
 using SmartStore.Core.Email;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs
index 5425aac503..8a30f431dc 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.News;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs
index b67c10dfc5..c1a9680fbb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Messages;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs
index ea18245aa0..b91c721d33 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Customers;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs
index 29d384242a..39efd15ea1 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs
@@ -3,8 +3,8 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Admin.Models.Dashboard;
 using SmartStore.Admin.Models.Orders;
 using SmartStore.Core;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs
index 25cbafede9..6e1d6f3502 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Logging;
 using SmartStore.Core.Packaging;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs
index db21122082..b9675b1dfa 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Payments;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs
index e372a69409..c4611e4dc4 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Admin.Models.Plugins;
 using SmartStore.Core.Html;
 using SmartStore.Core.Logging;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs
index d28705cab5..051d7363ed 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Polls;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs
index f9d17b5cf5..4cf122ef5a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs
index 4128b0ef51..e77a8f5022 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs
@@ -4,9 +4,8 @@
 using System.Data;
 using System.Linq;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Autofac;
-using NuGet;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Collections;
 using SmartStore.ComponentModel;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs
index 3369e76bb7..33125c8017 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Html;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs
index 2ac8990137..33ad9d8cc4 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Directory;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs
index 15e0d85bb1..c8b9efb18b 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Messages;
 using SmartStore.Core.Domain.Messages;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/RecurringPaymentController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/RecurringPaymentController.cs
index 03a12da26b..794d00dcfd 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/RecurringPaymentController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/RecurringPaymentController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Orders;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs
index 69bd420105..f5aec746a7 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ReturnRequestController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Orders;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Localization;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs
index 697f4d71fa..f294f51782 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs
@@ -7,7 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Core.IO;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs
index a1f86c5b35..5913142cfb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Admin.Models.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs
index 119d3c59af..acd9bd89cf 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Tasks;
 using SmartStore.Core.Async;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs
index d8bc16bc4d..f684149cfb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Logging;
 using SmartStore.Services.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs
index 348079b7e2..03c65fa6dd 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using SmartStore.Admin.Models.Common;
 using SmartStore.Admin.Models.Settings;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs
index 564c6d0652..cc6006af72 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Shipping;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs
index 6f9549f5ae..a6b695822e 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.ShoppingCart;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs
index 7f8be3c231..b32c6bfa8a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Catalog;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs
index 87034f5e4a..935a0e9136 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Store;
 using SmartStore.Admin.Models.Stores;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs
index aeb2b63e16..686a2e7644 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Tax;
 using SmartStore.Core.Domain.Tax;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs
index c6dc7e2442..8d69364045 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Hosting;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Themes;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Themes;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs
index 43fb8f9300..53914acd50 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Topics;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Cms;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs
index d3d10c2397..1779b1dfad 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.UrlRecord;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Seo;
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs
index 30c75e3fcf..d1af476ed9 100644
--- a/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Cms;
 using SmartStore.Core.Domain.Cms;
 using SmartStore.Core.Security;
diff --git a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs
index a1774b5340..84be87178f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Mvc.Html;
 using SmartStore.Admin.Models.Plugins;
 using SmartStore.Web.Framework.Plugins;
diff --git a/src/Presentation/SmartStore.Web/Administration/Infrastructure/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web/Administration/Infrastructure/DependencyRegistrar.cs
index 9bf3584455..3a22848d43 100644
--- a/src/Presentation/SmartStore.Web/Administration/Infrastructure/DependencyRegistrar.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Infrastructure/DependencyRegistrar.cs
@@ -1,5 +1,4 @@
 using Autofac;
-using Autofac.Integration.Mvc;
 using SmartStore.Admin.Controllers;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Presentation/SmartStore.Web/Administration/Infrastructure/PreviewModeFilter.cs b/src/Presentation/SmartStore.Web/Administration/Infrastructure/PreviewModeFilter.cs
index b66adcaeb0..dd2b94a712 100644
--- a/src/Presentation/SmartStore.Web/Administration/Infrastructure/PreviewModeFilter.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Infrastructure/PreviewModeFilter.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Security;
 using SmartStore.Core.Themes;
 using SmartStore.Services;
diff --git a/src/Presentation/SmartStore.Web/Administration/Infrastructure/RouteProvider.cs b/src/Presentation/SmartStore.Web/Administration/Infrastructure/RouteProvider.cs
index 9fce181d5d..e26f01eb13 100644
--- a/src/Presentation/SmartStore.Web/Administration/Infrastructure/RouteProvider.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Infrastructure/RouteProvider.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Routing;
 
 namespace SmartStore.Admin.Infrastructure
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs
index 05ea69c98b..86c64f417c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -10,7 +10,6 @@ public class BlogCommentModel : EntityModelBase
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.BlogPost")]
         public int BlogPostId { get; set; }
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.BlogPost")]
-        [AllowHtml]
         public string BlogPostTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.Customer")]
@@ -20,7 +19,6 @@ public class BlogCommentModel : EntityModelBase
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.IPAddress")]
         public string IpAddress { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.Comment")]
         public string Comment { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs
index 6649b5c257..64faae33eb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs
index 4852e66825..3e3ddc6b2c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -25,19 +25,15 @@ public BlogPostModel()
         public bool IsPublished { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Title")]
-        [AllowHtml]
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Intro")]
-        [AllowHtml]
         public string Intro { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.PreviewDisplayType")]
@@ -77,15 +73,12 @@ public BlogPostModel()
         public DateTime? EndDate { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Common.CreatedOn")]
@@ -117,31 +110,24 @@ public class BlogPostLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Title")]
-        [AllowHtml]
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Intro")]
-        [AllowHtml]
         public string Intro { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs
index dda855bc60..3433aa7df5 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -16,7 +16,6 @@ public BulkEditListModel()
         }
 
         [SmartResourceDisplayName("Admin.Catalog.BulkEdit.List.SearchProductName")]
-        [AllowHtml]
         public string SearchProductName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.BulkEdit.List.SearchCategory")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs
index 4cdb39ce80..9bddc86a4e 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs
@@ -7,14 +7,12 @@ namespace SmartStore.Admin.Models.Catalog
     public class BulkEditProductModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Catalog.BulkEdit.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         public string ProductTypeName { get; set; }
         public string ProductTypeLabelHint { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.BulkEdit.Fields.SKU")]
-        [AllowHtml]
         public string Sku { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.BulkEdit.Fields.Price")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs
index 6f59a7cf50..a741d58280 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -8,7 +8,6 @@ namespace SmartStore.Admin.Models.Catalog
     public class CategoryListModel : ModelBase
     {
         [SmartResourceDisplayName("Admin.Catalog.Categories.List.SearchCategoryName")]
-        [AllowHtml]
         public string SearchCategoryName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.List.SearchAlias")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryModel.cs
index 6d049fefa0..86b4b5410a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -29,26 +29,21 @@ public CategoryModel()
         public int GridPageSize { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.FullName")]
         public string FullName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BottomDescription")]
-        [AllowHtml]
         public string BottomDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.ExternalLink")]
-        [AllowHtml, UIHint("Link")]
         public string ExternalLink { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BadgeText")]
-        [AllowHtml]
         public string BadgeText { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BadgeStyle")]
@@ -59,24 +54,19 @@ public CategoryModel()
         public string Alias { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.CategoryTemplate")]
-        [AllowHtml]
         public int CategoryTemplateId { get; set; }
         public IList<SelectListItem> AvailableCategoryTemplates { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Parent")]
@@ -196,38 +186,30 @@ public class CategoryLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.FullName")]
         public string FullName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BottomDescription")]
-        [AllowHtml]
         public string BottomDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BadgeText")]
-        [AllowHtml]
         public string BadgeText { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs
index 7e2884914f..f1ac9fe1e1 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs
@@ -18,7 +18,6 @@ public CopyProductModel()
         public int NumberOfCopies { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Copy.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Copy.Published")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs
index 053268a0fa..c143afec52 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -8,7 +8,6 @@ namespace SmartStore.Admin.Models.Catalog
     public class ManufacturerListModel : ModelBase
     {
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.List.SearchManufacturerName")]
-        [AllowHtml]
         public string SearchManufacturerName { get; set; }
 
         [UIHint("Stores")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs
index 09d40dfccf..2b675e2244 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -26,36 +26,28 @@ public ManufacturerModel()
         public int GridPageSize { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.BottomDescription")]
-        [AllowHtml]
         public string BottomDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.ManufacturerTemplate")]
-        [AllowHtml]
         public int ManufacturerTemplateId { get; set; }
         public IList<SelectListItem> AvailableManufacturerTemplates { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [UIHint("Media"), AdditionalMetadata("album", "catalog")]
@@ -151,31 +143,24 @@ public class ManufacturerLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.BottomDescription")]
-        [AllowHtml]
         public string BottomDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeModel.cs
index fec73ef90c..2cd0833be5 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Search.Facets;
@@ -17,15 +17,12 @@ public ProductAttributeModel()
             Locales = new List<ProductAttributeLocalizedModel>();
         }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.Alias")]
         public string Alias { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.AllowFiltering")]
@@ -50,15 +47,12 @@ public class ProductAttributeLocalizedModel : ILocalizedModelLocal
     {
         public int LanguageId { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.Alias")]
         public string Alias { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.ProductAttributes.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionModel.cs
index be7248e877..4f90301638 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -24,11 +24,9 @@ public ProductAttributeOptionModel()
         public int ProductVariantAttributeId { get; set; }
         public int ProductAttributeOptionsSetId { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Name")]
         public string Name { get; set; }
         public string NameString { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Alias")]
         public string Alias { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.ColorSquaresRgb")]
@@ -80,10 +78,8 @@ public class ProductAttributeOptionLocalizedModel : ILocalizedModelLocal
     {
         public int LanguageId { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Name")]
         public string Name { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Alias")]
         public string Alias { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs
index 9dacced0bb..e7385d8f8a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs
@@ -7,7 +7,6 @@ public class ProductAttributeOptionsSetModel : EntityModelBase
     {
         public int ProductAttributeId { get; set; }
 
-        [AllowHtml]
         public string Name { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductBundleItemModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductBundleItemModel.cs
index 77bd28833b..93b749aeb7 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductBundleItemModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductBundleItemModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Localization;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs
index a53a7f199c..75ee1e5ff0 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 using Telerik.Web.Mvc;
@@ -19,7 +19,6 @@ public ProductListModel()
         public GridModel<ProductModel> Products { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-        [AllowHtml]
         public string SearchProductName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
@@ -48,7 +47,6 @@ public ProductListModel()
         public bool? SearchHomePageProducts { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.List.GoDirectlyToSku")]
-        [AllowHtml]
         public string GoDirectlyToSku { get; set; }
 
         public bool DisplayProductPictures { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs
index a14dedc49f..f23b62bc85 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -64,24 +64,19 @@ public ProductModel()
         public ProductCondition Condition { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ProductTemplate")]
-        [AllowHtml]
         public int ProductTemplateId { get; set; }
         public IList<SelectListItem> AvailableProductTemplates { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ShortDescription")]
-        [AllowHtml]
         public string ShortDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.FullDescription")]
-        [AllowHtml]
         public string FullDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.AdminComment")]
-        [AllowHtml]
         public string AdminComment { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ShowOnHomePage")]
@@ -91,19 +86,15 @@ public ProductModel()
         public int HomePageDisplayOrder { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.AllowCustomerReviews")]
@@ -114,15 +105,12 @@ public ProductModel()
         public MultiSelectList AvailableProductTags { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.Sku")]
-        [AllowHtml]
         public string Sku { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ManufacturerPartNumber")]
-        [AllowHtml]
         public string ManufacturerPartNumber { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.GTIN")]
-        [AllowHtml]
         public string Gtin { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.CustomsTariffNumber")]
@@ -193,10 +181,8 @@ public ProductModel()
         public bool HasUserAgreement { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.UserAgreementText")]
-        [AllowHtml]
         public string UserAgreementText { get; set; }
 
-        [AllowHtml]
         public string AddChangelog { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.IsRecurring")]
@@ -643,11 +629,9 @@ public class ProductVariantAttributeModel : EntityModelBase
             public string ProductAttribute { get; set; }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Fields.TextPrompt")]
-            [AllowHtml]
             public string TextPrompt { get; set; }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Fields.CustomData")]
-            [AllowHtml]
             public string CustomData { get; set; }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Fields.IsRequired")]
@@ -693,16 +677,13 @@ public ProductVariantAttributeValueModel()
             public int ProductId { get; set; }
             public int ProductVariantAttributeId { get; set; }
 
-            [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Alias")]
             public string Alias { get; set; }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Name")]
-            [AllowHtml]
             public string Name { get; set; }
             public string NameString { get; set; }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.ColorSquaresRgb")]
-            [AllowHtml, UIHint("Color")]
             public string Color { get; set; }
             public bool IsListTypeAttribute { get; set; }
 
@@ -754,7 +735,6 @@ public class ProductVariantAttributeValueLocalizedModel : ILocalizedModelLocal
             public string Alias { get; set; }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Name")]
-            [AllowHtml]
             public string Name { get; set; }
         }
 
@@ -766,31 +746,24 @@ public class ProductLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ShortDescription")]
-        [AllowHtml]
         public string ShortDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.FullDescription")]
-        [AllowHtml]
         public string FullDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.Fields.BundleTitleText")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs
index e0322ae87b..cf051538fd 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -25,11 +25,9 @@ public class ProductReviewModel : EntityModelBase
         [SmartResourceDisplayName("Admin.Catalog.ProductReviews.Fields.IPAddress")]
         public string IpAddress { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.Catalog.ProductReviews.Fields.Title")]
         public string Title { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.Catalog.ProductReviews.Fields.ReviewText")]
         public string ReviewText { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs
index 6df680a2ff..f93ebe46c1 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -13,7 +13,6 @@ public ProductSpecificationAttributeModel()
         }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttribute")]
-        [AllowHtml]
         public string SpecificationAttributeName { get; set; }
 
         public int SpecificationAttributeId { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs
index 90b37241ac..c4c1b68cb4 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -17,7 +17,6 @@ public ProductTagModel()
         }
 
         [SmartResourceDisplayName("Admin.Catalog.ProductTags.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.ProductTags.Published")]
@@ -34,7 +33,6 @@ public class ProductTagLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.ProductTags.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs
index f6b8739322..11944d332f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Services.Catalog.Modelling;
@@ -68,14 +68,12 @@ public ProductVariantAttributeCombinationModel()
         public IList<ProductVariantAttributeModel> ProductVariantAttributes { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.AttributeCombinations.Fields.Attributes")]
-        [AllowHtml]
         public string AttributesXml { get; set; }
 
         [SmartResourceDisplayName("Common.Product")]
         public string ProductUrl { get; set; }
         public string ProductUrlTitle { get; set; }
 
-        [AllowHtml]
         public IList<string> Warnings { get; set; }
 
         public int ProductId { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeModel.cs
index b436e1030c..b48525f946 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Search.Facets;
@@ -20,10 +20,8 @@ public SpecificationAttributeModel()
         }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Alias")]
         public string Alias { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -52,10 +50,8 @@ public class SpecificationAttributeLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Alias")]
         public string Alias { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeOptionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeOptionModel.cs
index 2391475a43..c42a4a2556 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeOptionModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeOptionModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -22,11 +22,9 @@ public SpecificationAttributeOptionModel()
         public int SpecificationAttributeId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
         public string NameString { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Alias")]
         public string Alias { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -41,7 +39,6 @@ public SpecificationAttributeOptionModel()
         public decimal NumberValue { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.ColorSquaresRgb")]
-        [AllowHtml, UIHint("Color")]
         public string Color { get; set; }
 
         [UIHint("Media"), AdditionalMetadata("album", "catalog")]
@@ -54,10 +51,8 @@ public class SpecificationAttributeOptionLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Alias")]
         public string Alias { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs
index 532bdc9705..2f6377971c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -24,61 +24,48 @@ public AddressModel()
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.FirstName")]
-        [AllowHtml]
         public string FirstName { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.LastName")]
-        [AllowHtml]
         public string LastName { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.Email")]
-        [AllowHtml]
         public string Email { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.EmailMatch")]
-        [AllowHtml]
         public string EmailMatch { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.Company")]
-        [AllowHtml]
         public string Company { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.Country")]
         public int? CountryId { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.Country")]
-        [AllowHtml]
         public string CountryName { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.StateProvince")]
         public int? StateProvinceId { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.StateProvince")]
-        [AllowHtml]
         public string StateProvinceName { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.City")]
-        [AllowHtml]
         public string City { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.Address1")]
-        [AllowHtml]
         public string Address1 { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.Address2")]
-        [AllowHtml]
         public string Address2 { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.ZipPostalCode")]
-        [AllowHtml]
         public string ZipPostalCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.PhoneNumber")]
-        [AllowHtml]
         public string PhoneNumber { get; set; }
 
         [SmartResourceDisplayName("Admin.Address.Fields.FaxNumber")]
-        [AllowHtml]
         public string FaxNumber { get; set; }
 
         public IList<SelectListItem> AvailableCountries { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs
index fbd669bddc..03d59b5c99 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs
@@ -12,7 +12,6 @@ public partial class GenericAttributeModel : EntityModelBase
         [SmartResourceDisplayName("Admin.Common.GenericAttributes.Fields.Name")]
         public string Key { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.Common.GenericAttributes.Fields.Value")]
         public string Value { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerListModel.cs
index 4283e747c6..88ae72d7a6 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerListModel.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -15,36 +15,29 @@ public class CustomerListModel : ModelBase
         public int[] SearchCustomerRoleIds { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchEmail")]
-        [AllowHtml]
         public string SearchEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchUsername")]
-        [AllowHtml]
         public string SearchUsername { get; set; }
         public bool UsernamesEnabled { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchTerm")]
-        [AllowHtml]
         public string SearchTerm { get; set; }
 
 
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchDateOfBirth")]
-        [AllowHtml]
         public string SearchDayOfBirth { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchDateOfBirth")]
-        [AllowHtml]
         public string SearchMonthOfBirth { get; set; }
         public bool DateOfBirthEnabled { get; set; }
 
         public bool CompanyEnabled { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchPhone")]
-        [AllowHtml]
         public string SearchPhone { get; set; }
         public bool PhoneEnabled { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchZipCode")]
-        [AllowHtml]
         public string SearchZipPostalCode { get; set; }
         public bool ZipPostalCodeEnabled { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs
index 039acc9718..677628dc57 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Admin.Models.Common;
@@ -31,15 +31,12 @@ public CustomerModel()
         public int GridPageSize { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Username")]
-        [AllowHtml]
         public string Username { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Email")]
-        [AllowHtml]
         public string Email { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Password")]
-        [AllowHtml]
         [DataType(DataType.Password)]
         public string Password { get; set; }
 
@@ -52,10 +49,8 @@ public CustomerModel()
         public string Gender { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.FirstName")]
-        [AllowHtml]
         public string FirstName { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.LastName")]
-        [AllowHtml]
         public string LastName { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.FullName")]
         public string FullName { get; set; }
@@ -66,33 +61,27 @@ public CustomerModel()
 
         public bool CompanyEnabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Company")]
-        [AllowHtml]
         public string Company { get; set; }
 
         public bool CustomerNumberEnabled { get; set; }
         [SmartResourceDisplayName("Account.Fields.CustomerNumber")]
-        [AllowHtml]
         public string CustomerNumber { get; set; }
 
 
         public bool StreetAddressEnabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.StreetAddress")]
-        [AllowHtml]
         public string StreetAddress { get; set; }
 
         public bool StreetAddress2Enabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.StreetAddress2")]
-        [AllowHtml]
         public string StreetAddress2 { get; set; }
 
         public bool ZipPostalCodeEnabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.ZipPostalCode")]
-        [AllowHtml]
         public string ZipPostalCode { get; set; }
 
         public bool CityEnabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.City")]
-        [AllowHtml]
         public string City { get; set; }
 
         public bool CountryEnabled { get; set; }
@@ -107,16 +96,13 @@ public CustomerModel()
 
         public bool PhoneEnabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Phone")]
-        [AllowHtml]
         public string Phone { get; set; }
 
         public bool FaxEnabled { get; set; }
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Fax")]
-        [AllowHtml]
         public string Fax { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.AdminComment")]
-        [AllowHtml]
         public string AdminComment { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.IsTaxExempt")]
@@ -130,7 +116,6 @@ public CustomerModel()
         public string AffiliateFullName { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.TimeZoneId")]
-        [AllowHtml]
         public string TimeZoneId { get; set; }
 
         public bool AllowCustomersToSetTimeZone { get; set; }
@@ -138,7 +123,6 @@ public CustomerModel()
         public IList<SelectListItem> AvailableTimeZones { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.Fields.VatNumber")]
-        [AllowHtml]
         public string VatNumber { get; set; }
 
         public string VatNumberStatusNote { get; set; }
@@ -172,7 +156,6 @@ public CustomerModel()
         public int AddRewardPointsValue { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.Customers.RewardPoints.Fields.AddRewardPointsMessage")]
-        [AllowHtml]
         public string AddRewardPointsMessage { get; set; }
 
         public SendEmailModel SendEmail { get; set; }
@@ -209,7 +192,6 @@ public class RewardPointsHistoryModel : EntityModelBase
             public int PointsBalance { get; set; }
 
             [SmartResourceDisplayName("Admin.Customers.Customers.RewardPoints.Fields.Message")]
-            [AllowHtml]
             public string Message { get; set; }
 
             [SmartResourceDisplayName("Common.CreatedOn")]
@@ -218,12 +200,10 @@ public class RewardPointsHistoryModel : EntityModelBase
 
         public class SendEmailModel : ModelBase
         {
-            [AllowHtml]
             [Required]
             [SmartResourceDisplayName("Admin.Customers.Customers.SendEmail.Subject")]
             public string Subject { get; set; }
 
-            [AllowHtml]
             [Required]
             [SmartResourceDisplayName("Admin.Customers.Customers.SendEmail.Body")]
             public string Body { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs
index b5e1c893b0..7f899dfbac 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Collections;
@@ -21,11 +21,9 @@ public CustomerRoleModel()
         }
 
         [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.FreeShipping")]
-        [AllowHtml]
         public bool FreeShipping { get; set; }
 
         [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.TaxExempt")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs
index ee18791f58..56bfe6eb3c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs
index 64d68ef6eb..da220a6ed4 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.DataExchange;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs
index 9da8dfd484..0b0d6ada52 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Web.Framework;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs
index 7d69c56a12..c9207be3f9 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Admin.Models.Tasks;
@@ -122,7 +122,6 @@ public class ProviderModel
             public string Version { get; set; }
 
             [SmartResourceDisplayName("Common.Description")]
-            [AllowHtml]
             public string Description { get; set; }
 
             [SmartResourceDisplayName("Admin.DataExchange.Export.EntityType")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs
index 85ba2c7d0d..dd6510a04a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Web.Framework;
 
@@ -36,7 +36,6 @@ public class ExportProjectionModel
         public bool DescriptionToPlainText { get; set; }
 
         [SmartResourceDisplayName("Admin.DataExchange.Export.Projection.AppendDescriptionText")]
-        [AllowHtml]
         public string[] AppendDescriptionText { get; set; }
         public MultiSelectList AvailableAppendDescriptionTexts { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs
index 4533bdd5bb..6bf8d2a9f6 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.DataExchange;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs
index ccf8211865..d35429e916 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Admin.Models.Tasks;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs
index 3cd86bdca0..72f47165d1 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -20,7 +20,6 @@ public CountryModel()
         }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.AllowsBilling")]
@@ -30,11 +29,9 @@ public CountryModel()
         public bool AllowsShipping { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.TwoLetterIsoCode")]
-        [AllowHtml]
         public string TwoLetterIsoCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.ThreeLetterIsoCode")]
-        [AllowHtml]
         public string ThreeLetterIsoCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.NumericIsoCode")]
@@ -79,7 +76,6 @@ public class CountryLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs
index 8fe01f7ae8..91f8647884 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Directory;
@@ -31,22 +31,18 @@ public CurrencyModel()
             };
         }
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.CurrencyCode")]
-        [AllowHtml]
         public string CurrencyCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.DisplayLocale")]
-        [AllowHtml]
         public string DisplayLocale { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Rate")]
         public decimal Rate { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.CustomFormatting")]
-        [AllowHtml]
         public string CustomFormatting { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Published")]
@@ -110,7 +106,6 @@ public class CurrencyLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs
index dc59e0084e..e84204b957 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Localization;
@@ -19,16 +19,13 @@ public DeliveryTimeModel()
         }
 
         [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
         public string DeliveryInfo { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.DisplayLocale")]
-        [AllowHtml]
         public string DisplayLocale { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Color")]
-        [AllowHtml]
         public string ColorHexValue { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -51,7 +48,6 @@ public class DeliveryTimeLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs
index 94190bb3c7..02af65f8d9 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -20,11 +20,9 @@ public MeasureDimensionModel()
         public IList<MeasureDimensionLocalizedModel> Locales { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Measures.Dimensions.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Measures.Dimensions.Fields.SystemKeyword")]
-        [AllowHtml]
         public string SystemKeyword { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Measures.Dimensions.Fields.Ratio")]
@@ -42,7 +40,6 @@ public class MeasureDimensionLocalizedModel : ILocalizedModelLocal
     {
         public int LanguageId { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.Name")]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs
index 3dbf5741fc..611b87d47c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -20,11 +20,9 @@ public MeasureWeightModel()
         public IList<MeasureWeightLocalizedModel> Locales { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.SystemKeyword")]
-        [AllowHtml]
         public string SystemKeyword { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.Ratio")]
@@ -42,7 +40,6 @@ public class MeasureWeightLocalizedModel : ILocalizedModelLocal
     {
         public int LanguageId { get; set; }
 
-        [AllowHtml, SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.Name")]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs
index 7f7bfbfaf2..33773bc658 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -23,7 +23,6 @@ public QuantityUnitModel()
         public string NamePlural { get; set; }
 
         [SmartResourceDisplayName("Common.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs
index 419b5b7ee3..e2a5f9331b 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -19,11 +19,9 @@ public StateProvinceModel()
         public int CountryId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Abbreviation")]
-        [AllowHtml]
         public string Abbreviation { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Published")]
@@ -40,7 +38,6 @@ public class StateProvinceLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs
index 194f1c1787..7ddbb23757 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Rules;
@@ -23,7 +23,6 @@ public DiscountModel()
         public int GridPageSize { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.DiscountType")]
@@ -67,7 +66,6 @@ public string FormattedDiscountPercentage
         public bool RequiresCouponCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.CouponCode")]
-        [AllowHtml]
         public string CouponCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.DiscountLimitation")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs
index d78f9cd994..f80cb0bc94 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -23,15 +23,12 @@ public ForumGroupModel()
         }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -67,15 +64,12 @@ public class ForumGroupLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs
index 2606a1a533..0e0d4b2c82 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -25,15 +25,12 @@ public ForumModel()
         public int ForumGroupId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -52,15 +49,12 @@ public class ForumLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs
index f6dee2db8f..60c5677e61 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Localization;
@@ -21,21 +21,17 @@ public LanguageModel()
         }
 
         [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.LanguageCulture")]
-        [AllowHtml]
         public string LanguageCulture { get; set; }
         public List<SelectListItem> AvailableCultures { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.UniqueSeoCode")]
-        [AllowHtml]
         public string UniqueSeoCode { get; set; }
         public List<SelectListItem> AvailableTwoLetterLanguageCodes { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.FlagImageFileName")]
-        [AllowHtml]
         public string FlagImageFileName { get; set; }
         public IList<string> FlagFileNames { get; set; }
         public List<SelectListItem> AvailableFlags { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs
index a0c2d5aca5..34a6856545 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs
@@ -10,15 +10,12 @@ namespace SmartStore.Admin.Models.Localization
     public class LanguageResourceModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Configuration.Languages.Resources.Fields.Name")]
-        [AllowHtml]
         public string ResourceName { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Languages.Resources.Fields.Value")]
-        [AllowHtml]
         public string ResourceValue { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Languages.Resources.Fields.LanguageName")]
-        [AllowHtml]
         public string LanguageName { get; set; }
 
         public int LanguageId { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs
index e3c8e69d1c..32fc307e80 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -21,7 +21,6 @@ public class ActivityLogSearchModel : ModelBase
         public DateTime? CreatedOnTo { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.ActivityLog.ActivityLog.Fields.CustomerEmail")]
-        [AllowHtml]
         public string CustomerEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.ActivityLog.ActivityLog.Fields.CustomerSystemAccount")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs
index 2d5ca0c635..d6d23561df 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -20,7 +20,6 @@ public LogListModel()
         public DateTime? CreatedOnTo { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.List.Message")]
-        [AllowHtml]
         public string Message { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.List.LogLevel")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs
index 931999c1d6..ceed6e66c1 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -13,15 +13,12 @@ public class LogModel : EntityModelBase
         public string LogLevel { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.Fields.ShortMessage")]
-        [AllowHtml]
         public string ShortMessage { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.Fields.FullMessage")]
-        [AllowHtml]
         public string FullMessage { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.Fields.IPAddress")]
-        [AllowHtml]
         public string IpAddress { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.Fields.Customer")]
@@ -30,11 +27,9 @@ public class LogModel : EntityModelBase
         public string CustomerEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.Fields.PageURL")]
-        [AllowHtml]
         public string PageUrl { get; set; }
 
         [SmartResourceDisplayName("Admin.System.Log.Fields.ReferrerURL")]
-        [AllowHtml]
         public string ReferrerUrl { get; set; }
 
         [SmartResourceDisplayName("Common.CreatedOn")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs
index ea76f5ae59..8362635d06 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Collections;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs
index cfb9520676..9fb11aa57b 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs
index 07d698a126..3067f9c5fe 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Collections;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs
index 01be797a68..28ed257820 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Collections;
@@ -14,15 +14,12 @@ namespace SmartStore.Admin.Models.Messages
     public class CampaignModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.Subject")]
-        [AllowHtml]
         public string Subject { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Common.CreatedOn")]
@@ -32,7 +29,6 @@ public class CampaignModel : EntityModelBase
         public TreeNode<ModelTreeMember> LastModelTree { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.TestEmail")]
-        [AllowHtml]
         public string TestEmail { get; set; }
 
         // ACL.
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs
index 76aaa4eeee..9bbe7004ac 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -11,26 +11,21 @@ namespace SmartStore.Admin.Models.Messages
     public class EmailAccountModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Email")]
-        [AllowHtml]
         public string Email { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.DisplayName")]
-        [AllowHtml]
         public string DisplayName { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Host")]
-        [AllowHtml]
         public string Host { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Port")]
         public int Port { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Username")]
-        [AllowHtml]
         public string Username { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Password")]
-        [AllowHtml]
         [DataType(DataType.Password)]
         public string Password { get; set; }
 
@@ -45,7 +40,6 @@ public class EmailAccountModel : EntityModelBase
 
 
         [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.SendTestEmailTo")]
-        [AllowHtml]
         public string SendTestEmailTo { get; set; }
 
         public string TestEmailShortErrorMessage { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs
index 49f44c710b..9ae8661f18 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs
index a576538e80..854f3d280f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Web.Script.Serialization;
 using FluentValidation;
 using FluentValidation.Attributes;
@@ -26,15 +26,12 @@ public MessageTemplateModel()
         public TreeNode<string> TokensTree { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.To")]
-        [AllowHtml]
         public string To { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.ReplyTo")]
-        [AllowHtml]
         public string ReplyTo { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.AllowedTokens")]
@@ -42,15 +39,12 @@ public MessageTemplateModel()
         public string LastModelTree { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.BccEmailAddresses")]
-        [AllowHtml]
         public string BccEmailAddresses { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Subject")]
-        [AllowHtml]
         public string Subject { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Common.Active")]
@@ -92,23 +86,18 @@ public class MessageTemplateLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.To")]
-        [AllowHtml]
         public string To { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.ReplyTo")]
-        [AllowHtml]
         public string ReplyTo { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.BccEmailAddresses")]
-        [AllowHtml]
         public string BccEmailAddresses { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Subject")]
-        [AllowHtml]
         public string Subject { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.EmailAccount")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs
index cb4660d07d..ea39dadd74 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 using Telerik.Web.Mvc;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs
index 0ee6ae06f7..85651813f7 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -11,7 +11,6 @@ namespace SmartStore.Admin.Models.Messages
     public class NewsLetterSubscriptionModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Promotions.NewsLetterSubscriptions.Fields.Email")]
-        [AllowHtml]
         public string Email { get; set; }
 
         [SmartResourceDisplayName("Admin.Promotions.NewsLetterSubscriptions.Fields.Active")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs
index a0168ab522..aba4a9b175 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -20,11 +20,9 @@ public QueuedEmailListModel()
         public DateTime? SearchEndDate { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.List.FromEmail")]
-        [AllowHtml]
         public string SearchFromEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.List.ToEmail")]
-        [AllowHtml]
         public string SearchToEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.List.LoadNotSent")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs
index ac52d10c7f..73127d9e3f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -27,27 +27,21 @@ public QueuedEmailModel()
         public int Priority { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.From")]
-        [AllowHtml]
         public string From { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.To")]
-        [AllowHtml]
         public string To { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.CC")]
-        [AllowHtml]
         public string CC { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.Bcc")]
-        [AllowHtml]
         public string Bcc { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.Subject")]
-        [AllowHtml]
         public string Subject { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Common.CreatedOn")]
@@ -61,7 +55,6 @@ public QueuedEmailModel()
         public DateTime? SentOn { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.EmailAccountName")]
-        [AllowHtml]
         public string EmailAccountName { get; set; }
 
         [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.SendManually")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs
index 4c302803e9..decfbd7376 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -11,7 +11,6 @@ public class NewsCommentModel : EntityModelBase
         public int NewsItemId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.NewsItem")]
-        [AllowHtml]
         public string NewsItemTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.Customer")]
@@ -21,11 +20,9 @@ public class NewsCommentModel : EntityModelBase
         [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.IPAddress")]
         public string IpAddress { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.CommentTitle")]
         public string CommentTitle { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.CommentText")]
         public string CommentText { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs
index abd51ca1fe..f996fcf0f4 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs
index f48c5c8843..ca23028d96 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -22,19 +22,15 @@ public NewsItemModel()
         }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Title")]
-        [AllowHtml]
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Short")]
-        [AllowHtml]
         public string Short { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Full")]
-        [AllowHtml]
         public string Full { get; set; }
 
         [UIHint("Media"), AdditionalMetadata("album", "content")]
@@ -55,15 +51,12 @@ public NewsItemModel()
         public DateTime? EndDate { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Published")]
@@ -101,31 +94,24 @@ public class NewsItemLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Title")]
-        [AllowHtml]
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Short")]
-        [AllowHtml]
         public string Short { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Full")]
-        [AllowHtml]
         public string Full { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs
index e1876a87d8..c9c1163f3f 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs
index d4314fef1f..a5a198ed1a 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework.Modelling;
 
 namespace SmartStore.Admin.Models.Orders
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs
index 7a47e88370..27aaaeaab9 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -22,11 +22,9 @@ public CheckoutAttributeModel()
         public bool IsActive { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.TextPrompt")]
-        [AllowHtml]
         public string TextPrompt { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.IsRequired")]
@@ -45,7 +43,6 @@ public CheckoutAttributeModel()
         [SmartResourceDisplayName("Admin.Catalog.Attributes.AttributeControlType")]
         public int AttributeControlTypeId { get; set; }
         [SmartResourceDisplayName("Admin.Catalog.Attributes.AttributeControlType")]
-        [AllowHtml]
         public string AttributeControlTypeName { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -67,11 +64,9 @@ public class CheckoutAttributeLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.TextPrompt")]
-        [AllowHtml]
         public string TextPrompt { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs
index ac09dbdca0..4b1effbffc 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -20,7 +20,6 @@ public CheckoutAttributeValueModel()
         public int CheckoutAttributeId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Values.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
         public string NameString { get; set; }
 
@@ -43,7 +42,6 @@ public CheckoutAttributeValueModel()
         public int? MediaFileId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Values.Fields.Color")]
-        [AllowHtml, UIHint("Color")]
         public string Color { get; set; }
 
         public bool IsListTypeAttribute { get; set; }
@@ -55,7 +53,6 @@ public class CheckoutAttributeValueLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Values.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs
index 2451a82251..a10cfb90a2 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -15,7 +15,6 @@ public GiftCardListModel()
         public int GridPageSize { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.List.CouponCode")]
-        [AllowHtml]
         public string CouponCode { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.List.Activated")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs
index 624d2d0202..74621d8b73 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -26,27 +26,21 @@ public class GiftCardModel : EntityModelBase
         public bool IsGiftCardActivated { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.GiftCardCouponCode")]
-        [AllowHtml]
         public string GiftCardCouponCode { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.RecipientName")]
-        [AllowHtml]
         public string RecipientName { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.RecipientEmail")]
-        [AllowHtml]
         public string RecipientEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.SenderName")]
-        [AllowHtml]
         public string SenderName { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.SenderEmail")]
-        [AllowHtml]
         public string SenderEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.Message")]
-        [AllowHtml]
         public string Message { get; set; }
 
         [SmartResourceDisplayName("Admin.GiftCards.Fields.IsRecipientNotified")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs
index da54b75e99..c21049f5be 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -24,7 +24,6 @@ public OrderListModel()
         public DateTime? EndDate { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.List.CustomerEmail")]
-        [AllowHtml]
         public string CustomerEmail { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.List.CustomerName")]
@@ -46,15 +45,12 @@ public OrderListModel()
         public string PaymentMethods { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.List.OrderGuid")]
-        [AllowHtml]
         public string OrderGuid { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.List.OrderNumber")]
-        [AllowHtml]
         public string OrderNumber { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.List.GoDirectlyToNumber")]
-        [AllowHtml]
         public string GoDirectlyToNumber { get; set; }
 
         public int GridPageSize { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs
index fe536fdf03..b303860934 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Common;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Orders;
@@ -202,51 +202,38 @@ public string PaymentStatusLabelClass
         //credit card info
         public bool AllowStoringCreditCardNumber { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.CardType")]
-        [AllowHtml]
         public string CardType { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.CardName")]
-        [AllowHtml]
         public string CardName { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.CardNumber")]
-        [AllowHtml]
         public string CardNumber { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.CardCVV2")]
-        [AllowHtml]
         public string CardCvv2 { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.CardExpirationMonth")]
-        [AllowHtml]
         public string CardExpirationMonth { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.CardExpirationYear")]
-        [AllowHtml]
         public string CardExpirationYear { get; set; }
 
         public bool AllowStoringDirectDebit { get; set; }
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitAccountHolder")]
-        [AllowHtml]
         public string DirectDebitAccountHolder { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitAccountNumber")]
-        [AllowHtml]
         public string DirectDebitAccountNumber { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitBankCode")]
-        [AllowHtml]
         public string DirectDebitBankCode { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitBankName")]
-        [AllowHtml]
         public string DirectDebitBankName { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitBIC")]
-        [AllowHtml]
         public string DirectDebitBIC { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitCountry")]
-        [AllowHtml]
         public string DirectDebitCountry { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitIban")]
-        [AllowHtml]
         public string DirectDebitIban { get; set; }
 
         //misc payment info
@@ -342,7 +329,6 @@ public string ShippingStatusLabelClass
         [SmartResourceDisplayName("Admin.Orders.OrderNotes.Fields.AddOrderNoteDisplayToCustomer")]
         public bool AddOrderNoteDisplayToCustomer { get; set; }
         [SmartResourceDisplayName("Admin.Orders.OrderNotes.Fields.AddOrderNoteMessage")]
-        [AllowHtml]
         public string AddOrderNoteMessage { get; set; }
 
         public bool DisplayPdfInvoice { get; set; }
@@ -525,7 +511,6 @@ public AddOrderProductModel()
             }
 
             [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")]
-            [AllowHtml]
             public string SearchProductName { get; set; }
             [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")]
             public int SearchCategoryId { get; set; }
@@ -545,11 +530,9 @@ public AddOrderProductModel()
             public class ProductModel : EntityModelBase
             {
                 [SmartResourceDisplayName("Admin.Orders.Products.AddNew.Name")]
-                [AllowHtml]
                 public string Name { get; set; }
 
                 [SmartResourceDisplayName("Admin.Orders.Products.AddNew.SKU")]
-                [AllowHtml]
                 public string Sku { get; set; }
 
                 public string ProductTypeName { get; set; }
@@ -645,19 +628,14 @@ public class GiftCardModel : ModelBase
                 public bool IsGiftCard { get; set; }
 
                 [SmartResourceDisplayName("Products.GiftCard.RecipientName")]
-                [AllowHtml]
                 public string RecipientName { get; set; }
                 [SmartResourceDisplayName("Products.GiftCard.RecipientEmail")]
-                [AllowHtml]
                 public string RecipientEmail { get; set; }
                 [SmartResourceDisplayName("Products.GiftCard.SenderName")]
-                [AllowHtml]
                 public string SenderName { get; set; }
                 [SmartResourceDisplayName("Products.GiftCard.SenderEmail")]
-                [AllowHtml]
                 public string SenderEmail { get; set; }
                 [SmartResourceDisplayName("Products.GiftCard.Message")]
-                [AllowHtml]
                 public string Message { get; set; }
 
                 public GiftCardType GiftCardType { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs
index 9b8348f3b2..78f0563aeb 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs
index 7ef963d26b..436c43c506 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
@@ -46,12 +46,10 @@ public ReturnRequestModel()
         [SmartResourceDisplayName("Admin.ReturnRequests.Fields.Quantity")]
         public int Quantity { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ReturnRequests.Fields.ReasonForReturn")]
         public string ReasonForReturn { get; set; }
         public IList<SelectListItem> AvailableReasonForReturn { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ReturnRequests.Fields.RequestedAction")]
         public string RequestedAction { get; set; }
         public IList<SelectListItem> AvailableRequestedAction { get; set; }
@@ -59,11 +57,9 @@ public ReturnRequestModel()
         [SmartResourceDisplayName("Admin.ReturnRequests.Fields.RequestedActionUpdatedOnUtc")]
         public DateTime? RequestedActionUpdated { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ReturnRequests.Fields.CustomerComments")]
         public string CustomerComments { get; set; }
 
-        [AllowHtml]
         [SmartResourceDisplayName("Admin.ReturnRequests.Fields.StaffNotes")]
         public string StaffNotes { get; set; }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs
index e482cec467..2c86c00bb2 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -14,7 +14,6 @@ public class ShipmentListModel : ModelBase
         public DateTime? EndDate { get; set; }
 
         [SmartResourceDisplayName("Admin.Orders.Shipments.List.TrackingNumber")]
-        [AllowHtml]
         public string TrackingNumber { get; set; }
 
         public bool DisplayPdfPackagingSlip { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs
index 58165e5635..e42d69a905 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Rules;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Localization;
@@ -25,11 +25,9 @@ public PaymentMethodEditModel()
         public string FriendlyName { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.ShortDescription")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.FullDescription")]
-        [AllowHtml]
         public string FullDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.RoundOrderTotalEnabled")]
@@ -60,11 +58,9 @@ public class PaymentMethodLocalizedModel : ILocalizedModelLocal
         public string FriendlyName { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.ShortDescription")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.FullDescription")]
-        [AllowHtml]
         public string FullDescription { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs
index 0094d97af9..5c77d36492 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -18,27 +18,21 @@ public PluginModel()
         }
 
         [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.Group")]
-        [AllowHtml]
         public string Group { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.FriendlyName")]
-        [AllowHtml]
         public string FriendlyName { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.SystemName")]
-        [AllowHtml]
         public string SystemName { get; set; }
 
         [SmartResourceDisplayName("Common.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.Version")]
-        [AllowHtml]
         public string Version { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.Author")]
-        [AllowHtml]
         public string Author { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -71,11 +65,9 @@ public class PluginLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.FriendlyName")]
-        [AllowHtml]
         public string FriendlyName { get; set; }
 
         [SmartResourceDisplayName("Common.Description")]
-        [AllowHtml]
         public string Description { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs
index 0c6192f710..e4b00c1ea3 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs
@@ -12,7 +12,6 @@ public class PollAnswerModel : EntityModelBase
         public int PollId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Polls.Answers.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Polls.Answers.Fields.NumberOfVotes")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs
index 056a4fa370..c080075868 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -20,15 +20,12 @@ public class PollModel : EntityModelBase
         public List<SelectListItem> AvailableLanguages { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.Language")]
-        [AllowHtml]
         public string LanguageName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.SystemKeyword")]
-        [AllowHtml]
         public string SystemKeyword { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.Published")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs
index 0004322dea..45d1b8940b 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Catalog;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs
index 1e55a4ce33..1c0fe1c6d0 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs
index 72797cc87c..cd3a2751be 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using SmartStore.Core.Domain.Forums;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs
index 1dadc0d5c2..bc01fd17a6 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Localization;
@@ -106,7 +106,6 @@ public SeoSettingsModel()
             }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeparator")]
-            [AllowHtml]
             public string PageTitleSeparator { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeoAdjustment")]
@@ -175,11 +174,9 @@ public SeoSettingsModel()
         public partial class SecuritySettingsModel
         {
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.EncryptionKey")]
-            [AllowHtml]
             public string EncryptionKey { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.AdminAreaAllowedIpAddresses")]
-            [AllowHtml]
             public string AdminAreaAllowedIpAddresses { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.HideAdminMenuItemsBasedOnPermissions")]
@@ -225,11 +222,9 @@ public partial class CaptchaSettingsModel
             public bool ShowOnProductReviewPage { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.reCaptchaPublicKey")]
-            [AllowHtml]
             public string ReCaptchaPublicKey { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.reCaptchaPrivateKey")]
-            [AllowHtml]
             public string ReCaptchaPrivateKey { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.UseInvisibleReCaptcha")]
@@ -327,7 +322,6 @@ public CompanyInformationSettingsModel()
             public int? CountryId { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.CompanyInformationSettings.Country")]
-            [AllowHtml]
             public string CountryName { get; set; }
 
             [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.CompanyInformationSettings.State")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs
index d66ee9a14f..d524141129 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs
index f07b423597..e3207092f0 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Orders;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs
index 7147160843..79ed2c7261 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs
index 180647e420..ecd1934aef 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Localization;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs
index 3a3318684a..33169516dd 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs
@@ -10,11 +10,9 @@ namespace SmartStore.Admin.Models.Settings
     public class SettingModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Configuration.Settings.AllSettings.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Settings.AllSettings.Fields.Value")]
-        [AllowHtml]
         public string Value { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Settings.AllSettings.Fields.StoreName")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs
index a20c6b3149..fc8e4ef119 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Common;
 using SmartStore.Web.Framework;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs
index fca9556d03..d2b5519d45 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Web.Framework;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs
index 4eed795322..57333baf78 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework.Modelling;
 
 namespace SmartStore.Admin.Models.Settings
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs
index 67a5f799c7..d85425ce81 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Admin.Models.Common;
 using SmartStore.Core.Domain.Tax;
 using SmartStore.Web.Framework;
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs
index 099202217c..581c03f472 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Rules;
@@ -19,11 +19,9 @@ public ShippingMethodModel()
         }
 
         [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
@@ -58,11 +56,9 @@ public class ShippingMethodLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Description")]
-        [AllowHtml]
         public string Description { get; set; }
     }
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs
index e86fca9c7e..6fe5e5c518 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Localization;
@@ -14,25 +14,21 @@ namespace SmartStore.Admin.Models.Stores
     public partial class StoreModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.Url")]
-        [AllowHtml]
         public string Url { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.SslEnabled")]
         public virtual bool SslEnabled { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.SecureUrl")]
-        [AllowHtml]
         public virtual string SecureUrl { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.ForceSslForAllPages")]
         public bool ForceSslForAllPages { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.Hosts")]
-        [AllowHtml]
         public string Hosts { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.StoreLogo")]
@@ -67,7 +63,6 @@ public partial class StoreModel : EntityModelBase
         public string HtmlBodyId { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.ContentDeliveryNetwork")]
-        [AllowHtml]
         public string ContentDeliveryNetwork { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.PrimaryStoreCurrencyId")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs
index ef82ca8ec6..c5e7ccf4ff 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Tasks;
@@ -15,7 +15,6 @@ namespace SmartStore.Admin.Models.Tasks
     public partial class ScheduleTaskModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.System.ScheduleTasks.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Admin.System.ScheduleTasks.CronExpression")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs
index f6a80738d3..05a80ae036 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs
@@ -10,7 +10,6 @@ namespace SmartStore.Admin.Models.Tax
     public class TaxCategoryModel : EntityModelBase
     {
         [SmartResourceDisplayName("Admin.Configuration.Tax.Categories.Fields.Name")]
-        [AllowHtml]
         public string Name { get; set; }
 
         [SmartResourceDisplayName("Common.DisplayOrder")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs
index 7f1be3caad..24fcd4bbd7 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs
index 093dee07c1..4c3a8ade14 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs
index 07ad1c55ab..014160a8de 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs
index fe9bb3cb4b..c8049507dc 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.ComponentModel;
@@ -57,7 +57,6 @@ public TopicModel()
         public IList<SelectListItem> AvailableCookieTypes { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.SystemName")]
-        [AllowHtml]
         public string SystemName { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.HtmlId")]
@@ -77,35 +76,27 @@ public TopicModel()
         public string Password { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.URL")]
-        [AllowHtml]
         public string Url { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.ShortTitle")]
-        [AllowHtml]
         public string ShortTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Title")]
-        [AllowHtml]
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Intro")]
-        [AllowHtml]
         public string Intro { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
@@ -151,31 +142,24 @@ public class TopicLocalizedModel : ILocalizedModelLocal
         public int LanguageId { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.ShortTitle")]
-        [AllowHtml]
         public string ShortTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Title")]
-        [AllowHtml]
         public string Title { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Intro")]
-        [AllowHtml]
         public string Intro { get; set; }
 
         [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Body")]
-        [AllowHtml]
         public string Body { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")]
-        [AllowHtml]
         public string MetaKeywords { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")]
-        [AllowHtml]
         public string MetaDescription { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")]
-        [AllowHtml]
         public string MetaTitle { get; set; }
 
         [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs
index 4d3aa2638b..c534af5ee5 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
@@ -10,7 +10,6 @@ public partial class UrlRecordListModel : ModelBase
         public int GridPageSize { get; set; }
 
         [SmartResourceDisplayName("Admin.System.SeNames.Name")]
-        [AllowHtml]
         public string SeName { get; set; }
 
         [SmartResourceDisplayName("Admin.System.SeNames.EntityName")]
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs
index f53aa35645..8261eed59c 100644
--- a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs
+++ b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj
index 27cf819bdf..61192a3d30 100644
--- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj
+++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj
@@ -1,1390 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{152C761A-DD2E-4C1F-AF89-DFB2547A3BCA}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Admin</RootNamespace>
     <AssemblyName>SmartStore.Admin</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkProfile />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
-    <NuGetPackageImportStamp>1e5b888b</NuGetPackageImportStamp>
-    <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress />
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.XmlTransform, Version=3.0.0.34420, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="SmartStore.Licensing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\lib\SmartStore.Licensing\SmartStore.Licensing.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.Mvc, Version=2012.2.607.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\lib\Telerik\Telerik.Web.Mvc.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="Controllers\ActivityLogController.cs" />
-    <Compile Include="Controllers\AffiliateController.cs" />
-    <Compile Include="Controllers\BlogController.cs" />
-    <Compile Include="Controllers\CampaignController.cs" />
-    <Compile Include="Controllers\CategoryController.cs" />
-    <Compile Include="Controllers\CheckoutAttributeController.cs" />
-    <Compile Include="Controllers\CommonController.cs" />
-    <Compile Include="Controllers\CountryController.cs" />
-    <Compile Include="Controllers\CurrencyController.cs" />
-    <Compile Include="Controllers\CustomerController.cs" />
-    <Compile Include="Controllers\CustomerRoleController.cs" />
-    <Compile Include="Controllers\ExportController.cs" />
-    <Compile Include="Controllers\ImportController.cs" />
-    <Compile Include="Controllers\MenuController.cs" />
-    <Compile Include="Controllers\QuantityUnitController.cs" />
-    <Compile Include="Controllers\DeliveryTimeController.cs" />
-    <Compile Include="Controllers\DiscountController.cs" />
-    <Compile Include="Controllers\DownloadController.cs" />
-    <Compile Include="Controllers\EmailAccountController.cs" />
-    <Compile Include="Controllers\ExternalAuthenticationController.cs" />
-    <Compile Include="Controllers\ForumController.cs" />
-    <Compile Include="Controllers\GiftCardController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\LanguageController.cs" />
-    <Compile Include="Controllers\LogController.cs" />
-    <Compile Include="Controllers\ManufacturerController.cs" />
-    <Compile Include="Controllers\MeasureController.cs" />
-    <Compile Include="Controllers\MessageTemplateController.cs" />
-    <Compile Include="Controllers\NewsController.cs" />
-    <Compile Include="Controllers\NewsLetterSubscriptionController.cs" />
-    <Compile Include="Controllers\OnlineCustomerController.cs" />
-    <Compile Include="Controllers\OrderController.cs" />
-    <Compile Include="Controllers\PackagingController.cs" />
-    <Compile Include="Controllers\PaymentController.cs" />
-    <Compile Include="Controllers\MediaController.cs" />
-    <Compile Include="Controllers\PluginController.cs" />
-    <Compile Include="Controllers\PollController.cs" />
-    <Compile Include="Controllers\ProductAttributeController.cs" />
-    <Compile Include="Controllers\ProductController.cs" />
-    <Compile Include="Controllers\ProductReviewController.cs" />
-    <Compile Include="Controllers\QueuedEmailController.cs" />
-    <Compile Include="Controllers\RecurringPaymentController.cs" />
-    <Compile Include="Controllers\ReturnRequestController.cs" />
-    <Compile Include="Controllers\RoxyFileManagerController.cs" />
-    <Compile Include="Controllers\RuleController.cs" />
-    <Compile Include="Controllers\ScheduleTaskController.cs" />
-    <Compile Include="Controllers\AdminModelHelper.cs" />
-    <Compile Include="Controllers\SecurityController.cs" />
-    <Compile Include="Controllers\UrlRecordController.cs" />
-    <Compile Include="Controllers\SettingController.cs" />
-    <Compile Include="Controllers\ShippingController.cs" />
-    <Compile Include="Controllers\ShoppingCartController.cs" />
-    <Compile Include="Controllers\SpecificationAttributeController.cs" />
-    <Compile Include="Controllers\StoreController.cs" />
-    <Compile Include="Controllers\TaxController.cs" />
-    <Compile Include="Controllers\ThemeController.cs" />
-    <Compile Include="Controllers\TopicController.cs" />
-    <Compile Include="Controllers\WidgetController.cs" />
-    <Compile Include="Extensions\HtmlHelperExtensions.cs" />
-    <Compile Include="Infrastructure\AdminMenu.cs" />
-    <Compile Include="Infrastructure\DependencyRegistrar.cs" />
-    <Compile Include="Infrastructure\PreviewModeFilter.cs" />
-    <Compile Include="Infrastructure\RouteProvider.cs" />
-    <Compile Include="Infrastructure\SettingsMenu.cs" />
-    <Compile Include="MappingExtensions.cs" />
-    <Compile Include="Infrastructure\AdminStartupTask.cs" />
-    <Compile Include="Models\Blogs\BlogListModel.cs" />
-    <Compile Include="Models\Catalog\CategoryTreeModel.cs" />
-    <Compile Include="Models\Catalog\ProductAttributeOptionModel.cs" />
-    <Compile Include="Models\Catalog\ProductAttributeOptionsSetModel.cs" />
-    <Compile Include="Models\Catalog\ProductBundleItemModel.cs" />
-    <Compile Include="Models\Catalog\ProductVariantAttributeCombinationModel.cs" />
-    <Compile Include="Models\Catalog\BulkEditProductModel.cs" />
-    <Compile Include="Models\Catalog\BulkEditListModel.cs" />
-    <Compile Include="Models\Catalog\CategoryListModel.cs" />
-    <Compile Include="Models\Catalog\ManufacturerListModel.cs" />
-    <Compile Include="Models\Catalog\ProductReviewListModel.cs" />
-    <Compile Include="Models\Catalog\ManufacturerModel.cs" />
-    <Compile Include="Models\Catalog\CopyProductModel.cs" />
-    <Compile Include="Models\Cms\WidgetModel.cs" />
-    <Compile Include="Models\Common\CheckUpdateResult.cs" />
-    <Compile Include="Models\Common\FeedItemModel.cs" />
-    <Compile Include="Models\Common\GenericAttributeModel.cs" />
-    <Compile Include="Models\Common\LanguageSelectorModel.cs" />
-    <Compile Include="Models\Common\MaintenanceModel.cs" />
-    <Compile Include="Models\Common\SystemWarningModel.cs" />
-    <Compile Include="Models\Common\SystemInfoModel.cs" />
-    <Compile Include="Models\Customers\RegisteredCustomersDashboardReportModel.cs" />
-    <Compile Include="Models\Customers\CustomerRoleMappingModel.cs" />
-    <Compile Include="Models\Customers\TopCustomersDashboardReportModel.cs" />
-    <Compile Include="Models\Dashboard\DashboardChartReportModel.cs" />
-    <Compile Include="Models\DataExchange\CsvConfigurationModel.cs" />
-    <Compile Include="Models\DataExchange\ExportDeploymentModel.cs" />
-    <Compile Include="Models\DataExchange\ExportFilterModel.cs" />
-    <Compile Include="Models\DataExchange\ImportProfileListModel.cs" />
-    <Compile Include="Models\DataExchange\ImportProfileModel.cs" />
-    <Compile Include="Models\DataExchange\ProfileInfoForProviderModel.cs" />
-    <Compile Include="Models\DataExchange\ExportPreviewModel.cs" />
-    <Compile Include="Models\DataExchange\ExportProjectionModel.cs" />
-    <Compile Include="Models\Directory\CountryListModel.cs" />
-    <Compile Include="Models\Directory\QuantityUnitModel.cs" />
-    <Compile Include="Models\DataExchange\ExportProfileModel.cs" />
-    <Compile Include="Models\Localization\AvailableLanguageModel.cs" />
-    <Compile Include="Models\Localization\CheckAvailableResourcesResult.cs" />
-    <Compile Include="Models\Menus\MenuItemRecordModel.cs" />
-    <Compile Include="Models\Menus\MenuRecordListModel.cs" />
-    <Compile Include="Models\Menus\MenuRecordModel.cs" />
-    <Compile Include="Models\Messages\MessageTemplateListModel.cs" />
-    <Compile Include="Models\Messages\MessageTemplatePreviewModel.cs" />
-    <Compile Include="Models\News\NewsItemListModel.cs" />
-    <Compile Include="Models\Orders\AutoUpdateOrderItemModel.cs" />
-    <Compile Include="Models\Orders\BestsellersDashboardReportModel.cs" />
-    <Compile Include="Models\Orders\CheckoutAttributeListModel.cs" />
-    <Compile Include="Models\Orders\LatestOrdersDashboardReportModel.cs" />
-    <Compile Include="Models\Orders\ReturnRequestListModel.cs" />
-    <Compile Include="Models\Payments\PaymentMethodEditModel.cs" />
-    <Compile Include="Models\Plugins\LicenseLabelModel.cs" />
-    <Compile Include="Models\Plugins\LicensePluginModel.cs" />
-    <Compile Include="Models\Plugins\LocalPluginsModel.cs" />
-    <Compile Include="Models\Plugins\ProviderModelList.cs" />
-    <Compile Include="Models\Polls\PollVotingRecordModel.cs" />
-    <Compile Include="Models\Rules\RuleEditItem.cs" />
-    <Compile Include="Models\Rules\RuleSetModel.cs" />
-    <Compile Include="Models\Rules\RuleSetListModel.cs" />
-    <Compile Include="Models\Rules\RuleSelectItem.cs" />
-    <Compile Include="Models\Settings\ForumSearchSettingsModel.cs" />
-    <Compile Include="Models\Settings\PaymentSettingsModel.cs" />
-    <Compile Include="Models\Settings\SearchSettingsModel.cs" />
-    <Compile Include="Models\Settings\DataExchangeSettingsModel.cs" />
-    <Compile Include="Models\Stores\StoreDashboardReportModel.cs" />
-    <Compile Include="Models\Tasks\ScheduleTaskHistoryModel.cs" />
-    <Compile Include="Models\UrlRecord\UrlRecordListModel.cs" />
-    <Compile Include="Models\UrlRecord\UrlRecordModel.cs" />
-    <Compile Include="Models\Customers\OnlineCustomerModel.cs" />
-    <Compile Include="Models\Directory\DeliveryTimeModel.cs" />
-    <Compile Include="Models\ExternalAuthentication\AuthenticationMethodModel.cs" />
-    <Compile Include="Models\Logging\LogListModel.cs" />
-    <Compile Include="Models\Messages\NewsLetterSubscriptionListModel.cs" />
-    <Compile Include="Models\Orders\ShipmentListModel.cs" />
-    <Compile Include="Models\Orders\ShipmentModel.cs" />
-    <Compile Include="Models\Orders\NeverSoldReportLineModel.cs" />
-    <Compile Include="Models\Orders\NeverSoldReportModel.cs" />
-    <Compile Include="Models\Plugins\PluginModel.cs" />
-    <Compile Include="Models\Polls\PollAnswerModel.cs" />
-    <Compile Include="Models\Polls\PollModel.cs" />
-    <Compile Include="Models\Logging\ActivityLogModel.cs" />
-    <Compile Include="Models\Logging\ActivityLogSearchModel.cs" />
-    <Compile Include="Models\Logging\ActivityLogTypeModel.cs" />
-    <Compile Include="Models\Common\AddressModel.cs" />
-    <Compile Include="Models\Catalog\CategoryModel.cs" />
-    <Compile Include="Models\Orders\CheckoutAttributeModel.cs" />
-    <Compile Include="Models\Orders\CheckoutAttributeValueModel.cs" />
-    <Compile Include="Models\Affiliates\AffiliateModel.cs" />
-    <Compile Include="Models\Messages\CampaignModel.cs" />
-    <Compile Include="Models\Blogs\BlogPostModel.cs" />
-    <Compile Include="Models\Orders\OrdersIncompleteDashboardReportModel.cs" />
-    <Compile Include="Models\Orders\OrderAverageReportLineSummaryModel.cs" />
-    <Compile Include="Models\Settings\BlogSettingsModel.cs" />
-    <Compile Include="Models\Blogs\BlogCommentModel.cs" />
-    <Compile Include="Models\Settings\CatalogSettingsModel.cs" />
-    <Compile Include="Models\Customers\TopCustomersReportModel.cs" />
-    <Compile Include="Models\Customers\TopCustomerReportLineModel.cs" />
-    <Compile Include="Models\Customers\RegisteredCustomerReportLineModel.cs" />
-    <Compile Include="Models\Customers\CustomerReportsModel.cs" />
-    <Compile Include="Models\Orders\BestsellersReportLineModel.cs" />
-    <Compile Include="Models\Orders\BestsellersReportModel.cs" />
-    <Compile Include="Models\Catalog\ProductTagModel.cs" />
-    <Compile Include="Models\Settings\GeneralCommonSettingsModel.cs" />
-    <Compile Include="Models\Settings\SettingModel.cs" />
-    <Compile Include="Models\Settings\CustomerUserSettingsModel.cs" />
-    <Compile Include="Models\Settings\MediaSettingsModel.cs" />
-    <Compile Include="Models\Settings\ShoppingCartSettingsModel.cs" />
-    <Compile Include="Models\Settings\OrderSettingsModel.cs" />
-    <Compile Include="Models\Settings\RewardPointsSettingsModel.cs" />
-    <Compile Include="Models\Settings\StoreScopeConfigurationModel.cs" />
-    <Compile Include="Models\Stores\StoreModel.cs" />
-    <Compile Include="Models\Themes\ThemeListModel.cs" />
-    <Compile Include="Models\ShoppingCart\ShoppingCartItemModel.cs" />
-    <Compile Include="Models\ShoppingCart\ShoppingCartModel.cs" />
-    <Compile Include="Models\Tasks\ScheduleTaskModel.cs" />
-    <Compile Include="Models\Themes\ConfigureThemeModel.cs" />
-    <Compile Include="Models\Themes\ThemeManifestModel.cs" />
-    <Compile Include="Models\Topics\TopicListModel.cs" />
-    <Compile Include="Models\Topics\TopicModel.cs" />
-    <Compile Include="Models\News\NewsCommentModel.cs" />
-    <Compile Include="Models\News\NewsItemModel.cs" />
-    <Compile Include="Models\Settings\NewsSettingsModel.cs" />
-    <Compile Include="Models\Orders\OrderAddressModel.cs" />
-    <Compile Include="Models\Orders\OrderListModel.cs" />
-    <Compile Include="Models\Orders\OrderModel.cs" />
-    <Compile Include="Models\Messages\MessageTemplateModel.cs" />
-    <Compile Include="Models\Directory\StateProvinceModel.cs" />
-    <Compile Include="Models\Directory\CountryModel.cs" />
-    <Compile Include="Models\Catalog\ProductReviewModel.cs" />
-    <Compile Include="Models\Orders\ReturnRequestModel.cs" />
-    <Compile Include="Models\Orders\RecurringPaymentModel.cs" />
-    <Compile Include="Models\Orders\GiftCardListModel.cs" />
-    <Compile Include="Models\Orders\GiftCardModel.cs" />
-    <Compile Include="Models\Discounts\DiscountModel.cs" />
-    <Compile Include="Models\Catalog\ProductSpecificationAttributeModel.cs" />
-    <Compile Include="Models\Catalog\SpecificationAttributeOptionModel.cs" />
-    <Compile Include="Models\Catalog\SpecificationAttributeModel.cs" />
-    <Compile Include="Models\Catalog\ProductAttributeModel.cs" />
-    <Compile Include="Models\Messages\QueuedEmailListModel.cs" />
-    <Compile Include="Models\Customers\CustomerAddressModel.cs" />
-    <Compile Include="Models\Customers\CustomerListModel.cs" />
-    <Compile Include="Models\Customers\CustomerModel.cs" />
-    <Compile Include="Models\Customers\CustomerRoleModel.cs" />
-    <Compile Include="Models\Payments\PaymentMethodModel.cs" />
-    <Compile Include="Models\Catalog\ProductListModel.cs" />
-    <Compile Include="Models\Settings\ShippingSettingsModel.cs" />
-    <Compile Include="Models\Forums\ForumGroupModel.cs" />
-    <Compile Include="Models\Forums\ForumModel.cs" />
-    <Compile Include="Models\Settings\ForumSettingsModel.cs" />
-    <Compile Include="Models\Messages\NewsLetterSubscriptionModel.cs" />
-    <Compile Include="Models\Shipping\ShippingRateComputationMethodModel.cs" />
-    <Compile Include="Models\Shipping\ShippingMethodModel.cs" />
-    <Compile Include="Models\Tax\TaxCategoryModel.cs" />
-    <Compile Include="Models\Tax\TaxProviderModel.cs" />
-    <Compile Include="Models\Directory\MeasureDimensionModel.cs" />
-    <Compile Include="Models\Directory\MeasureWeightModel.cs" />
-    <Compile Include="Models\Directory\CurrencyModel.cs" />
-    <Compile Include="Models\Messages\EmailAccountModel.cs" />
-    <Compile Include="Models\Localization\LanguageModel.cs" />
-    <Compile Include="Models\Localization\LanguageResourceModel.cs" />
-    <Compile Include="Models\Logging\LogModel.cs" />
-    <Compile Include="Models\Catalog\ProductModel.cs" />
-    <Compile Include="Models\Messages\QueuedEmailModel.cs" />
-    <Compile Include="Models\Settings\TaxSettingsModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\filemanager\css\images\animated-overlay.gif" />
-    <Content Include="Content\filemanager\css\images\ui-icons_444444_256x240.png" />
-    <Content Include="Content\filemanager\css\images\ui-icons_555555_256x240.png" />
-    <Content Include="Content\filemanager\css\images\ui-icons_777620_256x240.png" />
-    <Content Include="Content\filemanager\css\images\ui-icons_777777_256x240.png" />
-    <Content Include="Content\filemanager\css\images\ui-icons_cc0000_256x240.png" />
-    <Content Include="Content\filemanager\css\images\ui-icons_ffffff_256x240.png" />
-    <Content Include="Content\filemanager\css\jquery-ui-1.10.4.custom.css" />
-    <Content Include="Content\filemanager\css\jquery-ui-1.10.4.custom.min.css" />
-    <Content Include="Content\filemanager\css\main.scss" />
-    <Content Include="Content\filemanager\images\blank.gif" />
-    <Content Include="Content\filemanager\images\file-upload.png" />
-    <Content Include="Content\filemanager\images\folder-green.png" />
-    <Content Include="Content\filemanager\images\folder-opened.png" />
-    <Content Include="Content\filemanager\images\folder.png" />
-    <Content Include="Content\filemanager\images\loading-dir.gif" />
-    <Content Include="Content\filemanager\images\loading.gif" />
-    <Content Include="Content\filemanager\images\remove-upload.png" />
-    <Content Include="Content\filemanager\images\sprite.png" />
-    <Content Include="Content\filemanager\images\stripes-reverse.gif" />
-    <Content Include="Content\filemanager\images\stripes.gif" />
-    <Content Include="Content\filemanager\images\upload-big.png" />
-    <Content Include="Content\filemanager\js\custom.js" />
-    <Content Include="Content\filemanager\js\directory.js" />
-    <Content Include="Content\filemanager\js\file.js" />
-    <Content Include="Content\filemanager\js\filetypes.js" />
-    <Content Include="Content\filemanager\js\jquery-2.1.1.min.js" />
-    <Content Include="Content\filemanager\js\jquery-dateFormat.min.js" />
-    <Content Include="Content\filemanager\js\jquery-ui-1.10.4.custom.min.js" />
-    <Content Include="Content\filemanager\js\main.js" />
-    <Content Include="Content\filemanager\js\utils.js" />
-    <Content Include="Content\filemanager\lang\en.js" />
-    <Content Include="Content\filemanager\LICENSE.txt" />
-    <Content Include="Content\filemanager\third-party.txt" />
-    <Content Include="Content\images\ajax_loader_small.gif" />
-    <Content Include="Content\images\ico-content-negative.png" />
-    <Content Include="Content\images\ico-content-o60.png" />
-    <Content Include="Content\images\ico-content.png" />
-    <Content Include="Content\images\icon-plugin-admin.png" />
-    <Content Include="Content\images\icon-plugin-analytics.png" />
-    <Content Include="Content\images\icon-plugin-api.png" />
-    <Content Include="Content\images\icon-plugin-cms.png" />
-    <Content Include="Content\images\icon-plugin-currencyexchange.png" />
-    <Content Include="Content\images\icon-plugin-data.png" />
-    <Content Include="Content\images\icon-plugin-default.png" />
-    <Content Include="Content\images\icon-plugin-design.png" />
-    <Content Include="Content\images\icon-plugin-developer.png" />
-    <Content Include="Content\images\icon-plugin-discountrequirement.png" />
-    <Content Include="Content\images\icon-plugin-globalization.png" />
-    <Content Include="Content\images\icon-plugin-media.png" />
-    <Content Include="Content\images\icon-plugin-sales.png" />
-    <Content Include="Content\images\icon-plugin-security.png" />
-    <Content Include="Content\images\icon-plugin-import.png" />
-    <Content Include="Content\images\icon-plugin-mobile.png" />
-    <Content Include="Content\images\icon-plugin-payment.png" />
-    <Content Include="Content\images\icon-plugin-marketing.png" />
-    <Content Include="Content\images\icon-plugin-seo.png" />
-    <Content Include="Content\images\icon-plugin-shipping.png" />
-    <Content Include="Content\images\icon-plugin-social.png" />
-    <Content Include="Content\images\icon-plugin-tax.png" />
-    <Content Include="Content\images\loading.gif" />
-    <Content Include="Content\images\smartstore-icon.svg" />
-    <Content Include="Content\images\smartstore.svg" />
-    <Content Include="Content\telerik\css\2012.2.607\telerik.common.css" />
-    <Content Include="Content\telerik\css\2012.2.607\telerik.rtl.css" />
-    <Content Include="Content\telerik\js\jquery.validate.js" />
-    <Content Include="Content\telerik\js\jquery-1.7.1.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.calendar.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.common.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.datepicker.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.datetimepicker.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.draganddrop.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.grid.editing.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.grid.filtering.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.grid.grouping.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.grid.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.grid.reordering.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.grid.resizing.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.textbox.min.js" />
-    <Content Include="Content\telerik\js\2012.2.607\telerik.treeview.min.js" />
-    <Content Include="Content\telerik\img\editor.png" />
-    <Content Include="Content\telerik\img\gradient.png" />
-    <Content Include="Content\telerik\img\imagebrowser.png" />
-    <Content Include="Content\telerik\img\loading.gif" />
-    <Content Include="Content\telerik\img\slider-h.gif" />
-    <Content Include="Content\telerik\img\slider-v.gif" />
-    <Content Include="Content\telerik\img\sprite-vertical.png" />
-    <Content Include="Content\telerik\img\sprite.png" />
-    <Content Include="favicon.ico" />
-    <Content Include="Scripts\admin.dashboard.js" />
-    <Content Include="Scripts\admin.common.js" />
-    <Content Include="Content\filemanager\conf.json" />
-    <Content Include="Content\filemanager\lang\bg.js" />
-    <Content Include="Content\filemanager\lang\de.js" />
-    <Content Include="Content\filemanager\lang\fr.js" />
-    <Content Include="Content\filemanager\lang\ca.js" />
-    <Content Include="Content\filemanager\lang\cs.js" />
-    <Content Include="Content\filemanager\lang\cs1.js" />
-    <Content Include="Content\filemanager\lang\da.js" />
-    <Content Include="Content\filemanager\lang\es.js" />
-    <Content Include="Content\filemanager\lang\hu.js" />
-    <Content Include="Content\filemanager\lang\it.js" />
-    <Content Include="Content\filemanager\lang\nl.js" />
-    <Content Include="Content\filemanager\lang\pl.js" />
-    <Content Include="Content\filemanager\lang\pt.js" />
-    <Content Include="Content\filemanager\lang\ru.js" />
-    <Content Include="Content\filemanager\lang\sk.js" />
-    <Content Include="Content\filemanager\lang\tr.js" />
-    <Content Include="Content\theme.scss" />
-    <Content Include="Content\_telerik.scss" />
-    <Content Include="Content\_variables.scss" />
-    <Content Include="Content\_admin.scss" />
-    <Content Include="Scripts\jquery-shims.js" />
-    <Content Include="Scripts\jquery.tmpl.min.js" />
-    <Content Include="Scripts\admin.globalinit.js" />
-    <Content Include="Scripts\admin.media.js" />
-    <Content Include="Scripts\smartstore.rules.js" />
-    <Content Include="Scripts\smartstore.iconchooser.js" />
-    <Content Include="Scripts\smartstore.download.js" />
-    <Content Include="Content\theme-rtl.scss" />
-    <Content Include="Content\_rtl.scss" />
-    <Content Include="Content\_dashboard.scss" />
-    <None Include="Scripts\_references.js" />
-    <Content Include="sitemap.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Views\Product\_CreateOrUpdate.Inventory.cshtml" />
-    <Content Include="Views\Product\_Create.SaveFirst.cshtml" />
-    <Content Include="Views\Plugin\ConfigureProvider.cshtml" />
-    <Content Include="Views\RoxyFileManager\Index.cshtml" />
-    <Content Include="Views\Shared\Partials\_Providers.cshtml" />
-    <Content Include="Views\Plugin\EditProviderPopup.cshtml" />
-    <Content Include="Views\Theme\PreviewTool.cshtml" />
-    <Content Include="Views\Shared\Layouts\_AdminRoot.cshtml" />
-    <Content Include="Views\Home\MarketplaceFeed.cshtml" />
-    <Content Include="Views\Order\ShipmentDetails.Print.cshtml" />
-    <Content Include="Views\QuantityUnit\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\QuantityUnit\List.cshtml" />
-    <Content Include="Views\Home\UaTester.cshtml" />
-    <Content Include="Views\Plugin\LicensePlugin.cshtml" />
-    <Content Include="Views\Common\CheckUpdate.cshtml" />
-    <Content Include="Views\Payment\Edit.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Download.cshtml" />
-    <Content Include="Views\ScheduleTask\Edit.cshtml" />
-    <Content Include="Views\ScheduleTask\FutureSchedules.cshtml" />
-    <Content Include="Views\ScheduleTask\_LastRun.cshtml" />
-    <Content Include="Views\ScheduleTask\_NextRun.cshtml" />
-    <Content Include="Views\ScheduleTask\MinimalTask.cshtml" />
-    <Content Include="Views\ScheduleTask\_MinimalTaskWidget.cshtml" />
-    <Content Include="Views\Export\List.cshtml" />
-    <Content Include="Views\Export\Create.cshtml" />
-    <Content Include="Views\Export\Edit.cshtml" />
-    <Content Include="Views\Export\Preview.cshtml" />
-    <Content Include="Views\Export\EditDeployment.cshtml" />
-    <Content Include="Views\Export\CreateDeployment.cshtml" />
-    <Content Include="Views\Export\_CreateOrUpdate.Deployment.cshtml" />
-    <Content Include="Views\Export\_Tab.Filter.cshtml" />
-    <Content Include="Views\Export\_Tab.Projection.cshtml" />
-    <Content Include="Views\Export\InfoProfile.cshtml" />
-    <Content Include="Views\Export\_Tab.Deployment.cshtml" />
-    <Content Include="Views\UrlRecord\List.cshtml" />
-    <Content Include="Views\UrlRecord\Edit.cshtml" />
-    <Content Include="Views\UrlRecord\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\UrlRecord\NamesPerEntity.cshtml" />
-    <Content Include="Views\Export\ProfileFileCount.cshtml" />
-    <Content Include="Views\Export\ProfileFileDetails.cshtml" />
-    <Content Include="Views\Import\List.cshtml" />
-    <Content Include="Views\Import\_Update.cshtml" />
-    <Content Include="Views\Import\Edit.cshtml" />
-    <Content Include="Views\Shared\Partials\CsvConfiguration.cshtml" />
-    <Content Include="Views\Import\_ColumnMappings.cshtml" />
-    <Content Include="Views\Import\ProfileImportResult.cshtml" />
-    <Content Include="Views\Setting\DataExchange.cshtml" />
-    <Content Include="Views\Export\_ProfileList.cshtml" />
-    <Content Include="Views\Product\EditorTemplates\TierPriceCalculationMethod.cshtml" />
-    <Content Include="Views\Setting\Search.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\ModelTree.cshtml" />
-    <Content Include="Views\ProductAttribute\OptionCreatePopup.cshtml" />
-    <Content Include="Views\ProductAttribute\OptionEditPopup.cshtml" />
-    <Content Include="Views\ProductAttribute\_CreateOrUpdateOption.cshtml" />
-    <Content Include="Views\Setting\Partials\CommonFacet.cshtml" />
-    <Content Include="Views\Plugin\Partials\LicenseLabel.cshtml" />
-    <Content Include="Views\Language\Partials\AvailableLanguages.cshtml" />
-    <Content Include="Views\MessageTemplate\Preview.cshtml" />
-    <Content Include="Views\Order\_Edit.Products.cshtml" />
-    <Content Include="Views\Order\_Edit.BillingAndShipment.cshtml" />
-    <Content Include="Views\Order\_Edit.Info.cshtml" />
-    <Content Include="Views\Order\_Edit.OrderNotes.cshtml" />
-    <Content Include="Views\Shared\Layouts\_AdminBareLayout.cshtml" />
-    <Content Include="Views\Setting\Payment.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\SelectList.cshtml" />
-    <Content Include="Views\Product\_CreateOrUpdate.Downloads.cshtml" />
-    <Content Include="Views\Menu\List.cshtml" />
-    <Content Include="Views\Menu\Edit.cshtml" />
-    <Content Include="Views\Menu\Create.cshtml" />
-    <Content Include="Views\Menu\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\Menu\_CreateOrUpdate.Item.cshtml" />
-    <Content Include="Views\Menu\EditItem.cshtml" />
-    <Content Include="Views\Menu\CreateItem.cshtml" />
-    <Content Include="Views\Menu\ItemList.cshtml" />
-    <Content Include="Views\Menu\EditorTemplates\MenuItem.Entity.cshtml" />
-    <Content Include="Views\Menu\EditorTemplates\MenuItem.Route.cshtml" />
-    <Content Include="Views\Menu\EditorTemplates\MenuItem.Catalog.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\AccessPermissions.cshtml" />
-    <Content Include="Views\Shared\Menus\Admin.cshtml" />
-    <Content Include="Views\Shared\Partials\FontAwesomeIcon.cshtml" />
-    <Content Include="Views\Rule\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\Rule\Create.cshtml" />
-    <Content Include="Views\Rule\Edit.cshtml" />
-    <Content Include="Views\Rule\List.cshtml" />
-    <Content Include="Views\Rule\_RuleSet.cshtml" />
-    <Content Include="Views\Rule\_Rule.cshtml" />
-    <Content Include="Views\Rule\_Rule.Descriptor.cshtml" />
-    <Content Include="Views\Rule\_Rule.Operator.cshtml" />
-    <Content Include="Views\Measure\CreateWeightPopup.cshtml" />
-    <Content Include="Views\Measure\EditWeightPopup.cshtml" />
-    <Content Include="Views\Measure\_CreateOrUpdateWeight.cshtml" />
-    <Content Include="Views\Measure\_CreateOrUpdateDimension.cshtml" />
-    <Content Include="Views\Measure\CreateDimensionPopup.cshtml" />
-    <Content Include="Views\Measure\EditDimensionPopup.cshtml" />
-    <Content Include="Views\QuantityUnit\CreateQuantityUnitPopup.cshtml" />
-    <Content Include="Views\QuantityUnit\EditQuantityUnitPopup.cshtml" />
-    <Content Include="Views\DeliveryTime\CreateDeliveryTimePopup.cshtml" />
-    <Content Include="Views\DeliveryTime\EditDeliveryTimePopup.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Stores.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\CustomerRoles.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\TextBox.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\Boolean.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\Int32.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\Float.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\Decimal.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\DateTime.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\Dropdown.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Discounts.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\RuleSets.cshtml" />
-    <Content Include="Views\Shared\Layouts\_SettingLayout.cshtml" />
-    <Content Include="Views\Shared\Menus\Settings.cshtml" />
-    <Content Include="Views\Rule\Preview.cshtml" />
-    <Content Include="Views\Shared\Layouts\_MinimalLayout.cshtml" />
-    <Content Include="Views\Customer\TopCustomersDashboardReport.cshtml" />
-    <Content Include="Views\Order\LatestOrdersDashboardReport.cshtml" />
-    <Content Include="Views\Store\StoreDashboardReport.cshtml" />
-    <Content Include="Views\Order\OrdersDashboardReport.cshtml" />
-    <Content Include="Views\Customer\RegisteredCustomersDashboardReport.cshtml" />
-    <Content Include="Views\Media\FileConflictResolutionDialog.cshtml" />
-    <Content Include="Views\Setting\_CreateOrUpdateCookieInfo.cshtml" />
-    <Content Include="Views\Setting\CookieInfoCreatePopup.cshtml" />
-    <Content Include="Views\Setting\CookieInfoEditPopup.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\SeoModel.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\DeliveryTimes.cshtml" />
-    <Content Include="Views\Product\_CreateOrUpdate.Orders.cshtml" />
-    <Content Include="Views\Order\Partials\OrderGrid.cshtml" />
-    <Content Include="Views\Rule\ValueTemplates\CartItemQuantity.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Category\Create.cshtml" />
-    <Content Include="Views\Category\Edit.cshtml" />
-    <Content Include="Views\Category\List.cshtml" />
-    <Content Include="Views\Category\Tree.cshtml" />
-    <Content Include="Views\Category\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\EmailAccount\Create.cshtml" />
-    <Content Include="Views\EmailAccount\List.cshtml" />
-    <Content Include="Views\EmailAccount\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\Language\Create.cshtml" />
-    <Content Include="Views\Language\Edit.cshtml" />
-    <Content Include="Views\Language\List.cshtml" />
-    <Content Include="Views\Language\Resources.cshtml" />
-    <Content Include="Views\Language\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\Log\List.cshtml" />
-    <Content Include="Views\Shared\Partials\Delete.cshtml" />
-    <Content Include="Views\Shared\Layouts\_AdminLayout.cshtml" />
-    <Content Include="Views\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Views\_ViewStart.cshtml" />
-    <Content Include="Views\Shared\Partials\Navbar.cshtml" />
-    <Content Include="Views\ScheduleTask\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144}</Project>
-      <Name>SmartStore.Data</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541ad-f659-47da-8763-16f36c5cd2f4}</Project>
-      <Name>SmartStore.Services</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj">
-      <Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
-      <Name>SmartStore.Web.Framework</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Currency\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Currency\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Currency\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Currency\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\QueuedEmail\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\QueuedEmail\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\QueuedEmail\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\EmailAccount\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Measure\Weights.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Measure\Dimensions.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Tax\Providers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Tax\Categories.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\Tax.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shipping\Methods.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shipping\Providers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shared\EditorTemplates\Address.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\NewsLetterSubscription\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Forum\CreateForum.cshtml" />
-    <Content Include="Views\Forum\CreateForumGroup.cshtml" />
-    <Content Include="Views\Forum\EditForum.cshtml" />
-    <Content Include="Views\Forum\EditForumGroup.cshtml" />
-    <Content Include="Views\Forum\List.cshtml" />
-    <Content Include="Views\Setting\Forum.cshtml" />
-    <Content Include="Views\Forum\_CreateOrUpdateForum.cshtml" />
-    <Content Include="Views\Forum\_CreateOrUpdateForumGroup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\Shipping.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Payment\Providers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CustomerRole\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CustomerRole\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CustomerRole\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CustomerRole\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Customer\AddressCreate.cshtml" />
-    <Content Include="Views\Customer\AddressEdit.cshtml" />
-    <Content Include="Views\Customer\Create.cshtml" />
-    <Content Include="Views\Customer\Edit.cshtml" />
-    <Content Include="Views\Customer\List.cshtml" />
-    <Content Include="Views\Customer\_CreateOrUpdate.cshtml" />
-    <Content Include="Views\Customer\_CreateOrUpdateAddress.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Security\AccessDenied.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductAttribute\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductAttribute\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductAttribute\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductAttribute\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\OptionCreatePopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\_CreateOrUpdateOption.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\SpecificationAttribute\OptionEditPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shared\Layouts\_AdminPopupLayout.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditorTemplates\ProductCategory.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditorTemplates\ProductManufacturer.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditorTemplates\TierPriceCustomer.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditorTemplates\ProductAttribute.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditAttributeValues.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\ProductAttributeValueCreatePopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\ProductAttributeValueEditPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdateProductAttributeValue.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\_CreateOrUpdateValue.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\ValueCreatePopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\CheckoutAttribute\ValueEditPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Discount\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Discount\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Discount\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Discount\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\GiftCard\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\GiftCard\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\GiftCard\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\GiftCard\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ActivityLog\ListTypes.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ActivityLog\ListLogs.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\UploadLicenseFilePopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\RecurringPayment\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\RecurringPayment\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\RecurringPayment\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ReturnRequest\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ReturnRequest\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ReturnRequest\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductReview\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductReview\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ProductReview\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Affiliate\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Affiliate\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Affiliate\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Affiliate\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\MessageTemplate\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\MessageTemplate\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\MessageTemplate\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Campaign\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Campaign\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Campaign\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Campaign\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\AddressEdit.cshtml" />
-    <Content Include="Views\Order\Edit.cshtml" />
-    <Content Include="Views\Order\List.cshtml" />
-    <Content Include="Views\Order\PartiallyRefundOrderPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Blog\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Content Include="Views\Blog\List.cshtml" />
+    <Compile Include="..\..\..\AssemblySharedInfo.cs" Link="Properties\AssemblySharedInfo.cs" />
+    <Compile Include="..\..\..\AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="Views\Blog\Create.cshtml" />
+    <ProjectReference Include="..\..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj" />
+    <ProjectReference Include="..\..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
+    <ProjectReference Include="..\..\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="Views\Blog\Edit.cshtml" />
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\Blog.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Blog\Comments.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\News.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\News\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\News\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\News\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\News\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\News\Comments.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Topic\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Topic\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Topic\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Topic\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\Catalog.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\RewardPoints.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\Order.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\ShoppingCart.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\Media.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\CustomerUser.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\AllSettings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\ProductTags.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\LowStockReport.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\BestsellersReport.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Customer\Reports.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Customer\ReportRegisteredCustomers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Common\SystemInfo.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Common\Warnings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\OrderAverageReport.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\OrdersIncompleteDashboardReport.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Common\Maintenance.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\BestsellersBriefReportByQuantity.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\BestsellersBriefReportByAmount.cshtml" />
-    <Content Include="Views\Order\BestsellersDashboardReport.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\GeneralCommon.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Common\LanguageSelector.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_ProductAttributes.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdateAttributeCombinationPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Log\View.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Manufacturer\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Manufacturer\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Manufacturer\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Manufacturer\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ShoppingCart\CurrentCarts.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Poll\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Poll\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Poll\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Poll\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Plugin\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\OnlineCustomer\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Measure\EditorTemplates\Decimal8.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Widget\Providers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ExternalAuthentication\Providers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\ShoppingCart\CurrentWishlists.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\BulkEdit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\StateEditPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\StateCreatePopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Country\_CreateOrUpdateState.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shipping\EditMethod.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shipping\CreateMethod.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shipping\_CreateOrUpdateMethod.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Plugin\ConfigurePlugin.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\AddProductToOrder.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\AddProductToOrderDetails.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\_ProductAddAttributes.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\_ProductAddGiftCardInfo.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\NeverSoldReport.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\ShipmentDetails.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\AddShipment.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\ShipmentList.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditProductTag.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdateProductTag.cshtml" />
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Content Include="Views\DeliveryTime\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\DeliveryTime\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\AttributeCombinationCreatePopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\AttributeCombinationEditPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Theme\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Theme\Configure.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Store\Create.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Store\Edit.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Store\List.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Store\_CreateOrUpdate.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Setting\StoreScopeConfiguration.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditorTemplates\TierPriceStore.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Shared\EditorTemplates\WidgetZone.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Common\GenericAttributes.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\EditorTemplates\AttributeControlType.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Categories.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Info.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Manufacturers.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Pictures.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Attributes.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.SEO.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.SpecificationAttributes.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.AssociatedProducts.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Price.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.Promotion.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\_CreateOrUpdate.BundleItems.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Product\BundleItemEditPopup.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Home\About.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Packaging\UploadPackage.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Order\_AutoUpdateOrderItem.cshtml" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>0</WarningLevel>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target> -->
-  <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>43797</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://www.smartstore.net</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="$(SolutionDir)\FixRazorIntellisense.targets" Condition="'$(Configuration)' == 'PluginDev'" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs
index a059c6c674..ee799615fe 100644
--- a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs
@@ -3,8 +3,8 @@
 using System.Globalization;
 using System.Linq;
 using System.ServiceModel.Syndication;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs
index 0606d9ffb3..1001bebcad 100644
--- a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel.Syndication;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Forums;
diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs
index 0ae9ce3ac0..c58db4f1d0 100644
--- a/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel.Syndication;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Domain.Catalog;
diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs
index 2db4cb1ce5..9e364b3b68 100644
--- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs
index 2b14817c5a..6876466c6e 100644
--- a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs
index 41539afce0..8838af1585 100644
--- a/src/Presentation/SmartStore.Web/Controllers/CommonController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/CommonController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Xml.Linq;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Blogs;
diff --git a/src/Presentation/SmartStore.Web/Controllers/CountryController.cs b/src/Presentation/SmartStore.Web/Controllers/CountryController.cs
index 6ba1fb464f..001f6d642a 100644
--- a/src/Presentation/SmartStore.Web/Controllers/CountryController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/CountryController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Services.Directory;
diff --git a/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs
index 0ab8fa9da2..81ec7ad10b 100644
--- a/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs b/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs
index e696904d29..862017795c 100644
--- a/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Presentation/SmartStore.Web/Controllers/EntityController.cs b/src/Presentation/SmartStore.Web/Controllers/EntityController.cs
index aba8ba312b..e9d7472548 100644
--- a/src/Presentation/SmartStore.Web/Controllers/EntityController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/EntityController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Controllers/ExternalAuthenticationController.cs b/src/Presentation/SmartStore.Web/Controllers/ExternalAuthenticationController.cs
index 67261e736a..b32bab24f5 100644
--- a/src/Presentation/SmartStore.Web/Controllers/ExternalAuthenticationController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/ExternalAuthenticationController.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Services.Authentication.External;
 using SmartStore.Web.Framework.Controllers;
diff --git a/src/Presentation/SmartStore.Web/Controllers/HomeController.cs b/src/Presentation/SmartStore.Web/Controllers/HomeController.cs
index 3bc8c37109..d35a0b52fe 100644
--- a/src/Presentation/SmartStore.Web/Controllers/HomeController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/HomeController.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs
index 4e92d673ea..06980a6b47 100644
--- a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web.Hosting;
-using System.Web.Mvc;
-using System.Web.SessionState;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Autofac;
 using SmartStore.Core;
 using SmartStore.Core.Async;
diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs
index 06ae833f85..44ec6f66ed 100644
--- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs
@@ -5,9 +5,8 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using System.Web.Mvc;
-using System.Web.Routing;
-using System.Web.SessionState;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Media;
 using SmartStore.Core.Domain.Seo;
diff --git a/src/Presentation/SmartStore.Web/Controllers/MenuController.cs b/src/Presentation/SmartStore.Web/Controllers/MenuController.cs
index 4716336d17..faae17dbe8 100644
--- a/src/Presentation/SmartStore.Web/Controllers/MenuController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/MenuController.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Security;
 using SmartStore.Web.Framework.Controllers;
diff --git a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs
index 3469d72ba2..21db99f8f6 100644
--- a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel.Syndication;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs b/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs
index 69ae16af9c..1ae7e9665d 100644
--- a/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Messages;
diff --git a/src/Presentation/SmartStore.Web/Controllers/OrderController.cs b/src/Presentation/SmartStore.Web/Controllers/OrderController.cs
index 88fc181453..109d7e0af1 100644
--- a/src/Presentation/SmartStore.Web/Controllers/OrderController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/OrderController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Controllers/PollController.cs b/src/Presentation/SmartStore.Web/Controllers/PollController.cs
index fad1aa7624..647fa4c9b7 100644
--- a/src/Presentation/SmartStore.Web/Controllers/PollController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/PollController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Domain.Polls;
diff --git a/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs b/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs
index f445eb41de..d43ff1d057 100644
--- a/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Forums;
diff --git a/src/Presentation/SmartStore.Web/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Controllers/ProductController.cs
index 3562704be7..1f71856dc4 100644
--- a/src/Presentation/SmartStore.Web/Controllers/ProductController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/ProductController.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs b/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs
index 46fc6a200f..1d612b8355 100644
--- a/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Forums;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs b/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs
index ea55b25588..ead3a37445 100644
--- a/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Localization;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Tax;
diff --git a/src/Presentation/SmartStore.Web/Controllers/SearchController.cs b/src/Presentation/SmartStore.Web/Controllers/SearchController.cs
index 38bd94e582..e091fbe80b 100644
--- a/src/Presentation/SmartStore.Web/Controllers/SearchController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/SearchController.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Media;
diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
index d88a441095..4bb4a13d39 100644
--- a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs
index 8b820e73ae..441bf168f3 100644
--- a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Web.Mvc;
-using System.Web.SessionState;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Stores;
diff --git a/src/Presentation/SmartStore.Web/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Controllers/TopicController.cs
index ac5c01c2a9..a4021b3c04 100644
--- a/src/Presentation/SmartStore.Web/Controllers/TopicController.cs
+++ b/src/Presentation/SmartStore.Web/Controllers/TopicController.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
 using SmartStore.Core.Domain.Seo;
diff --git a/src/Presentation/SmartStore.Web/Extensions/EditorExtensions.cs b/src/Presentation/SmartStore.Web/Extensions/EditorExtensions.cs
index 68e5b6c9fe..d1abb5f47f 100644
--- a/src/Presentation/SmartStore.Web/Extensions/EditorExtensions.cs
+++ b/src/Presentation/SmartStore.Web/Extensions/EditorExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
 
diff --git a/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs b/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs
index 0a5f037340..18f01571e7 100644
--- a/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs
+++ b/src/Presentation/SmartStore.Web/Extensions/MappingExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.ComponentModel;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Global.asax.cs b/src/Presentation/SmartStore.Web/Global.asax.cs
index 56991d9d7d..aee5f9afe5 100644
--- a/src/Presentation/SmartStore.Web/Global.asax.cs
+++ b/src/Presentation/SmartStore.Web/Global.asax.cs
@@ -1,12 +1,10 @@
 using System.Linq;
 using System.Net;
-using System.Web;
-using System.Web.Helpers;
-using System.Web.Hosting;
-using System.Web.Mvc;
-using System.Web.Optimization;
-using System.Web.Routing;
-using System.Web.WebPages;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using WebOptimizer;
+using Microsoft.AspNetCore.Routing;
 using FluentValidation;
 using FluentValidation.Mvc;
 using JavaScriptEngineSwitcher.Core;
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs b/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs
index 01743adfbb..ce1c78f3ef 100644
--- a/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs
+++ b/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Collections;
 using SmartStore.Core;
 using SmartStore.Core.Caching;
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs
index d2882781e3..79e338a0b3 100644
--- a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs
+++ b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using System.Xml;
 using SmartStore.Core;
 using SmartStore.Core.Infrastructure;
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Menus/MyAccountMenu.cs b/src/Presentation/SmartStore.Web/Infrastructure/Menus/MyAccountMenu.cs
index bcca38a6b4..8186b6568f 100644
--- a/src/Presentation/SmartStore.Web/Infrastructure/Menus/MyAccountMenu.cs
+++ b/src/Presentation/SmartStore.Web/Infrastructure/Menus/MyAccountMenu.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Collections;
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Forums;
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs
index 12fa6a4829..7c04f96fc9 100644
--- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs
+++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/1_StoreRoutes.cs
@@ -1,6 +1,6 @@
 using System.Web.Mvc;
 using System.Web.Mvc.Routing.Constraints;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Data;
 using SmartStore.Services.Media;
 using SmartStore.Web.Framework;
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs
index 11e862629d..c85b37b7c8 100644
--- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs
+++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Controllers;
 using SmartStore.Web.Framework.Localization;
 using SmartStore.Web.Framework.Routing;
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs
index 578b78e54b..6f1e519de1 100644
--- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs
+++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Web;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Utilities;
diff --git a/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs b/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs
index e7fbe3f270..aafdb60154 100644
--- a/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Forums;
diff --git a/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs b/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs
index 6a5dccb4cc..4c2efd577f 100644
--- a/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework.Modelling;
 
 namespace SmartStore.Web.Models.Boards
diff --git a/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs b/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs
index 2a254474fd..12d24716b7 100644
--- a/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs
+++ b/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Services.Localization;
 
diff --git a/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs b/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs
index a3aa09facc..4b7ac00227 100644
--- a/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Services.Catalog.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Models/Common/AddressModel.cs b/src/Presentation/SmartStore.Web/Models/Common/AddressModel.cs
index 7c3d9475d8..638f97aacb 100644
--- a/src/Presentation/SmartStore.Web/Models/Common/AddressModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Common/AddressModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Common;
diff --git a/src/Presentation/SmartStore.Web/Models/Customer/CustomerInfoModel.cs b/src/Presentation/SmartStore.Web/Models/Customer/CustomerInfoModel.cs
index 9f9df22f88..117f843374 100644
--- a/src/Presentation/SmartStore.Web/Models/Customer/CustomerInfoModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Customer/CustomerInfoModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs b/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs
index c84c5ac8b9..471b8c6420 100644
--- a/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework;
@@ -10,7 +10,6 @@ namespace SmartStore.Web.Models.Customer
     [Validator(typeof(PasswordRecoveryValidator))]
     public partial class PasswordRecoveryModel : ModelBase
     {
-        [AllowHtml]
         [SmartResourceDisplayName("Account.PasswordRecovery.Email")]
         [DataType(DataType.EmailAddress)]
         public string Email { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs b/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs
index e6ff527d3e..0e7a793559 100644
--- a/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Core.Domain.Customers;
diff --git a/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs b/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs
index a4c383469a..0dd9029563 100644
--- a/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using FluentValidation;
 using FluentValidation.Attributes;
 using SmartStore.Web.Framework.Modelling;
@@ -24,18 +24,14 @@ public InstallModel()
         [DataType(DataType.Password)]
         public string ConfirmPassword { get; set; }
 
-        [AllowHtml]
         public string DatabaseConnectionString { get; set; }
         public string DataProvider { get; set; }
         //SQL Server properties
         public string SqlConnectionInfo { get; set; }
-        [AllowHtml]
         public string SqlServerName { get; set; }
 
         public string SqlDatabaseName { get; set; }
-        [AllowHtml]
         public string SqlServerUsername { get; set; }
-        [AllowHtml]
         public string SqlServerPassword { get; set; }
         public string SqlAuthenticationType { get; set; }
         public bool SqlServerCreateDatabase { get; set; }
diff --git a/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs b/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs
index 09b85a691f..7d7563bb88 100644
--- a/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Services.Localization;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs b/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs
index 57b8bb8c21..dc808297b5 100644
--- a/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs
@@ -1,5 +1,4 @@
 using System.Web.Mvc;
-using Autofac.Integration.Mvc;
 using SmartStore.Services.Search;
 
 namespace SmartStore.Web.Models.Search
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs
index dd85cd1111..613e0ffa76 100644
--- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Web.Framework.Modelling;
 
 namespace SmartStore.Web.Models.ShoppingCart
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs
index 426407e7c1..00a1e86453 100644
--- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Web.Framework;
 using SmartStore.Web.Framework.Modelling;
 
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
index e3f75bc700..ac51b4e501 100644
--- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Services.Localization;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs
index 7c2b3dc8b9..578cb2e10c 100644
--- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Directory;
 using SmartStore.Services.Catalog.Modelling;
diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs
index 54a1d3a187..62b570dc08 100644
--- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs
+++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Services.Localization;
 using SmartStore.Web.Framework.Modelling;
diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj
index c96f601e5a..908e83554d 100644
--- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj
+++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj
@@ -1,2170 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" />
-  <Import Project="..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x86.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x86.props')" />
-  <Import Project="..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x64.props" Condition="Exists('..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x64.props')" />
-  <Import Project="..\..\packages\LibSassHost.Native.win-x86.1.2.6\build\LibSassHost.Native.win-x86.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.6\build\LibSassHost.Native.win-x86.props')" />
-  <Import Project="..\..\packages\LibSassHost.Native.win-x64.1.2.6\build\LibSassHost.Native.win-x64.props" Condition="Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.6\build\LibSassHost.Native.win-x64.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4F1F649C-1020-45BE-A487-F416D9297FF3}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SmartStore.Web</RootNamespace>
     <AssemblyName>SmartStore.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-    <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FilesToIncludeForPublish>AllFilesInProjectFolder</FilesToIncludeForPublish>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
-    <Prefer32Bit>false</Prefer32Bit>
-    <FilesToIncludeForPublish>AllFilesInProjectFolder</FilesToIncludeForPublish>
-    <PrecompileBeforePublish>false</PrecompileBeforePublish>
-    <PackageAsSingleFile>false</PackageAsSingleFile>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AdvancedStringBuilder, Version=0.1.0.0, Culture=neutral, PublicKeyToken=e818a2fc08933ddb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll</HintPath>
-    </Reference>
-    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac, Version=5.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Integration.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="AutoprefixerHost, Version=1.1.10.0, Culture=neutral, PublicKeyToken=35c9a5d231b2f02d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.Autoprefixer, Version=1.12.1.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.Core, Version=1.10.0.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.JsMin, Version=1.12.6.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.JsMin.1.12.6\lib\net40\BundleTransformer.JsMin.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.NUglify, Version=1.12.16.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.NUglify.1.12.16\lib\net40\BundleTransformer.NUglify.dll</HintPath>
-    </Reference>
-    <Reference Include="BundleTransformer.SassAndScss, Version=1.12.1.0, Culture=neutral, PublicKeyToken=973c344c93aac60d, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll</HintPath>
-    </Reference>
-    <Reference Include="ClearScript, Version=6.0.2.0, Culture=neutral, PublicKeyToken=935d0c957da47c73, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\ClearScript.dll</HintPath>
-    </Reference>
-    <Reference Include="DouglasCrockford.JsMin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=99147aa1108448b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll</HintPath>
-    </Reference>
-    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="EntityFramework.SqlServerCompact, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll</HintPath>
-    </Reference>
-    <Reference Include="FluentValidation.Mvc, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7de548da2fbae0f0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="JavaScriptEngineSwitcher.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="JavaScriptEngineSwitcher.Msie, Version=3.4.3.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\JavaScriptEngineSwitcher.Msie.3.4.3\lib\net45\JavaScriptEngineSwitcher.Msie.dll</HintPath>
-    </Reference>
-    <Reference Include="JavaScriptEngineSwitcher.V8, Version=3.5.5.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\JavaScriptEngineSwitcher.V8.dll</HintPath>
-    </Reference>
-    <Reference Include="LibSassHost, Version=1.2.6.0, Culture=neutral, PublicKeyToken=3e24e88796a38e46, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="MsieJavaScriptEngine, Version=3.0.7.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MsieJavaScriptEngine.3.0.7\lib\net45\MsieJavaScriptEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NUglify, Version=1.6.4.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.Mvc, Version=2012.2.607.340, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Telerik\Telerik.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\..\AssemblySharedInfo.cs">
-      <Link>Properties\AssemblySharedInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\AssemblyVersionInfo.cs">
-      <Link>Properties\AssemblyVersionInfo.cs</Link>
-    </Compile>
-    <Compile Include="App_GlobalResources\EditorLocalization.de.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>EditorLocalization.de.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\EditorLocalization.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>EditorLocalization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\GridLocalization.de.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>GridLocalization.de.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\GridLocalization.designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>GridLocalization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\MvcLocalization.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>MvcLocalization.resx</DependentUpon>
-    </Compile>
-    <Compile Include="App_GlobalResources\MvcLocalization.de.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>MvcLocalization.de.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Controllers\BoardsController.cs" />
-    <Compile Include="Controllers\CatalogController.cs" />
-    <Compile Include="Controllers\CatalogHelper.cs" />
-    <Compile Include="Controllers\CatalogHelper.MapProduct.cs" />
-    <Compile Include="Controllers\CheckoutController.cs" />
-    <Compile Include="Controllers\EntityController.cs" />
-    <Compile Include="Controllers\CommonController.cs" />
-    <Compile Include="Controllers\BlogController.cs" />
-    <Compile Include="Controllers\ErrorController.cs" />
-    <Compile Include="Controllers\MediaController.cs" />
-    <Compile Include="Controllers\MenuController.cs" />
-    <Compile Include="Controllers\OrderHelper.cs" />
-    <Compile Include="Controllers\ProductController.cs" />
-    <Compile Include="Controllers\ReturnRequestController.cs" />
-    <Compile Include="Controllers\ExternalAuthenticationController.cs" />
-    <Compile Include="Controllers\InstallController.cs" />
-    <Compile Include="Controllers\PollController.cs" />
-    <Compile Include="Controllers\SearchController.cs" />
-    <Compile Include="Controllers\TaskSchedulerController.cs" />
-    <Compile Include="Controllers\ThemeController.cs" />
-    <Compile Include="Controllers\WidgetController.cs" />
-    <Compile Include="Controllers\PrivateMessagesController.cs" />
-    <Compile Include="Controllers\TopicController.cs" />
-    <Compile Include="Controllers\NewsController.cs" />
-    <Compile Include="Controllers\ProfileController.cs" />
-    <Compile Include="Controllers\NewsletterController.cs" />
-    <Compile Include="Controllers\OrderController.cs" />
-    <Compile Include="Controllers\DownloadController.cs" />
-    <Compile Include="Controllers\ShoppingCartController.cs" />
-    <Compile Include="Controllers\CountryController.cs" />
-    <Compile Include="Controllers\CustomerController.cs" />
-    <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Extensions\EditorExtensions.cs" />
-    <Compile Include="Extensions\MappingExtensions.cs" />
-    <Compile Include="Extensions\ProductDetailsExtensions.cs" />
-    <Compile Include="Extensions\QueryExtensions.cs" />
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Infrastructure\Cache\ModelCacheEventConsumer.cs" />
-    <Compile Include="Infrastructure\DefaultBundles.cs" />
-    <Compile Include="Infrastructure\DefaultWidgetSelector.cs" />
-    <Compile Include="Infrastructure\DependencyRegistrar.cs" />
-    <Compile Include="Infrastructure\Menus\MainMenuInvalidator.cs" />
-    <Compile Include="Infrastructure\Menus\MyAccountMenu.cs" />
-    <Compile Include="Infrastructure\Routes\2_DefaultRoutes.cs" />
-    <Compile Include="Infrastructure\Routes\4_LastRoutes.cs" />
-    <Compile Include="Infrastructure\Routes\3_GenericRoutes.cs" />
-    <Compile Include="Infrastructure\Installation\DeDESeedData.cs" />
-    <Compile Include="Infrastructure\Installation\EnUSSeedData.cs" />
-    <Compile Include="Infrastructure\Installation\InstallationAppLanguageMetadata.cs" />
-    <Compile Include="Infrastructure\Installation\IInstallationLocalizationService.cs" />
-    <Compile Include="Infrastructure\Installation\InstallationLanguage.cs" />
-    <Compile Include="Infrastructure\Installation\InstallationLocalizationService.cs" />
-    <Compile Include="Infrastructure\Installation\InstallDataSeeder.cs" />
-    <Compile Include="Infrastructure\Routes\1_StoreRoutes.cs" />
-    <Compile Include="Infrastructure\Routes\MapLegacyRoutesAttribute.cs" />
-    <Compile Include="Infrastructure\DefaultFacetTemplateSelector.cs" />
-    <Compile Include="Infrastructure\Menus\MainMenuShrinker.cs" />
-    <Compile Include="Models\Blogs\BlogPostListModel.cs" />
-    <Compile Include="Models\Blogs\BlogPagingFilteringModel.cs" />
-    <Compile Include="Models\Blogs\BlogPostTagModel.cs" />
-    <Compile Include="Models\Blogs\BlogPostModel.cs" />
-    <Compile Include="Models\Blogs\BlogPostYearMonthModel.cs" />
-    <Compile Include="Models\Blogs\AddBlogCommentModel.cs" />
-    <Compile Include="Models\Blogs\BlogPostTagListModel.cs" />
-    <Compile Include="Models\Boards\ActiveDiscussionsModel.cs" />
-    <Compile Include="Models\Boards\BoardsIndexModel.cs" />
-    <Compile Include="Models\Boards\ForumRowModel.cs" />
-    <Compile Include="Models\Boards\ForumTopicRowModel.cs" />
-    <Compile Include="Models\Boards\EditForumPostModel.cs" />
-    <Compile Include="Models\Boards\ForumGroupModel.cs" />
-    <Compile Include="Models\Boards\ForumPageModel.cs" />
-    <Compile Include="Models\Boards\ForumPostModel.cs" />
-    <Compile Include="Models\Boards\EditForumTopicModel.cs" />
-    <Compile Include="Models\Boards\ForumTopicPageModel.cs" />
-    <Compile Include="Models\Boards\LastPostModel.cs" />
-    <Compile Include="Models\Boards\TopicMoveModel.cs" />
-    <Compile Include="Models\Catalog\BackInStockSubscribeModel.cs" />
-    <Compile Include="Models\Catalog\CategoryModel.cs" />
-    <Compile Include="Models\Catalog\IQuantityInput.cs" />
-    <Compile Include="Models\Catalog\IListActions.cs" />
-    <Compile Include="Models\Catalog\ProductAskQuestionModel.cs" />
-    <Compile Include="Models\Catalog\ProductSummaryModel.cs" />
-    <Compile Include="Models\Catalog\ManufacturerOverviewModel.cs" />
-    <Compile Include="Models\Common\CookieManagerModel.cs" />
-    <Compile Include="Models\Common\MetaPropertiesModel.cs" />
-    <Compile Include="Models\Media\MediaGalleryModel.cs" />
-    <Compile Include="Models\Search\SearchBoxModel.cs" />
-    <Compile Include="Models\Catalog\ProductsByTagModel.cs" />
-    <Compile Include="Models\Catalog\PopularProductTagsModel.cs" />
-    <Compile Include="Models\Catalog\ProductTagModel.cs" />
-    <Compile Include="Models\Catalog\ProductEmailAFriendModel.cs" />
-    <Compile Include="Models\Catalog\ProductSpecificationModel.cs" />
-    <Compile Include="Models\Catalog\ProductReviewModel.cs" />
-    <Compile Include="Models\Catalog\ManufacturerModel.cs" />
-    <Compile Include="Models\Catalog\ManufacturerNavigationModel.cs" />
-    <Compile Include="Models\Catalog\ProductDetailsModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutShippingAddressModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutProgressModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutBillingAddressModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutShippingMethodModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutPaymentMethodModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutPaymentInfoModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutConfirmModel.cs" />
-    <Compile Include="Models\Checkout\CheckoutCompletedModel.cs" />
-    <Compile Include="Models\Checkout\UpdateSectionJsonModel.cs" />
-    <Compile Include="Models\Common\ConsentModel.cs" />
-    <Compile Include="Models\Entity\EntityPickerModel.cs" />
-    <Compile Include="Models\Common\CommentModel.cs" />
-    <Compile Include="Models\Boards\ForumSearchResultModel.cs" />
-    <Compile Include="Models\Search\ISearchResultModel.cs" />
-    <Compile Include="Models\Search\SearchResultModel.cs" />
-    <Compile Include="Models\Search\SearchResultModelBase.cs" />
-    <Compile Include="Models\ShoppingCart\ButtonPaymentMethodModel.cs" />
-    <Compile Include="Models\ShoppingCart\OffCanvasCartModel.cs" />
-    <Compile Include="Models\Topics\TopicWidgetModel.cs" />
-    <Compile Include="Models\Common\AddressModel.cs" />
-    <Compile Include="Models\Common\FooterModel.cs" />
-    <Compile Include="Models\Common\ShopHeaderModel.cs" />
-    <Compile Include="Models\Common\CompareDropdownModel.cs" />
-    <Compile Include="Models\Common\AccountDropdownModel.cs" />
-    <Compile Include="Models\Common\ShopLogoModel.cs" />
-    <Compile Include="Models\Common\ShopBarModel.cs" />
-    <Compile Include="Models\Common\PagerModel.cs" />
-    <Compile Include="Models\Common\StoreThemeModel.cs" />
-    <Compile Include="Models\Common\LanguageSelectorModel.cs" />
-    <Compile Include="Models\Customer\BackInStockSubscriptionModel.cs" />
-    <Compile Include="Models\Customer\CustomerBackInStockSubscriptionsModel.cs" />
-    <Compile Include="Models\Customer\CustomerForumSubscriptionsModel.cs" />
-    <Compile Include="Models\Customer\CustomerReturnRequestsModel.cs" />
-    <Compile Include="Models\Customer\ForumSubscriptionModel.cs" />
-    <Compile Include="Models\Customer\ExternalAuthenticationMethodModel.cs" />
-    <Compile Include="Models\Install\InstallModel.cs" />
-    <Compile Include="Models\News\AddNewsCommentModel.cs" />
-    <Compile Include="Models\News\HomePageNewsItemsModel.cs" />
-    <Compile Include="Models\News\NewsPagingFilteringModel.cs" />
-    <Compile Include="Models\News\NewsItemListModel.cs" />
-    <Compile Include="Models\News\NewsItemModel.cs" />
-    <Compile Include="Models\Customer\AccountActivationModel.cs" />
-    <Compile Include="Models\Newsletter\SubscriptionActivationModel.cs" />
-    <Compile Include="Models\Customer\ChangePasswordModel.cs" />
-    <Compile Include="Models\Customer\PasswordRecoveryConfirmModel.cs" />
-    <Compile Include="Models\Customer\PaswordRecoveryModel.cs" />
-    <Compile Include="Models\Customer\CustomerDownloadableProductsModel.cs" />
-    <Compile Include="Models\Customer\CustomerOrderListModel.cs" />
-    <Compile Include="Models\Customer\CustomerAvatarModel.cs" />
-    <Compile Include="Models\Customer\CustomerAddressEditModel.cs" />
-    <Compile Include="Models\Customer\CustomerAddressListModel.cs" />
-    <Compile Include="Models\Customer\CustomerRewardPointsModel.cs" />
-    <Compile Include="Models\Customer\CustomerInfoModel.cs" />
-    <Compile Include="Models\Customer\RegisterResultModel.cs" />
-    <Compile Include="Models\Customer\RegisterModel.cs" />
-    <Compile Include="Models\Customer\LoginModel.cs" />
-    <Compile Include="Models\Common\MenuBarModel.cs" />
-    <Compile Include="Models\Common\ContactUsModel.cs" />
-    <Compile Include="Models\Common\TaxTypeSelectorModel.cs" />
-    <Compile Include="Models\Common\CurrencyModel.cs" />
-    <Compile Include="Models\Common\CurrencySelectorModel.cs" />
-    <Compile Include="Models\Common\LanguageModel.cs" />
-    <Compile Include="Models\Common\StoreThemeSelectorModel.cs" />
-    <Compile Include="Models\Media\PictureModel.cs" />
-    <Compile Include="Models\Order\ShipmentDetailsModel.cs" />
-    <Compile Include="Models\Order\SubmitReturnRequestModel.cs" />
-    <Compile Include="Models\Order\OrderDetailsModel.cs" />
-    <Compile Include="Models\Polls\PollModel.cs" />
-    <Compile Include="Models\PrivateMessages\SendPrivateMessageModel.cs" />
-    <Compile Include="Models\PrivateMessages\PrivateMessageIndexModel.cs" />
-    <Compile Include="Models\PrivateMessages\PrivateMessageListModel.cs" />
-    <Compile Include="Models\PrivateMessages\PrivateMessageModel.cs" />
-    <Compile Include="Models\Profile\ProfileInfoModel.cs" />
-    <Compile Include="Models\Profile\ProfileIndexModel.cs" />
-    <Compile Include="Models\Profile\PostsModel.cs" />
-    <Compile Include="Models\Profile\ProfilePostsModel.cs" />
-    <Compile Include="Models\ShoppingCart\MiniShoppingCartModel.cs" />
-    <Compile Include="Models\ShoppingCart\WishlistEmailAFriendModel.cs" />
-    <Compile Include="Models\ShoppingCart\WishlistModel.cs" />
-    <Compile Include="Models\ShoppingCart\OrderTotalsModel.cs" />
-    <Compile Include="Models\ShoppingCart\EstimateShippingModel.cs" />
-    <Compile Include="Models\ShoppingCart\ShoppingCartModel.cs" />
-    <Compile Include="Models\Topics\TopicModel.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="404.html" />
-    <Content Include="500.html" />
-    <Content Include="App_Data\AddressFormats.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Blog.BlogComment.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Customer.BackInStock.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Customer.EmailValidationMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Customer.NewOrderNote.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Customer.NewPM.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Customer.PasswordRecovery.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Customer.WelcomeMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Forums.NewForumPost.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Forums.NewForumTopic.xml" />
-    <Content Include="App_Data\EmailTemplates\de\GiftCard.Notification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\NewCustomer.Notification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\NewReturnRequest.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\News.NewsComment.xml" />
-    <Content Include="App_Data\EmailTemplates\de\NewsLetterSubscription.ActivationMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\de\NewsLetterSubscription.DeactivationMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\de\NewVATSubmitted.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\OrderCancelled.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\OrderCompleted.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\OrderPlaced.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\OrderPlaced.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Product.AskQuestion.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Product.ProductReview.xml" />
-    <Content Include="App_Data\EmailTemplates\de\QuantityBelow.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\RecurringPaymentCancelled.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\ReturnRequestStatusChanged.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Service.EmailAFriend.xml" />
-    <Content Include="App_Data\EmailTemplates\de\ShipmentDelivered.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\ShipmentSent.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\de\System.Generic.xml" />
-    <Content Include="App_Data\EmailTemplates\de\System.Campaign.xml" />
-    <Content Include="App_Data\EmailTemplates\de\System.ContactUs.xml" />
-    <Content Include="App_Data\EmailTemplates\de\Wishlist.EmailAFriend.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Blog.BlogComment.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Customer.BackInStock.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Customer.EmailValidationMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Customer.NewOrderNote.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Customer.NewPM.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Customer.PasswordRecovery.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Customer.WelcomeMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Forums.NewForumPost.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Forums.NewForumTopic.xml" />
-    <Content Include="App_Data\EmailTemplates\en\GiftCard.Notification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\NewCustomer.Notification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\NewReturnRequest.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\News.NewsComment.xml" />
-    <Content Include="App_Data\EmailTemplates\en\NewsLetterSubscription.ActivationMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\en\NewsLetterSubscription.DeactivationMessage.xml" />
-    <Content Include="App_Data\EmailTemplates\en\NewVATSubmitted.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\OrderCancelled.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\OrderCompleted.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\OrderPlaced.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\OrderPlaced.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Product.AskQuestion.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Product.ProductReview.xml" />
-    <Content Include="App_Data\EmailTemplates\en\QuantityBelow.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\RecurringPaymentCancelled.StoreOwnerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\ReturnRequestStatusChanged.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Service.EmailAFriend.xml" />
-    <Content Include="App_Data\EmailTemplates\en\ShipmentDelivered.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\ShipmentSent.CustomerNotification.xml" />
-    <Content Include="App_Data\EmailTemplates\en\System.Generic.xml" />
-    <Content Include="App_Data\EmailTemplates\en\System.Campaign.xml" />
-    <Content Include="App_Data\EmailTemplates\en\System.ContactUs.xml" />
-    <Content Include="App_Data\EmailTemplates\en\Wishlist.EmailAFriend.xml" />
-    <Content Include="App_Data\Geo\COPYRIGHT.txt" />
-    <Content Include="App_Data\Geo\LICENSE.txt" />
-    <Content Include="App_Data\Localization\App\de\all.smres.xml">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Data\Localization\App\de\head.txt" />
-    <Content Include="App_Data\Localization\App\en\all.smres.xml">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Data\Localization\App\en\head.txt" />
-    <Content Include="App_Data\Localization\Installation\installation.de.xml" />
-    <Content Include="App_Data\Localization\Installation\installation.en.xml">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Data\Samples\blog\bauhaus-preview.jpg" />
-    <Content Include="App_Data\Samples\blog\bauhaus.jpg" />
-    <Content Include="App_Data\Samples\blog\de\bauhaus.xml" />
-    <Content Include="App_Data\Samples\blog\de\corvette.xml" />
-    <Content Include="App_Data\Samples\blog\de\football.xml" />
-    <Content Include="App_Data\Samples\blog\de\lion.xml" />
-    <Content Include="App_Data\Samples\blog\de\maldives.xml" />
-    <Content Include="App_Data\Samples\blog\de\mountEverest.xml" />
-    <Content Include="App_Data\Samples\blog\en\bauhaus.xml" />
-    <Content Include="App_Data\Samples\blog\en\corvette.xml" />
-    <Content Include="App_Data\Samples\blog\en\football.xml" />
-    <Content Include="App_Data\Samples\blog\en\lion.xml" />
-    <Content Include="App_Data\Samples\blog\en\maldives.xml" />
-    <Content Include="App_Data\Samples\blog\en\mountEverest.xml" />
-    <Content Include="App_Data\Samples\blog\football-preview.jpg" />
-    <Content Include="App_Data\Samples\blog\football.jpg" />
-    <Content Include="App_Data\Samples\blog\lion-preview.jpg" />
-    <Content Include="App_Data\Samples\blog\lion.jpg" />
-    <Content Include="App_Data\Samples\blog\maldives-preview.jpg" />
-    <Content Include="App_Data\Samples\blog\maldives.jpg" />
-    <Content Include="App_Data\Samples\blog\mount-everest-preview.jpg" />
-    <Content Include="App_Data\Samples\blog\mount-everest.jpg" />
-    <Content Include="App_Data\Samples\blog\sportscar.jpg" />
-    <Content Include="App_Data\Samples\brand\wilson.png" />
-    <Content Include="App_Data\Samples\category\0000930_spiegel-bestseller.png" />
-    <Content Include="App_Data\Samples\category\sofas.jpg" />
-    <Content Include="App_Data\Samples\category\tables.jpg" />
-    <Content Include="App_Data\Samples\news\benz-first-modern-car.jpg" />
-    <Content Include="App_Data\Samples\news\de\FirstModernCar.xml" />
-    <Content Include="App_Data\Samples\news\de\MountEverest.xml" />
-    <Content Include="App_Data\Samples\news\de\Titanic.xml" />
-    <Content Include="App_Data\Samples\news\de\ZuseZ3.xml" />
-    <Content Include="App_Data\Samples\news\en\FirstModernCar.xml" />
-    <Content Include="App_Data\Samples\news\en\MountEverest.xml" />
-    <Content Include="App_Data\Samples\news\en\Titanic.xml" />
-    <Content Include="App_Data\Samples\news\en\ZuseZ3.xml" />
-    <Content Include="App_Data\Samples\news\mount-everest-tenzing-hillary.jpg" />
-    <Content Include="App_Data\Samples\news\rms-titanic.jpg" />
-    <Content Include="App_Data\Samples\news\zuse-z3.jpg" />
-    <Content Include="App_Data\Samples\product\0000932_uberman-der-roman.jpeg" />
-    <Content Include="App_Data\Samples\product\0000935_der-gefangene-des-himmels-roman_300.jpeg" />
-    <Content Include="App_Data\Samples\category\0000936_kochen-geniesen.jpeg" />
-    <Content Include="App_Data\Samples\product\0000942_bildatlas-motorrader-mit-mehr-als-350-brillanten-abbildungen.jpeg" />
-    <Content Include="App_Data\Samples\product\0000943_motorrad-abenteuer-fahrtechnik-fur-reise-enduros.jpeg" />
-    <Content Include="App_Data\Samples\product\0000944_autos-der-superlative-die-starksten-die-ersten-die-schonsten-die-schnellsten.jpeg" />
-    <Content Include="App_Data\Samples\product\0000946_fast-cars-bildkalender-2013_300.jpeg" />
-    <Content Include="App_Data\Samples\product\0000947_das-auto-buch-die-grose-chronik-mit-uber-1200-modellen_300.jpeg" />
-    <Content Include="App_Data\Samples\brand\acer.jpg" />
-    <Content Include="App_Data\Samples\download\beethoven-fur-elise.mp3" />
-    <Content Include="App_Data\Samples\product\Beethoven.jpg" />
-    <Content Include="App_Data\Samples\category\accessories.jpg" />
-    <Content Include="App_Data\Samples\category\accessories_apparel.jpg" />
-    <Content Include="App_Data\Samples\category\apparel_shoes.jpeg" />
-    <Content Include="App_Data\Samples\category\apple.png" />
-    <Content Include="App_Data\Samples\category\basketball.png" />
-    <Content Include="App_Data\Samples\category\book.jpeg" />
-    <Content Include="App_Data\Samples\category\camera_photo.jpeg" />
-    <Content Include="App_Data\Samples\category\cellphone.png" />
-    <Content Include="App_Data\Samples\category\computers.png" />
-    <Content Include="App_Data\Samples\category\desktops.png" />
-    <Content Include="App_Data\Samples\category\digitaldownloads.jpg" />
-    <Content Include="App_Data\Samples\category\digitalproducts.jpg" />
-    <Content Include="App_Data\Samples\category\electronics.jpeg" />
-    <Content Include="App_Data\Samples\category\fashion.jpg" />
-    <Content Include="App_Data\Samples\category\furniture.jpg" />
-    <Content Include="App_Data\Samples\category\games.jpg" />
-    <Content Include="App_Data\Samples\category\gaming.png" />
-    <Content Include="App_Data\Samples\category\gaming_accessories.png" />
-    <Content Include="App_Data\Samples\category\gift-cards.png" />
-    <Content Include="App_Data\Samples\category\giftcards.png" />
-    <Content Include="App_Data\Samples\category\glasses.png" />
-    <Content Include="App_Data\Samples\category\golf.jpg" />
-    <Content Include="App_Data\Samples\category\jackets.jpg" />
-    <Content Include="App_Data\Samples\category\leather_jackets.jpg" />
-    <Content Include="App_Data\Samples\category\notebooks.png" />
-    <Content Include="App_Data\Samples\category\shoes.png" />
-    <Content Include="App_Data\Samples\category\soccer.png" />
-    <Content Include="App_Data\Samples\category\sports.jpg" />
-    <Content Include="App_Data\Samples\category\sunglasses.jpg" />
-    <Content Include="App_Data\Samples\category\tracksuit.png" />
-    <Content Include="App_Data\Samples\category\trousers.png" />
-    <Content Include="App_Data\Samples\category\watches.png" />
-    <Content Include="App_Data\Samples\company-logo.png" />
-    <Content Include="App_Data\Samples\category\emblem_library.png" />
-    <Content Include="App_Data\Samples\product\gift-card.jpg" />
-    <Content Include="App_Data\Samples\brand\android.png" />
-    <Content Include="App_Data\Samples\brand\blackberry.png" />
-    <Content Include="App_Data\Samples\brand\canon.png" />
-    <Content Include="App_Data\Samples\brand\casio.png" />
-    <Content Include="App_Data\Samples\brand\certina.png" />
-    <Content Include="App_Data\Samples\brand\dell.png" />
-    <Content Include="App_Data\Samples\brand\hp.png" />
-    <Content Include="App_Data\Samples\brand\htc.png" />
-    <Content Include="App_Data\Samples\brand\lg.png" />
-    <Content Include="App_Data\Samples\brand\microsoft-icon.png" />
-    <Content Include="App_Data\Samples\brand\msi.png" />
-    <Content Include="App_Data\Samples\brand\panasonic.png" />
-    <Content Include="App_Data\Samples\brand\samsung.png" />
-    <Content Include="App_Data\Samples\brand\trekstor.png" />
-    <Content Include="App_Data\Samples\brand\westerndigital.png" />
-    <Content Include="App_Data\Samples\brand\adidas.png" />
-    <Content Include="App_Data\Samples\brand\apple.png" />
-    <Content Include="App_Data\Samples\brand\breitling.png" />
-    <Content Include="App_Data\Samples\brand\EA_Sports.png" />
-    <Content Include="App_Data\Samples\brand\festina.png" />
-    <Content Include="App_Data\Samples\brand\Jack_Wolfskin.png" />
-    <Content Include="App_Data\Samples\brand\MeyAndEdlich.jpg" />
-    <Content Include="App_Data\Samples\brand\microsoft.png" />
-    <Content Include="App_Data\Samples\brand\nike.png" />
-    <Content Include="App_Data\Samples\brand\oakley.png" />
-    <Content Include="App_Data\Samples\brand\puma.jpg" />
-    <Content Include="App_Data\Samples\brand\ray-ban.jpg" />
-    <Content Include="App_Data\Samples\brand\seiko.png" />
-    <Content Include="App_Data\Samples\brand\sony.png" />
-    <Content Include="App_Data\Samples\brand\tissot.png" />
-    <Content Include="App_Data\Samples\brand\titleist.png" />
-    <Content Include="App_Data\Samples\brand\ubisoft.png" />
-    <Content Include="App_Data\Samples\brand\wb.png" />
-    <Content Include="App_Data\Samples\product\airpods_gold.jpg" />
-    <Content Include="App_Data\Samples\product\airpods_lightblue.jpg" />
-    <Content Include="App_Data\Samples\product\airpods_mint.jpg" />
-    <Content Include="App_Data\Samples\product\airpods_rose.jpg" />
-    <Content Include="App_Data\Samples\product\airpods_turquoise.jpg" />
-    <Content Include="App_Data\Samples\product\airpods_white.jpg" />
-    <Content Include="App_Data\Samples\product\ball_chair_black.jpg" />
-    <Content Include="App_Data\Samples\product\ball_chair_white.jpg" />
-    <Content Include="App_Data\Samples\product\bestgrillingrecipes.jpg" />
-    <Content Include="App_Data\Samples\product\certina_ds_podium_big.png" />
-    <Content Include="App_Data\Samples\product\charles_eames_lounge_chair_black.jpg" />
-    <Content Include="App_Data\Samples\product\charles_eames_lounge_chair_white.jpg" />
-    <Content Include="App_Data\Samples\product\clark_premium_jeans.jpg" />
-    <Content Include="App_Data\Samples\product\cookingfortwo.jpg" />
-    <Content Include="App_Data\Samples\product\corbusier_lc6_table_1.jpg" />
-    <Content Include="App_Data\Samples\product\corbusier_lc6_table_2.jpg" />
-    <Content Include="App_Data\Samples\product\corbusier_lc6_table_3.jpg" />
-    <Content Include="App_Data\Samples\product\corbusier_lc6_table_4.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlakSunglasses.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlakSunglasses_black_white.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_24kiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_clear.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_fireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_gray.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_jadeiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_positiverediridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_rubyiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_sapphireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_matteblack_violetiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_24kiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_clear.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_fireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_gray.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_jadeiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_positiverediridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_rubyiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_sapphireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_orangeflare_violetiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_24kiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_clear.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_fireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_gray.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_jadeiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_positiverediridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_rubyiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_sapphireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_polishedwhite_violetiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_24kiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_clear.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_fireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_gray.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_jadeiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_positiverediridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_rubyiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_sapphireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_redline_violetiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_24kiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_clear.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_fireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_gray.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_jadeiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_positiverediridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_rubyiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_sapphireiridium.jpg" />
-    <Content Include="App_Data\Samples\product\CustomFlak_skyblue_violetiridium.jpg" />
-    <Content Include="App_Data\Samples\product\dellinspiron23.png" />
-    <Content Include="App_Data\Samples\product\dualshock4.jpg" />
-    <Content Include="App_Data\Samples\product\evolution-high-school-game-basketball.jpg" />
-    <Content Include="App_Data\Samples\product\fifa17.jpg" />
-    <Content Include="App_Data\Samples\product\gbb-epic-sub-zero-driver.jpg" />
-    <Content Include="App_Data\Samples\product\giftcart.png" />
-    <Content Include="App_Data\Samples\product\gift_card_10.png" />
-    <Content Include="App_Data\Samples\product\gift_card_100.png" />
-    <Content Include="App_Data\Samples\product\gift_card_25.png" />
-    <Content Include="App_Data\Samples\product\gift_card_50.png" />
-    <Content Include="App_Data\Samples\product\hoffmann_cube_chair_black.jpg" />
-    <Content Include="App_Data\Samples\product\horizon.jpg" />
-    <Content Include="App_Data\Samples\product\ipad_1.jpg" />
-    <Content Include="App_Data\Samples\product\ipad_2.jpg" />
-    <Content Include="App_Data\Samples\product\iphone-plus_all_colors.jpg" />
-    <Content Include="App_Data\Samples\product\iphone-plus_black.jpg" />
-    <Content Include="App_Data\Samples\product\iphone-plus_gold.jpg" />
-    <Content Include="App_Data\Samples\product\iphone-plus_red.jpg" />
-    <Content Include="App_Data\Samples\product\iphone-plus_rose.jpg" />
-    <Content Include="App_Data\Samples\product\iphone-plus_silver.jpg" />
-    <Content Include="App_Data\Samples\product\iphoneplus_1.jpg" />
-    <Content Include="App_Data\Samples\product\iphoneplus_2.jpg" />
-    <Content Include="App_Data\Samples\product\isamu_noguchi_coffeetable_1.jpg" />
-    <Content Include="App_Data\Samples\product\isamu_noguchi_coffeetable_2.jpg" />
-    <Content Include="App_Data\Samples\product\jack_wolfskin_kanuka_point_1.png" />
-    <Content Include="App_Data\Samples\product\josef_hoffmann_sofa_cubus_1.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_black.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_blue.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_green.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_navy.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_orange.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_red.jpg" />
-    <Content Include="App_Data\Samples\product\ladies_jacket_silver.jpg" />
-    <Content Include="App_Data\Samples\product\legoworlds.jpg" />
-    <Content Include="App_Data\Samples\product\le_corbusier_lc2_sofa_1.jpg" />
-    <Content Include="App_Data\Samples\product\mies_van_der_rohe_sofa_barcelona_1.jpg" />
-    <Content Include="App_Data\Samples\product\mies_van_der_rohe_tisch_barcelona_1.jpg" />
-    <Content Include="App_Data\Samples\product\minecraft.jpg" />
-    <Content Include="App_Data\Samples\product\nike-strike-football.jpg" />
-    <Content Include="App_Data\Samples\product\nike-vopower-53-trainer-hs-ball.jpg" />
-    <Content Include="App_Data\Samples\product\princeofpersia.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-gold.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-lightblue.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-mint.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-purple.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-rose.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-silver.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-spacegray.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-turquoise.jpg" />
-    <Content Include="App_Data\Samples\product\97-ipad-yellow.jpg" />
-    <Content Include="App_Data\Samples\product\AcerAspireOne_1.jpeg" />
-    <Content Include="App_Data\Samples\product\AcerAspireOne_2.jpeg" />
-    <Content Include="App_Data\Samples\product\aceraspiresl1500.png" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-blue.jpg" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-brown.jpg" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-gray.jpg" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-green.jpg" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-red.jpg" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-white.png" />
-    <Content Include="App_Data\Samples\product\adidas-tango-pasadena-ball-yellow.jpg" />
-    <Content Include="App_Data\Samples\product\adidas_superstar_schuh_1.png" />
-    <Content Include="App_Data\Samples\product\all-court-basketball.png" />
-    <Content Include="App_Data\Samples\product\allstar_charcoal.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_converse.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_hi_charcoal.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_hi_maroon.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_hi_navy.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_hi_purple.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_hi_white.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_maroon.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_navy.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_purple.jpg" />
-    <Content Include="App_Data\Samples\product\allstar_white.jpg" />
-    <Content Include="App_Data\Samples\product\OriginalWayfarer_1.jpg" />
-    <Content Include="App_Data\Samples\product\OriginalWayfarer_2.jpg" />
-    <Content Include="App_Data\Samples\product\OriginalWayfarer_3.jpg" />
-    <Content Include="App_Data\Samples\product\OriginalWayfarer_4.jpg" />
-    <Content Include="App_Data\Samples\product\OriginalWayfarer_5.jpg" />
-    <Content Include="App_Data\Samples\product\OriginalWayfarer_6.jpg" />
-    <Content Include="App_Data\Samples\product\ps4_slim.jpg" />
-    <Content Include="App_Data\Samples\product\ps4_wo_controller.jpg" />
-    <Content Include="App_Data\Samples\product\ps4_w_controller.jpg" />
-    <Content Include="App_Data\Samples\product\radar_ev_prizm.jpg" />
-    <Content Include="App_Data\Samples\product\RayBanTopBar_1.jpg" />
-    <Content Include="App_Data\Samples\product\RayBanTopBar_2.jpg" />
-    <Content Include="App_Data\Samples\product\RayBanTopBar_3.jpg" />
-    <Content Include="App_Data\Samples\product\SeikoSRPA49K1.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_black_1.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_black_2.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_black_3.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_red_1.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_red_2.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_red_3.jpg" />
-    <Content Include="App_Data\Samples\product\shirt_meccanica_red_4.jpg" />
-    <Content Include="App_Data\Samples\product\sony_dualshock4_wirelesscontroller.png" />
-    <Content Include="App_Data\Samples\product\sony_ps3_black.png" />
-    <Content Include="App_Data\Samples\product\sony_ps3_plus_game.png" />
-    <Content Include="App_Data\Samples\product\sony_ps4.png" />
-    <Content Include="App_Data\Samples\product\sony_ps4_bundle.png" />
-    <Content Include="App_Data\Samples\product\sony_ps4_camera.png" />
-    <Content Include="App_Data\Samples\product\supremeGolfball_1.jpg" />
-    <Content Include="App_Data\Samples\product\supremeGolfball_2.jpg" />
-    <Content Include="App_Data\Samples\product\tissot-t-touch-expert-solar-t091_2.jpg" />
-    <Content Include="App_Data\Samples\product\tissot-t-touch-expert-solar.jpg" />
-    <Content Include="App_Data\Samples\product\titleist-pro-v1x.jpg" />
-    <Content Include="App_Data\Samples\product\titleist_sm6_tour_chrome.jpg" />
-    <Content Include="App_Data\Samples\product\torfabrik-offizieller-spielball_blue.png" />
-    <Content Include="App_Data\Samples\product\torfabrik-offizieller-spielball_green.png" />
-    <Content Include="App_Data\Samples\product\torfabrik-offizieller-spielball_red.png" />
-    <Content Include="App_Data\Samples\product\torfabrik-offizieller-spielball_white.png" />
-    <Content Include="App_Data\Samples\product\torfabrik-offizieller-spielball_yellow.png" />
-    <Content Include="App_Data\Samples\product\transocean-chronograph.jpg" />
-    <Content Include="App_Data\Samples\product\ultimate-apple-pro-hipster-bundle.jpg" />
-    <Content Include="App_Data\Samples\product\watchseries2_1.jpg" />
-    <Content Include="App_Data\Samples\product\watchseries2_2.jpg" />
-    <Content Include="App_Data\Samples\product\wolfskin_shoes_coogee_1.png" />
-    <Content Include="App_Data\Samples\product\xbox_one_s_1.png" />
-    <Content Include="App_Data\Samples\product\ps4_bundle_minecraft.jpg" />
-    <Content Include="App_Data\Samples\product\stone_of_wisdom.jpg" />
-    <Content Include="App_Data\Samples\download\vivaldi-four-seasons-spring.mp3" />
-    <Content Include="App_Data\Samples\product\vivaldi.jpg" />
-    <Content Include="App_Data\Samples\product\wayfarer_havana.png" />
-    <Content Include="App_Data\Samples\product\wayfarer_havana_black.png" />
-    <Content Include="App_Data\Samples\product\wayfarer_rayban-black.png" />
-    <Content Include="Content\bs4\js\bootstrap.bundle.js" />
-    <Content Include="Content\bs4\js\bootstrap.bundle.min.js" />
-    <Content Include="Content\bs4\js\bootstrap.js" />
-    <Content Include="Content\bs4\js\bootstrap.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\display\fullscreen.css" />
-    <Content Include="Content\editors\CodeMirror\addon\fold\xml-fold.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\selection\active-line.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\edit\closebrackets.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\edit\closetag.min.js" />
-    <Content Include="Content\editors\CodeMirror\codemirror.custom.css" />
-    <Content Include="Content\editors\CodeMirror\codemirror.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\hint\css-hint.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\display\fullscreen.min.js" />
-    <Content Include="Content\editors\CodeMirror\mode\css\css.min.js" />
-    <Content Include="Content\editors\CodeMirror\codemirror.min.css" />
-    <Content Include="Content\editors\CodeMirror\theme\eclipse.min.css" />
-    <Content Include="Content\editors\CodeMirror\mode\liquid\liquid.css" />
-    <Content Include="Content\editors\CodeMirror\addon\hint\show-hint.min.css" />
-    <Content Include="Content\editors\CodeMirror\addon\hint\html-hint.min.js" />
-    <Content Include="Content\editors\CodeMirror\mode\htmlmixed\htmlmixed.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\hint\javascript-hint.min.js" />
-    <Content Include="Content\editors\CodeMirror\mode\javascript\javascript.min.js" />
-    <Content Include="Content\editors\CodeMirror\mode\liquid\liquid.js" />
-    <Content Include="Content\editors\CodeMirror\addon\edit\matchbrackets.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\edit\matchtags.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\mode\multiplex.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\mode\overlay.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\hint\show-hint.min.js" />
-    <Content Include="Content\editors\CodeMirror\addon\hint\xml-hint.min.js" />
-    <Content Include="Content\editors\CodeMirror\mode\xml\xml.min.js" />
-    <Content Include="Content\editors\summernote\globalinit.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-ar-AR.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-de-DE.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-el-GR.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-es-ES.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-es-EU.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-fa-IR.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-fr-FR.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-it-IT.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-ja-JP.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-nl-NL.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-pl-PL.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-pt-BR.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-pt-PT.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-ru-RU.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-sv-SE.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-tr-TR.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-uk-UA.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-zh-CN.js" />
-    <Content Include="Content\editors\summernote\lang\summernote-zh-TW.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\de-DE.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\es-ES.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\fr-FR.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\it-IT.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\pt-BR.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\ru-RU.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\tr-TR.js" />
-    <Content Include="Content\editors\summernote\plugins\lang\zh-TW.js" />
-    <Content Include="Content\editors\summernote\plugins\smartstore.cssclass.js" />
-    <Content Include="Content\editors\summernote\plugins\smartstore.tablestyles.js" />
-    <Content Include="Content\editors\summernote\plugins\smartstore.link.js" />
-    <Content Include="Content\editors\summernote\plugins\smartstore.image.js" />
-    <Content Include="Content\editors\summernote\summernote-bs4.css" />
-    <Content Include="Content\editors\summernote\summernote-bs4.js" />
-    <Content Include="Content\editors\summernote\summernote-bs4.min.js" />
-    <Content Include="Content\fontastic\fontastic.css" />
-    <Content Include="Content\fontastic\fonts\fontastic.svg" />
-    <Content Include="Content\Images\grip-h.png" />
-    <Content Include="Content\Images\grip-ne.png" />
-    <Content Include="Content\Images\grip-se.png" />
-    <Content Include="Content\Images\grip-v.png" />
-    <Content Include="Content\placeholder.txt" />
-    <Content Include="Content\print-rtl.css" />
-    <Content Include="Content\vendors\aos\js\aos.js" />
-    <Content Include="Content\vendors\beautify\beautify-css.min.js" />
-    <Content Include="Content\vendors\beautify\beautify-html.min.js" />
-    <Content Include="Content\vendors\beautify\beautify.min.js" />
-    <Content Include="Content\vendors\Chart.js\Chart.js" />
-    <Content Include="Content\vendors\Chart.js\Chart.min.js" />
-    <Content Include="Content\vendors\drift\Drift.js" />
-    <Content Include="Content\vendors\drift\Drift.min.js" />
-    <Content Include="Content\vendors\dropzone\js\dropzone.min.js" />
-    <Content Include="Content\vendors\dropzone\js\dropzone.js" />
-    <Content Include="Scripts\smartstore.dropzoneWrapper.js" />
-    <Content Include="Content\vendors\fa5\css\all.css" />
-    <Content Include="Content\vendors\fa5\css\all.min.css" />
-    <Content Include="Content\vendors\fa5\css\brands.css" />
-    <Content Include="Content\vendors\fa5\css\brands.min.css" />
-    <Content Include="Content\vendors\fa5\css\fontawesome.css" />
-    <Content Include="Content\vendors\fa5\css\fontawesome.min.css" />
-    <Content Include="Content\vendors\fa5\css\regular.css" />
-    <Content Include="Content\vendors\fa5\css\regular.min.css" />
-    <Content Include="Content\vendors\fa5\css\solid.css" />
-    <Content Include="Content\vendors\fa5\css\solid.min.css" />
-    <Content Include="Content\vendors\fa5\css\svg-with-js.css" />
-    <Content Include="Content\vendors\fa5\css\svg-with-js.min.css" />
-    <Content Include="Content\vendors\fa5\css\v4-shims.css" />
-    <Content Include="Content\vendors\fa5\css\v4-shims.min.css" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-brands-400.svg" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-regular-400.svg" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-solid-900.svg" />
-    <Content Include="Content\vendors\font-awesome\font-awesome.css" />
-    <Content Include="Content\vendors\font-awesome\font-awesome.min.css" />
-    <Content Include="App_GlobalResources\MvcLocalization.de.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>MvcLocalization.de.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Config\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Content\vendors\font-awesome\fontawesome-webfont.eot" />
-    <Content Include="Content\vendors\font-awesome\fontawesome-webfont.ttf" />
-    <Content Include="Content\vendors\font-awesome\fontawesome-webfont.woff" />
-    <Content Include="Content\vendors\font-awesome\fontawesome-webfont.woff2" />
-    <Content Include="Content\vendors\font-awesome\FontAwesome.otf" />
-    <Content Include="Content\vendors\font-awesome\fontawesome-webfont.svg" />
-    <Content Include="Content\Images\default-image-alt.png" />
-    <Content Include="Content\Images\default-image.png" />
-    <Content Include="Content\Images\grippy.png" />
-    <Content Include="Content\Images\sad.png" />
-    <Content Include="Content\print.css" />
-    <Content Include="Content\vendors\colorpicker\js\bootstrap-colorpicker-globalinit.js" />
-    <Content Include="Content\vendors\colorpicker\js\bootstrap-colorpicker.js" />
-    <Content Include="Content\vendors\datetimepicker\js\tempusdominus-bootstrap-4.js" />
-    <Content Include="Content\vendors\datetimepicker\js\tempusdominus-bootstrap-4.min.js" />
-    <Content Include="Content\vendors\imagesloaded\imagesloaded.pkgd.min.js" />
-    <Content Include="Content\vendors\moment\locale\ar-dz.js" />
-    <Content Include="Content\vendors\moment\locale\ar-kw.js" />
-    <Content Include="Content\vendors\moment\locale\ar-ly.js" />
-    <Content Include="Content\vendors\moment\locale\ar-ma.js" />
-    <Content Include="Content\vendors\moment\locale\ar-sa.js" />
-    <Content Include="Content\vendors\moment\locale\ar-tn.js" />
-    <Content Include="Content\vendors\moment\locale\ar.js" />
-    <Content Include="Content\vendors\moment\locale\be.js" />
-    <Content Include="Content\vendors\moment\locale\bg.js" />
-    <Content Include="Content\vendors\moment\locale\br.js" />
-    <Content Include="Content\vendors\moment\locale\cs.js" />
-    <Content Include="Content\vendors\moment\locale\da.js" />
-    <Content Include="Content\vendors\moment\locale\de-at.js" />
-    <Content Include="Content\vendors\moment\locale\de-ch.js" />
-    <Content Include="Content\vendors\moment\locale\de.js" />
-    <Content Include="Content\vendors\moment\locale\el.js" />
-    <Content Include="Content\vendors\moment\locale\en-au.js" />
-    <Content Include="Content\vendors\moment\locale\en-ca.js" />
-    <Content Include="Content\vendors\moment\locale\en-gb.js" />
-    <Content Include="Content\vendors\moment\locale\en-ie.js" />
-    <Content Include="Content\vendors\moment\locale\en-nz.js" />
-    <Content Include="Content\vendors\moment\locale\es.js" />
-    <Content Include="Content\vendors\moment\locale\fa.js" />
-    <Content Include="Content\vendors\moment\locale\fi.js" />
-    <Content Include="Content\vendors\moment\locale\fr-ca.js" />
-    <Content Include="Content\vendors\moment\locale\fr-ch.js" />
-    <Content Include="Content\vendors\moment\locale\fr.js" />
-    <Content Include="Content\vendors\moment\locale\he.js" />
-    <Content Include="Content\vendors\moment\locale\hi.js" />
-    <Content Include="Content\vendors\moment\locale\hr.js" />
-    <Content Include="Content\vendors\moment\locale\hu.js" />
-    <Content Include="Content\vendors\moment\locale\id.js" />
-    <Content Include="Content\vendors\moment\locale\is.js" />
-    <Content Include="Content\vendors\moment\locale\it.js" />
-    <Content Include="Content\vendors\moment\locale\ja.js" />
-    <Content Include="Content\vendors\moment\locale\jv.js" />
-    <Content Include="Content\vendors\moment\locale\ka.js" />
-    <Content Include="Content\vendors\moment\locale\ko.js" />
-    <Content Include="Content\vendors\moment\locale\nl.js" />
-    <Content Include="Content\vendors\moment\locale\pl.js" />
-    <Content Include="Content\vendors\moment\locale\pt-br.js" />
-    <Content Include="Content\vendors\moment\locale\pt.js" />
-    <Content Include="Content\vendors\moment\locale\ro.js" />
-    <Content Include="Content\vendors\moment\locale\ru.js" />
-    <Content Include="Content\vendors\moment\locale\se.js" />
-    <Content Include="Content\vendors\moment\locale\sk.js" />
-    <Content Include="Content\vendors\moment\locale\sv.js" />
-    <Content Include="Content\vendors\moment\locale\tr.js" />
-    <Content Include="Content\vendors\moment\locale\uk.js" />
-    <Content Include="Content\vendors\moment\locale\x-pseudo.js" />
-    <Content Include="Content\vendors\moment\locale\zh-cn.js" />
-    <Content Include="Content\vendors\moment\locale\zh-hk.js" />
-    <Content Include="Content\vendors\moment\moment.js" />
-    <Content Include="Content\vendors\moment\moment.min.js" />
-    <Content Include="Content\vendors\photoswipe\photoswipe-ui-default.js" />
-    <Content Include="Content\vendors\photoswipe\photoswipe-ui-default.min.js" />
-    <Content Include="Content\vendors\photoswipe\photoswipe.js" />
-    <Content Include="Content\vendors\photoswipe\photoswipe.min.js" />
-    <Content Include="Content\vendors\pnotify\css\pnotify.buttons.css" />
-    <Content Include="Content\vendors\pnotify\css\pnotify.css" />
-    <Content Include="Content\vendors\pnotify\css\pnotify.mobile.css" />
-    <Content Include="Content\vendors\pnotify\js\pnotify.animate.js" />
-    <Content Include="Content\vendors\pnotify\js\pnotify.buttons.js" />
-    <Content Include="Content\vendors\pnotify\js\pnotify.js" />
-    <Content Include="Content\vendors\pnotify\js\pnotify.mobile.js" />
-    <Content Include="Content\vendors\select2\js\i18n\ar.js" />
-    <Content Include="Content\vendors\select2\js\i18n\da.js" />
-    <Content Include="Content\vendors\select2\js\i18n\de.js" />
-    <Content Include="Content\vendors\select2\js\i18n\el.js" />
-    <Content Include="Content\vendors\select2\js\i18n\es.js" />
-    <Content Include="Content\vendors\select2\js\i18n\fa.js" />
-    <Content Include="Content\vendors\select2\js\i18n\fr.js" />
-    <Content Include="Content\vendors\select2\js\i18n\it.js" />
-    <Content Include="Content\vendors\select2\js\i18n\ja.js" />
-    <Content Include="Content\vendors\select2\js\i18n\ko.js" />
-    <Content Include="Content\vendors\select2\js\i18n\nl.js" />
-    <Content Include="Content\vendors\select2\js\i18n\pl.js" />
-    <Content Include="Content\vendors\select2\js\i18n\pt.js" />
-    <Content Include="Content\vendors\select2\js\i18n\ru.js" />
-    <Content Include="Content\vendors\select2\js\i18n\tr.js" />
-    <Content Include="Content\vendors\select2\js\i18n\uk.js" />
-    <Content Include="Content\vendors\select2\js\i18n\zh-CN.js" />
-    <Content Include="Content\vendors\select2\js\i18n\zh-TW.js" />
-    <Content Include="Content\vendors\select2\js\select2.js" />
-    <Content Include="Content\vendors\select2\js\select2.min.js" />
-    <Content Include="Content\vendors\slick\slick.js" />
-    <Content Include="Content\vendors\sortable\jquery-sortable.js" />
-    <Content Include="Content\vendors\vue\vue.min.js" />
-    <Content Include="Content\vendors\vue\vue.js" />
-    <Content Include="Content\vendors\x-editable\bootstrap-editable.css" />
-    <Content Include="Content\vendors\x-editable\bootstrap-editable.js" />
-    <Content Include="Content\vendors\drift\LICENSE" />
-    <Content Include="Content\vendors\photoswipe\LICENSE" />
-    <Content Include="Content\vendors\photoswipe\photoswipe.scss" />
-    <Content Include="Content\vendors\photoswipe\_main-settings.scss" />
-    <Content Include="Content\vendors\slick\slick.scss" />
-    <Content Include="Content\skinning\_drift.scss" />
-    <Content Include="Content\skinning\_photoswipe.scss" />
-    <Content Include="Content\skinning\_slick.scss" />
-    <Content Include="Content\skinning\_touchspin.scss" />
-    <Content Include="Content\shared\_breadcrumb.scss" />
-    <Content Include="Content\shared\_colors.scss" />
-    <Content Include="Content\shared\_nav-collapsible.scss" />
-    <Content Include="Content\shared\_offcanvas.scss" />
-    <Content Include="Content\shared\_star-rating.scss" />
-    <Content Include="App_Data\Samples\download\Stone_of_the_wise_preview.pdf" />
-    <Content Include="Content\editors\summernote\font\summernote.eot" />
-    <Content Include="Content\editors\summernote\font\summernote.ttf" />
-    <Content Include="Content\editors\summernote\font\summernote.woff" />
-    <Content Include="Content\shared\_rtl.scss" />
-    <Content Include="App_Data\widgetzones.json" />
-    <Content Include="Content\skinning\_rtl.scss" />
-    <Content Include="Content\skinning\_summernote.scss" />
-    <Content Include="Content\vendors\aos\scss\aos.scss" />
-    <Content Include="Content\vendors\aos\scss\_animations.scss" />
-    <Content Include="Content\vendors\aos\scss\_easing.scss" />
-    <Content Include="Content\vendors\aos\scss\_core.scss" />
-    <Content Include="Content\bs4\scss\utilities\_shadows.scss" />
-    <Content Include="Content\shared\_rangeslider.scss" />
-    <Content Include="Content\vendors\fa5\scss\brands.scss" />
-    <Content Include="Content\vendors\fa5\scss\fontawesome.scss" />
-    <Content Include="Content\vendors\fa5\scss\regular.scss" />
-    <Content Include="Content\vendors\fa5\scss\solid.scss" />
-    <Content Include="Content\vendors\fa5\scss\v4-shims.scss" />
-    <Content Include="Content\vendors\fa5\scss\_animated.scss" />
-    <Content Include="Content\vendors\fa5\scss\_bordered-pulled.scss" />
-    <Content Include="Content\vendors\fa5\scss\_core.scss" />
-    <Content Include="Content\vendors\fa5\scss\_fixed-width.scss" />
-    <Content Include="Content\vendors\fa5\scss\_icons.scss" />
-    <Content Include="Content\vendors\fa5\scss\_larger.scss" />
-    <Content Include="Content\vendors\fa5\scss\_list.scss" />
-    <Content Include="Content\vendors\fa5\scss\_mixins.scss" />
-    <Content Include="Content\vendors\fa5\scss\_rotated-flipped.scss" />
-    <Content Include="Content\vendors\fa5\scss\_screen-reader.scss" />
-    <Content Include="Content\vendors\fa5\scss\_shims.scss" />
-    <Content Include="Content\vendors\fa5\scss\_stacked.scss" />
-    <Content Include="Content\vendors\fa5\scss\_variables.scss" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-brands-400.eot" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-brands-400.ttf" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-brands-400.woff" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-brands-400.woff2" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-regular-400.eot" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-regular-400.ttf" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-regular-400.woff" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-regular-400.woff2" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-solid-900.eot" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-solid-900.ttf" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-solid-900.woff" />
-    <Content Include="Content\vendors\fa5\webfonts\fa-solid-900.woff2" />
-    <Content Include="Content\shared\_fa.scss" />
-    <Content Include="App_Data\icons.json" />
-    <Content Include="Content\shared\_tree.scss" />
-    <Content Include="Content\bs4\scss\bootstrap-head.scss" />
-    <Content Include="Content\bs4\scss\bootstrap-main.scss" />
-    <Content Include="Content\shared\_custom-scrollbar.scss" />
-    <Content Include="Content\shared\_custom-scrollbar-buttons.scss" />
-    <Content Include="Content\shared\_media.scss" />
-    <Content Include="Content\vendors\rfs\_rfs.scss" />
-    <Content Include="Content\shared\_spacing.scss" />
-    <Content Include="App_Data\Geo\dbip-country-lite.mmdb" />
-    <None Include="Content\vendors\x-editable\README.txt" />
-    <Content Include="favicon.ico" />
-    <Content Include="Refresh.html" />
-    <Content Include="Config\ConnectionStrings.config" />
-    <Content Include="Config\SessionState.config" />
-    <Content Include="Content\vendors\jquery\jquery-3.4.1.js" />
-    <Content Include="Content\vendors\jquery\jquery-3.4.1.min.js" />
-    <Content Include="Content\vendors\jquery\jquery-migrate-3.0.0.js" />
-    <Content Include="Content\vendors\jquery\jquery-migrate-3.0.0.min.js" />
-    <Content Include="Content\vendors\jquery-ui\core.js" />
-    <Content Include="Content\vendors\jquery-ui\effect-shake.js" />
-    <Content Include="Content\vendors\jquery-ui\effect-transfer.js" />
-    <Content Include="Content\vendors\jquery-ui\effect.js" />
-    <Content Include="Content\vendors\jquery-ui\position.js" />
-    <Content Include="Content\vendors\jquery-ui\widget.js" />
-    <Content Include="Content\vendors\touchspin\jquery.bootstrap-touchspin.js" />
-    <Content Include="Content\vendors\sortable\sortable.js" />
-    <Content Include="Content\vendors\jquery\jquery.unobtrusive-ajax.js" />
-    <Content Include="Content\vendors\jquery\jquery.unobtrusive-ajax.min.js" />
-    <Content Include="Content\bs4\js\bootstrap.bundle.js.map" />
-    <Content Include="Content\bs4\js\bootstrap.bundle.min.js.map" />
-    <Content Include="Content\bs4\js\bootstrap.js.map" />
-    <Content Include="Content\bs4\js\bootstrap.min.js.map" />
-    <Content Include="Content\bs4\scss\bootstrap-grid.scss" />
-    <Content Include="Content\bs4\scss\bootstrap-reboot.scss" />
-    <Content Include="Content\bs4\scss\bootstrap.scss" />
-    <Content Include="Content\bs4\scss\mixins\_alert.scss" />
-    <Content Include="Content\bs4\scss\mixins\_background-variant.scss" />
-    <Content Include="Content\bs4\scss\mixins\_badge.scss" />
-    <Content Include="Content\bs4\scss\mixins\_border-radius.scss" />
-    <Content Include="Content\bs4\scss\mixins\_box-shadow.scss" />
-    <Content Include="Content\bs4\scss\mixins\_breakpoints.scss" />
-    <Content Include="Content\bs4\scss\mixins\_buttons.scss" />
-    <Content Include="Content\bs4\scss\mixins\_caret.scss" />
-    <Content Include="Content\bs4\scss\mixins\_clearfix.scss" />
-    <Content Include="Content\bs4\scss\mixins\_float.scss" />
-    <Content Include="Content\bs4\scss\mixins\_forms.scss" />
-    <Content Include="Content\bs4\scss\mixins\_gradients.scss" />
-    <Content Include="Content\bs4\scss\mixins\_grid-framework.scss" />
-    <Content Include="Content\bs4\scss\mixins\_grid.scss" />
-    <Content Include="Content\bs4\scss\mixins\_hover.scss" />
-    <Content Include="Content\bs4\scss\mixins\_image.scss" />
-    <Content Include="Content\bs4\scss\mixins\_list-group.scss" />
-    <Content Include="Content\bs4\scss\mixins\_lists.scss" />
-    <Content Include="Content\bs4\scss\mixins\_nav-divider.scss" />
-    <Content Include="Content\bs4\scss\mixins\_pagination.scss" />
-    <Content Include="Content\bs4\scss\mixins\_reset-text.scss" />
-    <Content Include="Content\bs4\scss\mixins\_resize.scss" />
-    <Content Include="Content\bs4\scss\mixins\_screen-reader.scss" />
-    <Content Include="Content\bs4\scss\mixins\_size.scss" />
-    <Content Include="Content\bs4\scss\mixins\_table-row.scss" />
-    <Content Include="Content\bs4\scss\mixins\_text-emphasis.scss" />
-    <Content Include="Content\bs4\scss\mixins\_text-hide.scss" />
-    <Content Include="Content\bs4\scss\mixins\_text-truncate.scss" />
-    <Content Include="Content\bs4\scss\mixins\_transition.scss" />
-    <Content Include="Content\bs4\scss\mixins\_visibility.scss" />
-    <Content Include="Content\bs4\scss\utilities\_align.scss" />
-    <Content Include="Content\bs4\scss\utilities\_background.scss" />
-    <Content Include="Content\bs4\scss\utilities\_borders.scss" />
-    <Content Include="Content\bs4\scss\utilities\_clearfix.scss" />
-    <Content Include="Content\bs4\scss\utilities\_display.scss" />
-    <Content Include="Content\bs4\scss\utilities\_embed.scss" />
-    <Content Include="Content\bs4\scss\utilities\_flex.scss" />
-    <Content Include="Content\bs4\scss\utilities\_float.scss" />
-    <Content Include="Content\bs4\scss\utilities\_position.scss" />
-    <Content Include="Content\bs4\scss\utilities\_screenreaders.scss" />
-    <Content Include="Content\bs4\scss\utilities\_sizing.scss" />
-    <Content Include="Content\bs4\scss\utilities\_spacing.scss" />
-    <Content Include="Content\bs4\scss\utilities\_text.scss" />
-    <Content Include="Content\bs4\scss\utilities\_visibility.scss" />
-    <Content Include="Content\bs4\scss\_alert.scss" />
-    <Content Include="Content\bs4\scss\_badge.scss" />
-    <Content Include="Content\bs4\scss\_breadcrumb.scss" />
-    <Content Include="Content\bs4\scss\_button-group.scss" />
-    <Content Include="Content\bs4\scss\_buttons.scss" />
-    <Content Include="Content\bs4\scss\_card.scss" />
-    <Content Include="Content\bs4\scss\_carousel.scss" />
-    <Content Include="Content\bs4\scss\_close.scss" />
-    <Content Include="Content\bs4\scss\_code.scss" />
-    <Content Include="Content\bs4\scss\_custom-forms.scss" />
-    <Content Include="Content\bs4\scss\_dropdown.scss" />
-    <Content Include="Content\bs4\scss\_forms.scss" />
-    <Content Include="Content\bs4\scss\_functions.scss" />
-    <Content Include="Content\bs4\scss\_grid.scss" />
-    <Content Include="Content\bs4\scss\_images.scss" />
-    <Content Include="Content\bs4\scss\_input-group.scss" />
-    <Content Include="Content\bs4\scss\_jumbotron.scss" />
-    <Content Include="Content\bs4\scss\_list-group.scss" />
-    <Content Include="Content\bs4\scss\_media.scss" />
-    <Content Include="Content\bs4\scss\_mixins.scss" />
-    <Content Include="Content\bs4\scss\_modal.scss" />
-    <Content Include="Content\bs4\scss\_nav.scss" />
-    <Content Include="Content\bs4\scss\_navbar.scss" />
-    <Content Include="Content\bs4\scss\_pagination.scss" />
-    <Content Include="Content\bs4\scss\_popover.scss" />
-    <Content Include="Content\bs4\scss\_print.scss" />
-    <Content Include="Content\bs4\scss\_progress.scss" />
-    <Content Include="Content\bs4\scss\_reboot.scss" />
-    <Content Include="Content\bs4\scss\_root.scss" />
-    <Content Include="Content\bs4\scss\_tables.scss" />
-    <Content Include="Content\bs4\scss\_tooltip.scss" />
-    <Content Include="Content\bs4\scss\_transitions.scss" />
-    <Content Include="Content\bs4\scss\_type.scss" />
-    <Content Include="Content\bs4\scss\_utilities.scss" />
-    <Content Include="Content\bs4\scss\_variables.scss" />
-    <Content Include="Content\shared\_alert.scss" />
-    <Content Include="Content\shared\_buttons.scss" />
-    <Content Include="Content\shared\_card.scss" />
-    <Content Include="Content\shared\_choice.scss" />
-    <Content Include="Content\shared\_dropdown.scss" />
-    <Content Include="Content\shared\_entity-picker.scss" />
-    <Content Include="Content\shared\_forms.scss" />
-    <Content Include="Content\shared\_mixins.scss" />
-    <Content Include="Content\shared\_modal.scss" />
-    <Content Include="Content\shared\_nav.scss" />
-    <Content Include="Content\shared\_pagination.scss" />
-    <Content Include="Content\shared\_sortable-grip.scss" />
-    <Content Include="Content\shared\_spinner.scss" />
-    <Content Include="Content\shared\_switch.scss" />
-    <Content Include="Content\shared\_throbber.scss" />
-    <Content Include="Content\shared\_typo.scss" />
-    <Content Include="Content\shared\_utils.scss" />
-    <Content Include="Content\shared\_variables-shared.scss" />
-    <Content Include="Content\vendors\colorpicker\scss\_colorpicker.scss" />
-    <Content Include="Content\vendors\datetimepicker\scss\_tempusdominus.scss" />
-    <Content Include="Content\vendors\select2\scss\_dropdown.scss" />
-    <Content Include="Content\vendors\select2\scss\_multiple.scss" />
-    <Content Include="Content\vendors\select2\scss\_single.scss" />
-    <Content Include="Content\vendors\select2\scss\core.scss" />
-    <Content Include="Content\skinning\_fileupload.scss" />
-    <Content Include="Content\skinning\_pnotify.scss" />
-    <Content Include="Content\skinning\_select2.scss" />
-    <Content Include="Content\fontastic\fonts\fontastic.ttf" />
-    <Content Include="Content\fontastic\fonts\fontastic.woff" />
-    <None Include="Content\vendors\jquery\jquery.validate-vsdoc.js" />
-    <Content Include="Content\vendors\jquery\jquery.validate.js" />
-    <Content Include="Content\vendors\jquery\jquery.validate.min.js" />
-    <Content Include="Scripts\jquery.validate.unobtrusive.custom.js" />
-    <Content Include="Content\vendors\jquery\jquery.validate.unobtrusive.js" />
-    <Content Include="Content\vendors\jquery\jquery.validate.unobtrusive.min.js" />
-    <Content Include="Content\vendors\modernizr\modernizr.js" />
-    <Content Include="Scripts\smartstore.dialogs.js" />
-    <Content Include="Scripts\smartstore.media.js" />
-    <Content Include="Scripts\smartstore.tree.js" />
-    <Content Include="Scripts\smartstore.linkbuilder.js" />
-    <Content Include="Scripts\smartstore.rangeslider.js" />
-    <Content Include="Scripts\smartstore.keynav.js" />
-    <Content Include="Scripts\smartstore.parallax.js" />
-    <Content Include="Scripts\smartstore.offcanvas.js" />
-    <Content Include="Scripts\public.offcanvas-cart.js" />
-    <Content Include="Scripts\public.offcanvas-menu.js" />
-    <Content Include="Scripts\public.product.js" />
-    <Content Include="Scripts\public.search.js" />
-    <Content Include="Scripts\smartstore.articlelist.js" />
-    <Content Include="Scripts\smartstore.gallery.js" />
-    <Content Include="Scripts\smartstore.globalization.adapter.js" />
-    <Content Include="Scripts\smartstore.globalization.js" />
-    <Content Include="Scripts\smartstore.megamenu.js" />
-    <Content Include="Scripts\smartstore.responsiveNav.js" />
-    <Content Include="Scripts\smartstore.touchevents.js" />
-    <Content Include="Scripts\smartstore.viewport.js" />
-    <Content Include="Content\vendors\underscore\underscore.min.js" />
-    <Content Include="Content\vendors\underscore\underscore.js" />
-    <Content Include="Themes\FlexBlue\preview.png" />
-    <Content Include="Themes\FlexBlack\preview.png" />
-    <Content Include="Scripts\smartstore.entitypicker.js" />
-    <Content Include="Scripts\smartstore.instantsearch.js" />
-    <Content Include="Scripts\smartstore.common.js" />
-    <Content Include="Scripts\public.voting.js" />
-    <Content Include="Scripts\public.reviews.js" />
-    <Content Include="Content\vendors\jquery\jquery.scrollTo.js" />
-    <Content Include="Themes\Flex\Content\_text-expander.scss" />
-    <Content Include="Themes\FlexBlack\Content\_user.scss" />
-    <Content Include="Themes\FlexBlack\Content\_custom.scss" />
-    <Content Include="Themes\FlexBlack\Views\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Themes\FlexBlack\theme.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Themes\FlexBlue\Content\_custom.scss" />
-    <Content Include="Themes\FlexBlue\Content\_user.scss" />
-    <Content Include="Themes\FlexBlue\theme.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Themes\FlexBlue\Views\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Content\vendors\underscore\underscore.min.map" />
-    <Content Include="Themes\Flex\Content\images\loading.gif" />
-    <Content Include="Themes\Flex\Content\images\star-off-12.png" />
-    <Content Include="Themes\Flex\Content\images\star-off.png" />
-    <Content Include="Themes\Flex\Content\images\star-on-12.png" />
-    <Content Include="Themes\Flex\Content\images\star-on.png" />
-    <Content Include="Content\Web.config" />
-    <None Include="Themes\Flex\Content\compiled\theme.css" />
-    <Content Include="Themes\Flex\Content\images\grippy.png" />
-    <Content Include="Themes\Flex\Content\_megamenu.scss" />
-    <Content Include="Themes\Flex\preview.png" />
-    <Content Include="Content\Images\star-off-12.png" />
-    <Content Include="Content\Images\star-off.png" />
-    <Content Include="Content\Images\star-on-12.png" />
-    <Content Include="Content\Images\star-on.png" />
-    <Content Include="Content\editors\BBEditor\ed.js" />
-    <Content Include="Content\Images\ajax_loader_small.gif" />
-    <Content Include="Content\Images\flags\ad.png" />
-    <Content Include="Content\Images\flags\ae.png" />
-    <Content Include="Content\Images\flags\af.png" />
-    <Content Include="Content\Images\flags\ag.png" />
-    <Content Include="Content\Images\flags\ai.png" />
-    <Content Include="Content\Images\flags\al.png" />
-    <Content Include="Content\Images\flags\am.png" />
-    <Content Include="Content\Images\flags\an.png" />
-    <Content Include="Content\Images\flags\ao.png" />
-    <Content Include="Content\Images\flags\ar.png" />
-    <Content Include="Content\Images\flags\as.png" />
-    <Content Include="Content\Images\flags\at.png" />
-    <Content Include="Content\Images\flags\au.png" />
-    <Content Include="Content\Images\flags\aw.png" />
-    <Content Include="Content\Images\flags\ax.png" />
-    <Content Include="Content\Images\flags\az.png" />
-    <Content Include="Content\Images\flags\ba.png" />
-    <Content Include="Content\Images\flags\bb.png" />
-    <Content Include="Content\Images\flags\bd.png" />
-    <Content Include="Content\Images\flags\be.png" />
-    <Content Include="Content\Images\flags\bf.png" />
-    <Content Include="Content\Images\flags\bg.png" />
-    <Content Include="Content\Images\flags\bh.png" />
-    <Content Include="Content\Images\flags\bi.png" />
-    <Content Include="Content\Images\flags\bj.png" />
-    <Content Include="Content\Images\flags\bm.png" />
-    <Content Include="Content\Images\flags\bn.png" />
-    <Content Include="Content\Images\flags\bo.png" />
-    <Content Include="Content\Images\flags\br.png" />
-    <Content Include="Content\Images\flags\bs.png" />
-    <Content Include="Content\Images\flags\bt.png" />
-    <Content Include="Content\Images\flags\bv.png" />
-    <Content Include="Content\Images\flags\bw.png" />
-    <Content Include="Content\Images\flags\by.png" />
-    <Content Include="Content\Images\flags\bz.png" />
-    <Content Include="Content\Images\flags\ca.png" />
-    <Content Include="Content\Images\flags\catalonia.png" />
-    <Content Include="Content\Images\flags\cc.png" />
-    <Content Include="Content\Images\flags\cd.png" />
-    <Content Include="Content\Images\flags\cf.png" />
-    <Content Include="Content\Images\flags\cg.png" />
-    <Content Include="Content\Images\flags\ch.png" />
-    <Content Include="Content\Images\flags\ci.png" />
-    <Content Include="Content\Images\flags\ck.png" />
-    <Content Include="Content\Images\flags\cl.png" />
-    <Content Include="Content\Images\flags\cm.png" />
-    <Content Include="Content\Images\flags\cn.png" />
-    <Content Include="Content\Images\flags\co.png" />
-    <Content Include="Content\Images\flags\cr.png" />
-    <Content Include="Content\Images\flags\cs.png" />
-    <Content Include="Content\Images\flags\cu.png" />
-    <Content Include="Content\Images\flags\cv.png" />
-    <Content Include="Content\Images\flags\cx.png" />
-    <Content Include="Content\Images\flags\cy.png" />
-    <Content Include="Content\Images\flags\cz.png" />
-    <Content Include="Content\Images\flags\de.png" />
-    <Content Include="Content\Images\flags\dj.png" />
-    <Content Include="Content\Images\flags\dk.png" />
-    <Content Include="Content\Images\flags\dm.png" />
-    <Content Include="Content\Images\flags\do.png" />
-    <Content Include="Content\Images\flags\dz.png" />
-    <Content Include="Content\Images\flags\ec.png" />
-    <Content Include="Content\Images\flags\ee.png" />
-    <Content Include="Content\Images\flags\eg.png" />
-    <Content Include="Content\Images\flags\eh.png" />
-    <Content Include="Content\Images\flags\england.png" />
-    <Content Include="Content\Images\flags\er.png" />
-    <Content Include="Content\Images\flags\es.png" />
-    <Content Include="Content\Images\flags\et.png" />
-    <Content Include="Content\Images\flags\europeanunion.png" />
-    <Content Include="Content\Images\flags\fam.png" />
-    <Content Include="Content\Images\flags\fi.png" />
-    <Content Include="Content\Images\flags\fj.png" />
-    <Content Include="Content\Images\flags\fk.png" />
-    <Content Include="Content\Images\flags\fm.png" />
-    <Content Include="Content\Images\flags\fo.png" />
-    <Content Include="Content\Images\flags\fr.png" />
-    <Content Include="Content\Images\flags\ga.png" />
-    <Content Include="Content\Images\flags\gb.png" />
-    <Content Include="Content\Images\flags\gd.png" />
-    <Content Include="Content\Images\flags\ge.png" />
-    <Content Include="Content\Images\flags\gf.png" />
-    <Content Include="Content\Images\flags\gh.png" />
-    <Content Include="Content\Images\flags\gi.png" />
-    <Content Include="Content\Images\flags\gl.png" />
-    <Content Include="Content\Images\flags\gm.png" />
-    <Content Include="Content\Images\flags\gn.png" />
-    <Content Include="Content\Images\flags\gp.png" />
-    <Content Include="Content\Images\flags\gq.png" />
-    <Content Include="Content\Images\flags\gr.png" />
-    <Content Include="Content\Images\flags\gs.png" />
-    <Content Include="Content\Images\flags\gt.png" />
-    <Content Include="Content\Images\flags\gu.png" />
-    <Content Include="Content\Images\flags\gw.png" />
-    <Content Include="Content\Images\flags\gy.png" />
-    <Content Include="Content\Images\flags\hk.png" />
-    <Content Include="Content\Images\flags\hm.png" />
-    <Content Include="Content\Images\flags\hn.png" />
-    <Content Include="Content\Images\flags\hr.png" />
-    <Content Include="Content\Images\flags\ht.png" />
-    <Content Include="Content\Images\flags\hu.png" />
-    <Content Include="Content\Images\flags\id.png" />
-    <Content Include="Content\Images\flags\ie.png" />
-    <Content Include="Content\Images\flags\il.png" />
-    <Content Include="Content\Images\flags\in.png" />
-    <Content Include="Content\Images\flags\io.png" />
-    <Content Include="Content\Images\flags\iq.png" />
-    <Content Include="Content\Images\flags\ir.png" />
-    <Content Include="Content\Images\flags\is.png" />
-    <Content Include="Content\Images\flags\it.png" />
-    <Content Include="Content\Images\flags\jm.png" />
-    <Content Include="Content\Images\flags\jo.png" />
-    <Content Include="Content\Images\flags\jp.png" />
-    <Content Include="Content\Images\flags\ke.png" />
-    <Content Include="Content\Images\flags\kg.png" />
-    <Content Include="Content\Images\flags\kh.png" />
-    <Content Include="Content\Images\flags\ki.png" />
-    <Content Include="Content\Images\flags\km.png" />
-    <Content Include="Content\Images\flags\kn.png" />
-    <Content Include="Content\Images\flags\kp.png" />
-    <Content Include="Content\Images\flags\kr.png" />
-    <Content Include="Content\Images\flags\kw.png" />
-    <Content Include="Content\Images\flags\ky.png" />
-    <Content Include="Content\Images\flags\kz.png" />
-    <Content Include="Content\Images\flags\la.png" />
-    <Content Include="Content\Images\flags\lb.png" />
-    <Content Include="Content\Images\flags\lc.png" />
-    <Content Include="Content\Images\flags\li.png" />
-    <Content Include="Content\Images\flags\lk.png" />
-    <Content Include="Content\Images\flags\lr.png" />
-    <Content Include="Content\Images\flags\ls.png" />
-    <Content Include="Content\Images\flags\lt.png" />
-    <Content Include="Content\Images\flags\lu.png" />
-    <Content Include="Content\Images\flags\lv.png" />
-    <Content Include="Content\Images\flags\ly.png" />
-    <Content Include="Content\Images\flags\ma.png" />
-    <Content Include="Content\Images\flags\mc.png" />
-    <Content Include="Content\Images\flags\md.png" />
-    <Content Include="Content\Images\flags\me.png" />
-    <Content Include="Content\Images\flags\mg.png" />
-    <Content Include="Content\Images\flags\mh.png" />
-    <Content Include="Content\Images\flags\mk.png" />
-    <Content Include="Content\Images\flags\ml.png" />
-    <Content Include="Content\Images\flags\mm.png" />
-    <Content Include="Content\Images\flags\mn.png" />
-    <Content Include="Content\Images\flags\mo.png" />
-    <Content Include="Content\Images\flags\mp.png" />
-    <Content Include="Content\Images\flags\mq.png" />
-    <Content Include="Content\Images\flags\mr.png" />
-    <Content Include="Content\Images\flags\ms.png" />
-    <Content Include="Content\Images\flags\mt.png" />
-    <Content Include="Content\Images\flags\mu.png" />
-    <Content Include="Content\Images\flags\mv.png" />
-    <Content Include="Content\Images\flags\mw.png" />
-    <Content Include="Content\Images\flags\mx.png" />
-    <Content Include="Content\Images\flags\my.png" />
-    <Content Include="Content\Images\flags\mz.png" />
-    <Content Include="Content\Images\flags\na.png" />
-    <Content Include="Content\Images\flags\nc.png" />
-    <Content Include="Content\Images\flags\ne.png" />
-    <Content Include="Content\Images\flags\nf.png" />
-    <Content Include="Content\Images\flags\ng.png" />
-    <Content Include="Content\Images\flags\ni.png" />
-    <Content Include="Content\Images\flags\nl.png" />
-    <Content Include="Content\Images\flags\no.png" />
-    <Content Include="Content\Images\flags\np.png" />
-    <Content Include="Content\Images\flags\nr.png" />
-    <Content Include="Content\Images\flags\nu.png" />
-    <Content Include="Content\Images\flags\nz.png" />
-    <Content Include="Content\Images\flags\om.png" />
-    <Content Include="Content\Images\flags\pa.png" />
-    <Content Include="Content\Images\flags\pe.png" />
-    <Content Include="Content\Images\flags\pf.png" />
-    <Content Include="Content\Images\flags\pg.png" />
-    <Content Include="Content\Images\flags\ph.png" />
-    <Content Include="Content\Images\flags\pk.png" />
-    <Content Include="Content\Images\flags\pl.png" />
-    <Content Include="Content\Images\flags\pm.png" />
-    <Content Include="Content\Images\flags\pn.png" />
-    <Content Include="Content\Images\flags\pr.png" />
-    <Content Include="Content\Images\flags\ps.png" />
-    <Content Include="Content\Images\flags\pt.png" />
-    <Content Include="Content\Images\flags\pw.png" />
-    <Content Include="Content\Images\flags\py.png" />
-    <Content Include="Content\Images\flags\qa.png" />
-    <Content Include="Content\Images\flags\re.png" />
-    <Content Include="Content\Images\flags\ro.png" />
-    <Content Include="Content\Images\flags\rs.png" />
-    <Content Include="Content\Images\flags\ru.png" />
-    <Content Include="Content\Images\flags\rw.png" />
-    <Content Include="Content\Images\flags\sa.png" />
-    <Content Include="Content\Images\flags\sb.png" />
-    <Content Include="Content\Images\flags\sc.png" />
-    <Content Include="Content\Images\flags\scotland.png" />
-    <Content Include="Content\Images\flags\sd.png" />
-    <Content Include="Content\Images\flags\se.png" />
-    <Content Include="Content\Images\flags\sg.png" />
-    <Content Include="Content\Images\flags\sh.png" />
-    <Content Include="Content\Images\flags\si.png" />
-    <Content Include="Content\Images\flags\sj.png" />
-    <Content Include="Content\Images\flags\sk.png" />
-    <Content Include="Content\Images\flags\sl.png" />
-    <Content Include="Content\Images\flags\sm.png" />
-    <Content Include="Content\Images\flags\sn.png" />
-    <Content Include="Content\Images\flags\so.png" />
-    <Content Include="Content\Images\flags\sr.png" />
-    <Content Include="Content\Images\flags\st.png" />
-    <Content Include="Content\Images\flags\sv.png" />
-    <Content Include="Content\Images\flags\sy.png" />
-    <Content Include="Content\Images\flags\sz.png" />
-    <Content Include="Content\Images\flags\tc.png" />
-    <Content Include="Content\Images\flags\td.png" />
-    <Content Include="Content\Images\flags\tf.png" />
-    <Content Include="Content\Images\flags\tg.png" />
-    <Content Include="Content\Images\flags\th.png" />
-    <Content Include="Content\Images\flags\tj.png" />
-    <Content Include="Content\Images\flags\tk.png" />
-    <Content Include="Content\Images\flags\tl.png" />
-    <Content Include="Content\Images\flags\tm.png" />
-    <Content Include="Content\Images\flags\tn.png" />
-    <Content Include="Content\Images\flags\to.png" />
-    <Content Include="Content\Images\flags\tr.png" />
-    <Content Include="Content\Images\flags\tt.png" />
-    <Content Include="Content\Images\flags\tv.png" />
-    <Content Include="Content\Images\flags\tw.png" />
-    <Content Include="Content\Images\flags\tz.png" />
-    <Content Include="Content\Images\flags\ua.png" />
-    <Content Include="Content\Images\flags\ug.png" />
-    <Content Include="Content\Images\flags\um.png" />
-    <Content Include="Content\Images\flags\us.png" />
-    <Content Include="Content\Images\flags\uy.png" />
-    <Content Include="Content\Images\flags\uz.png" />
-    <Content Include="Content\Images\flags\va.png" />
-    <Content Include="Content\Images\flags\vc.png" />
-    <Content Include="Content\Images\flags\ve.png" />
-    <Content Include="Content\Images\flags\vg.png" />
-    <Content Include="Content\Images\flags\vi.png" />
-    <Content Include="Content\Images\flags\vn.png" />
-    <Content Include="Content\Images\flags\vu.png" />
-    <Content Include="Content\Images\flags\wales.png" />
-    <Content Include="Content\Images\flags\wf.png" />
-    <Content Include="Content\Images\flags\ws.png" />
-    <Content Include="Content\Images\flags\ye.png" />
-    <Content Include="Content\Images\flags\yt.png" />
-    <Content Include="Content\Images\flags\za.png" />
-    <Content Include="Content\Images\flags\zm.png" />
-    <Content Include="Content\Images\flags\zw.png" />
-    <Content Include="Scripts\public.shopbar.js" />
-    <Content Include="Scripts\smartstore.eventbroker.js" />
-    <Content Include="Scripts\smartstore.selectwrapper.js" />
-    <Content Include="Scripts\smartstore.thumbzoomer.js" />
-    <Content Include="Scripts\underscore.mixins.js" />
-    <Content Include="Content\vendors\underscore\underscore.string.js" />
-    <Content Include="Content\vendors\underscore\underscore.string.min.js" />
-    <None Include="Scripts\_references.js" />
-    <Content Include="Global.asax" />
-    <Content Include="license.txt" />
-    <Content Include="Content\vendors\jquery\jquery.addeasing.js" />
-    <Content Include="Content\vendors\jquery\jquery.ba-outside-events.js" />
-    <Content Include="Content\vendors\jquery\jquery.ba-outside-events.min.js" />
-    <Content Include="Scripts\smartstore.doajax.js" />
-    <Content Include="Scripts\smartstore.throbber.js" />
-    <Content Include="Scripts\smartstore.hacks.js" />
-    <Content Include="Scripts\public.ajaxcart.js" />
-    <Content Include="Scripts\public.common.js" />
-    <Content Include="Scripts\smartstore.jquery.utils.js" />
-    <Content Include="Scripts\smartstore.system.js" />
-    <Content Include="Views\Shared\ConfigureTheme.cshtml" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Themes\Web.config" />
-    <Content Include="Themes\Flex\Content\_shopbar.scss" />
-    <Content Include="Themes\Flex\Content\_login.scss" />
-    <Content Include="Themes\Flex\Content\theme.scss">
-      <Compile>True</Compile>
-      <Minify>True</Minify>
-      <OutputFolder>.\output</OutputFolder>
-      <IgnoreWarnings>True</IgnoreWarnings>
-      <IgnoreErrors>True</IgnoreErrors>
-      <CompileStyle>Nested</CompileStyle>
-      <DebugInfo>False</DebugInfo>
-    </Content>
-    <Content Include="Themes\Flex\theme.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Themes\Flex\Views\Shared\Head.cshtml" />
-    <Content Include="Themes\Flex\Views\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Views\Shared\Layouts\_Document.cshtml" />
-    <Content Include="Views\Shared\Partials\ConditionalComments.cshtml" />
-    <Content Include="Themes\Flex\Views\Shared\ConfigureTheme.cshtml" />
-    <Content Include="Views\Shared\Error.cshtml" />
-    <Content Include="Views\Shared\LicenseRequired.cshtml" />
-    <Content Include="Views\Shared\NotFound.cshtml" />
-    <Content Include="Views\Shared\Partials\_ClientRes.cshtml" />
-    <Content Include="Views\Shared\Partials\_CreateOrUpdateAddress.cshtml" />
-    <Content Include="Views\Shared\Partials\_Notifications.cshtml" />
-    <Content Include="Views\Shared\Layouts\_Print.cshtml" />
-    <Content Include="Views\Shared\Layouts\_Layout.cshtml" />
-    <Content Include="Views\Shared\Layouts\_Layout.Popup.cshtml" />
-    <Content Include="Views\Blog\Partials\BlogMonths.cshtml" />
-    <Content Include="Views\Blog\BlogPost.cshtml" />
-    <Content Include="Views\Blog\Partials\BlogTags.cshtml" />
-    <Content Include="Views\Blog\List.cshtml" />
-    <Content Include="Views\Boards\ActiveDiscussions.cshtml" />
-    <Content Include="Views\Boards\Forum.cshtml" />
-    <Content Include="Views\Boards\ForumGroup.cshtml" />
-    <Content Include="Views\Boards\Index.cshtml" />
-    <Content Include="Views\Boards\Partials\LastPost.cshtml" />
-    <Content Include="Views\Boards\PostCreate.cshtml" />
-    <Content Include="Views\Boards\PostEdit.cshtml" />
-    <Content Include="Views\Boards\Search.cshtml" />
-    <Content Include="Views\Boards\Topic.cshtml" />
-    <Content Include="Views\Boards\TopicCreate.cshtml" />
-    <Content Include="Views\Boards\TopicEdit.cshtml" />
-    <Content Include="Views\Boards\TopicMove.cshtml" />
-    <Content Include="Views\Boards\Partials\_ActiveTopics.cshtml" />
-    <Content Include="Views\Boards\Partials\_CreateUpdatePost.cshtml" />
-    <Content Include="Views\Boards\Partials\_CreateUpdateTopic.cshtml" />
-    <Content Include="Views\Boards\Partials\ForumGroup.cshtml" />
-    <Content Include="Views\Boards\Partials\_ForumPost.cshtml" />
-    <Content Include="Views\Catalog\CategoryTemplate.ProductsInGridOrLines.cshtml" />
-    <Content Include="Views\Catalog\CompareProducts.cshtml" />
-    <Content Include="Views\Catalog\Partials\HomepageBestSellers.cshtml" />
-    <Content Include="Views\Catalog\Partials\HomepageCategories.cshtml" />
-    <Content Include="Views\Catalog\Partials\HomepageProducts.cshtml" />
-    <Content Include="Views\Catalog\ManufacturerAll.cshtml" />
-    <Content Include="Views\Catalog\ManufacturerTemplate.ProductsInGridOrLines.cshtml" />
-    <Content Include="Views\Catalog\Partials\PopularProductTags.cshtml" />
-    <Content Include="Views\Catalog\ProductsByTag.cshtml" />
-    <Content Include="Views\Catalog\ProductTagsAll.cshtml" />
-    <Content Include="Views\Catalog\RecentlyAddedProducts.cshtml" />
-    <Content Include="Views\Catalog\RecentlyViewedProducts.cshtml" />
-    <Content Include="Views\Catalog\Partials\RecentlyViewedProductsBlock.cshtml" />
-    <Content Include="Views\Search\Search.cshtml" />
-    <Content Include="Views\Search\Partials\SearchBox.cshtml" />
-    <Content Include="Views\Checkout\BillingAddress.cshtml" />
-    <Content Include="Views\Checkout\Partials\CheckoutProgress.cshtml" />
-    <Content Include="Views\Checkout\Completed.cshtml" />
-    <Content Include="Views\Checkout\Confirm.cshtml" />
-    <Content Include="Views\Checkout\PaymentMethod.cshtml" />
-    <Content Include="Views\Checkout\ShippingAddress.cshtml" />
-    <Content Include="Views\Checkout\ShippingMethod.cshtml" />
-    <Content Include="Views\Common\Partials\AccountDropdown.cshtml" />
-    <Content Include="Views\Common\Partials\CurrencySelector.cshtml" />
-    <Content Include="Views\Common\Partials\Favicon.cshtml" />
-    <Content Include="Views\Common\Partials\Footer.cshtml" />
-    <Content Include="Views\Common\Partials\JavaScriptDisabledWarning.cshtml" />
-    <Content Include="Views\Common\Partials\LanguageSelector.cshtml" />
-    <Content Include="Views\Common\Partials\TopBar.cshtml" />
-    <Content Include="Views\Common\PdfReceiptFooter.cshtml" />
-    <Content Include="Views\Common\PdfReceiptHeader.cshtml" />
-    <Content Include="Views\Common\Partials\ShopBar.cshtml" />
-    <Content Include="Views\Common\Partials\StoreThemeSelector.cshtml" />
-    <Content Include="Views\Common\Partials\TaxTypeSelector.cshtml" />
-    <Content Include="Views\Customer\AccountActivation.cshtml" />
-    <Content Include="Views\Customer\AddressAdd.cshtml" />
-    <Content Include="Views\Customer\AddressEdit.cshtml" />
-    <Content Include="Views\Customer\Addresses.cshtml" />
-    <Content Include="Views\Customer\Avatar.cshtml" />
-    <Content Include="Views\Customer\BackInStockSubscriptions.cshtml" />
-    <Content Include="Views\Customer\ChangePassword.cshtml" />
-    <Content Include="Views\Customer\DownloadableProducts.cshtml" />
-    <Content Include="Views\Customer\ForumSubscriptions.cshtml" />
-    <Content Include="Views\Customer\Info.cshtml" />
-    <Content Include="Views\Customer\Login.cshtml" />
-    <Content Include="Views\Customer\Orders.cshtml" />
-    <Content Include="Views\Customer\PasswordRecovery.cshtml" />
-    <Content Include="Views\Customer\PasswordRecoveryConfirm.cshtml" />
-    <Content Include="Views\Customer\Register.cshtml" />
-    <Content Include="Views\Customer\RegisterResult.cshtml" />
-    <Content Include="Views\Customer\ReturnRequests.cshtml" />
-    <Content Include="Views\Customer\RewardPoints.cshtml" />
-    <Content Include="Views\Customer\UserAgreement.cshtml" />
-    <Content Include="Views\Customer\Partials\_CheckUsernameAvailability.cshtml" />
-    <Content Include="Views\Customer\Partials\_ExternalAuthentication.AssociateMessage.cshtml" />
-    <Content Include="Views\ExternalAuthentication\Partials\ExternalMethods.cshtml" />
-    <Content Include="Views\Home\ContactUs.cshtml" />
-    <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\Home\StoreClosed.cshtml" />
-    <Content Include="Views\Install\Index.cshtml" />
-    <Content Include="Views\News\Partials\HomePageNews.cshtml" />
-    <Content Include="Views\News\List.cshtml" />
-    <Content Include="Views\News\NewsItem.cshtml" />
-    <Content Include="Views\Newsletter\SubscriptionActivation.cshtml" />
-    <Content Include="Views\Order\Details.cshtml" />
-    <Content Include="Views\Order\Details.Print.cshtml" />
-    <Content Include="Views\Order\ShipmentDetails.cshtml" />
-    <Content Include="Views\Poll\Partials\HomePagePolls.cshtml" />
-    <Content Include="Views\Poll\Partials\PollBlock.cshtml" />
-    <Content Include="Views\Poll\Partials\_Poll.cshtml" />
-    <Content Include="Views\PrivateMessages\Partials\Inbox.cshtml" />
-    <Content Include="Views\PrivateMessages\Index.cshtml" />
-    <Content Include="Views\PrivateMessages\Send.cshtml" />
-    <Content Include="Views\PrivateMessages\Partials\SentItems.cshtml" />
-    <Content Include="Views\PrivateMessages\View.cshtml" />
-    <Content Include="Views\Product\AskQuestion.cshtml" />
-    <Content Include="Views\Product\BackInStockSubscribePopup.cshtml" />
-    <Content Include="Views\Product\Partials\CrossSellProducts.cshtml" />
-    <Content Include="Views\Product\EmailAFriend.cshtml" />
-    <Content Include="Views\Product\Partials\Product.AlsoPurchased.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Tags.cshtml" />
-    <Content Include="Views\Product\Product.cshtml" />
-    <Content Include="Views\Product\Partials\Product.TierPrices.cshtml" />
-    <Content Include="Views\Product\Partials\Product.RelatedProducts.cshtml" />
-    <Content Include="Views\Product\Reviews.cshtml" />
-    <Content Include="Views\Product\Partials\Product.AssociatedProduct.cshtml" />
-    <Content Include="Views\Profile\Index.cshtml" />
-    <Content Include="Views\Profile\Partials\Info.cshtml" />
-    <Content Include="Views\Profile\Partials\Posts.cshtml" />
-    <Content Include="Views\ReturnRequest\ReturnRequest.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Boolean.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\ButtonType.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Color.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\DateTime.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Decimal.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Double.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Int32.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Time.cshtml" />
-    <Content Include="Views\ShoppingCart\Cart.cshtml" />
-    <Content Include="Views\ShoppingCart\EmailWishlist.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\EstimateShipping.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\OrderSummary.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\OrderTotals.cshtml" />
-    <Content Include="Views\ShoppingCart\Wishlist.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\_CheckoutAttributes.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\_CommentBox.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\_DiscountBox.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\_GiftCardBox.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\_OrderReviewData.cshtml" />
-    <Content Include="Views\Topic\Partials\TopicBlock.cshtml" />
-    <Content Include="Views\Topic\TopicDetails.cshtml" />
-    <Content Include="Views\Topic\Partials\TopicWidget.cshtml" />
-    <Content Include="Views\Widget\Partials\TabWidgets.cshtml" />
-    <Content Include="Views\Widget\Partials\WidgetsByZone.cshtml" />
-    <Content Include="Views\Shared\Partials\_GoogleFonts.cshtml" />
-    <Content Include="Themes\Flex\Content\_checkout.scss" />
-    <Content Include="Themes\Flex\Content\_footer.scss" />
-    <Content Include="Themes\Flex\Content\_misc.scss" />
-    <Content Include="Themes\Flex\Content\_blog.scss" />
-    <Content Include="Themes\Flex\Content\_forum.scss" />
-    <Content Include="Themes\Flex\Content\_rating.scss" />
-    <Content Include="Views\ShoppingCart\Partials\OffCanvasCart.cshtml" />
-    <Content Include="Themes\Flex\Content\_cart.scss" />
-    <Content Include="Views\ShoppingCart\Partials\OffCanvasShoppingCart.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\OffCanvasWishlist.cshtml" />
-    <Content Include="Views\Catalog\Partials\OffCanvasCompare.cshtml" />
-    <Content Include="Views\Common\Partials\Logo.cshtml" />
-    <Content Include="Themes\Flex\Content\_search.scss" />
-    <Content Include="Views\Search\Partials\InstantSearch.cshtml" />
-    <Content Include="Views\Search\Partials\InstantSearch.HitGroup.cshtml" />
-    <Content Include="Views\Search\Partials\InstantSearch.TopProducts.cshtml" />
-    <Content Include="Themes\Flex\Content\_artlist.scss" />
-    <Content Include="Views\Shared\Partials\Product.List.Item.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.cshtml" />
-    <Content Include="Views\Shared\Components\Product.List.Pager.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.Pager.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.ViewMode.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.FilterSort.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.Item.Rating.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.Item.Brand.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.Item.Price.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.Item.Buttons.cshtml" />
-    <Content Include="Views\Shared\Partials\Product.List.Item.Variants.cshtml" />
-    <Content Include="Themes\Flex\Content\_product.scss" />
-    <Content Include="Views\Product\Partials\Product.Info.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Offer.cshtml" />
-    <Content Include="Themes\Flex\Content\_gallery.scss" />
-    <Content Include="Views\Product\Partials\Product.Offer.Price.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Offer.Actions.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Attrs.cshtml" />
-    <Content Include="Views\Product\Partials\Product.StockInfo.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Reviews.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Specs.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Tabs.cshtml" />
-    <Content Include="Views\Product\Partials\Product.ReviewSummary.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\QtyInput.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Variants.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.Dropdown.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.CheckRadio.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.Radio.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.TextBox.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.TextArea.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.Date.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.FileUpload.cshtml" />
-    <Content Include="Views\Shared\ChoiceTemplates\Choice.Box.cshtml" />
-    <Content Include="Views\Product\Partials\Product.GiftCard.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Bundle.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Bundle.Price.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Bundle.Items.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Offer.Actions.Misc.cshtml" />
-    <Content Include="Views\Common\Partials\ShopBar.Tools.cshtml" />
-    <Content Include="Themes\Flex\Content\_menu.scss" />
-    <Content Include="Views\Menu\OffCanvas.Menu.cshtml" />
-    <Content Include="Views\Menu\OffCanvas.Home.cshtml" />
-    <Content Include="Views\Product\Partials\Product.CustomerPrice.cshtml" />
-    <Content Include="Views\Search\Partials\Filters.cshtml" />
-    <Content Include="Views\Search\Partials\Filters.Active.cshtml" />
-    <Content Include="Views\Search\FacetTemplates\MultiSelect.cshtml" />
-    <Content Include="Views\Search\FacetTemplates\SingleSelect.cshtml" />
-    <Content Include="Views\Search\FacetTemplates\Price.cshtml" />
-    <Content Include="Views\Search\FacetTemplates\Rating.cshtml" />
-    <Content Include="Views\Menu\OffCanvas.Brands.cshtml" />
-    <Content Include="Views\Menu\Breadcrumb.cshtml" />
-    <Content Include="Views\Shared\Layouts\_Checkout.cshtml" />
-    <Content Include="Views\Shared\Layouts\_MyAccount.cshtml" />
-    <Content Include="Views\Catalog\Partials\HomepageManufacturers.cshtml" />
-    <Content Include="Themes\Flex\Content\_variables.scss" />
-    <Content Include="Themes\Flex\Content\_variables-custom.scss" />
-    <Content Include="Themes\Flex\Content\_user.scss" />
-    <Content Include="Themes\Flex\Content\_custom.scss" />
-    <Content Include="Views\ShoppingCart\Partials\CartItems.cshtml" />
-    <Content Include="Views\Shared\Partials\Comment.Item.cshtml" />
-    <Content Include="Views\Shared\Partials\Comment.List.cshtml" />
-    <Content Include="Views\ShoppingCart\Partials\WishlistItems.cshtml" />
-    <Content Include="Themes\Flex\Content\_block.scss" />
-    <Content Include="Themes\Flex\Content\_layout.scss" />
-    <Content Include="Views\ShoppingCart\Partials\_RewardPointsBox.cshtml" />
-    <Content Include="Themes\Flex\Content\_print.scss" />
-    <Content Include="Views\Entity\Partials\Picker.cshtml" />
-    <Content Include="Views\Entity\Partials\Picker.List.cshtml" />
-    <Content Include="Themes\Flex\Content\_rtl.scss" />
-    <Content Include="Themes\Flex\Views\Shared\EmailTemplates\footer.liquid" />
-    <Content Include="Themes\Flex\Views\Shared\EmailTemplates\header.liquid" />
-    <Content Include="Themes\Flex\Views\Shared\EmailTemplates\master.liquid" />
-    <Content Include="Views\Shared\Components\EntityPicker.cshtml" />
-    <Content Include="Views\Shared\Components\FileUploader.cshtml" />
-    <Content Include="Themes\Flex\Content\_buttons.scss" />
-    <Content Include="Themes\Flex\Views\Shared\EmailTemplates\address.liquid" />
-    <Content Include="Themes\Flex\Views\Shared\EmailTemplates\order.liquid" />
-    <Content Include="Themes\Flex\Views\Shared\EmailTemplates\shipment.liquid" />
-    <Content Include="Themes\Flex\Content\theme-rtl.scss" />
-    <Content Include="Content\shared\_rtl-bs4.scss" />
-    <Content Include="Views\Shared\DisplayTemplates\DateTime.cshtml" />
-    <Content Include="Themes\Flex\Content\_fonts.scss" />
-    <Content Include="Views\ShoppingCart\Partials\_RefreshCartScript.cshtml" />
-    <Content Include="Views\Common\Partials\GdprConsent.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Byte.cshtml" />
-    <Content Include="Views\Boards\Partials\Filters.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Html.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Liquid.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Media.cshtml" />
-    <Content Include="Views\Boards\Partials\InstantSearch.cshtml" />
-    <Content Include="Views\Boards\Partials\SearchHits.cshtml" />
-    <Content Include="Views\Shared\Partials\Customer.Avatar.cshtml" />
-    <Content Include="Views\Shared\Layouts\_Layout.Bare.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Range.cshtml" />
-    <Content Include="Themes\Flex\Content\_accordion.scss" />
-    <Content Include="Views\Shared\Partials\_Assets.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Link.cshtml" />
-    <Content Include="Views\Shared\Menus\Dropdown.cshtml" />
-    <Content Include="Views\Shared\Menus\LinkList.cshtml" />
-    <Content Include="Views\Shared\Menus\Navbar.cshtml" />
-    <Content Include="Views\Shared\Menus\ListGroup.cshtml" />
-    <Content Include="Views\Shared\Menus\Main.cshtml" />
-    <Content Include="Views\Catalog\Menus\Categories.cshtml" />
-    <Content Include="Content\shared\_bg.scss" />
-    <Content Include="Content\shared\_box.scss" />
-    <Content Include="Content\shared\_sections.scss" />
-    <Content Include="Themes\Flex\Content\_news.scss" />
-    <Content Include="Views\Blog\Partials\BlogSummaryList.cshtml" />
-    <Content Include="Views\Blog\Partials\BlogSummaryHeading.cshtml" />
-    <Content Include="Views\Blog\Partials\BlogSummary.cshtml" />
-    <Content Include="Views\Common\Partials\CookieManager.cshtml" />
-    <Content Include="Views\Shared\EditorTemplates\Int64.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\Image.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\Video.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\Audio.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\Document.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\Text.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\Bin.cshtml" />
-    <Content Include="Views\Shared\MediaTemplates\_Thumbnail.cshtml" />
-    <Content Include="Themes\Flex\Content\_variables-reset.scss" />
-    <Content Include="Themes\Flex\Content\_cookie-manager.scss" />
-    <Content Include="Views\Shared\Partials\PhotoSwipe.cshtml" />
-    <Content Include="Views\Product\Partials\Product.Media.cshtml" />
-    <Content Include="Views\Shared\Partials\MediaGallery.cshtml" />
-    <Content Include="Views\Shared\Layouts\_Layout.Off.cshtml" />
-    <Content Include="Views\News\Partials\NewsSummary.cshtml" />
-    <Content Include="Views\News\Partials\NewsSummaryHeading.cshtml" />
-    <Content Include="Views\News\Partials\NewsSummaryList.cshtml" />
-    <Content Include="Views\Common\Partials\MetaProperties.cshtml" />
-    <None Include="Web.EFMigrations.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-    <None Include="Web.PluginDev.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\editors\CodeMirror\js\" />
-    <Folder Include="Plugins\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">
-      <Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
-      <Name>SmartStore.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj">
-      <Project>{ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144}</Project>
-      <Name>SmartStore.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj">
-      <Project>{210541ad-f659-47da-8763-16f36c5cd2f4}</Project>
-      <Name>SmartStore.Services</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj">
-      <Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
-      <Name>SmartStore.Web.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Content Include="Views\Shared\Partials\Head.cshtml" />
-    <Content Include="Views\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
+    <Compile Include="..\..\AssemblySharedInfo.cs" Link="Properties\AssemblySharedInfo.cs" />
+    <Compile Include="..\..\AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="packages.config">
-      <SubType>Designer</SubType>
-    </Content>
+    <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Data\SmartStore.Data.csproj" />
+    <ProjectReference Include="..\..\Libraries\SmartStore.Services\SmartStore.Services.csproj" />
+    <ProjectReference Include="..\SmartStore.Web.Framework\SmartStore.Web.Framework.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="App_GlobalResources\EditorLocalization.de.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>EditorLocalization.de.designer.cs</LastGenOutput>
-    </Content>
-    <Content Include="App_GlobalResources\EditorLocalization.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>EditorLocalization.designer.cs</LastGenOutput>
-    </Content>
-    <Content Include="App_GlobalResources\GridLocalization.de.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>GridLocalization.de.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_GlobalResources\GridLocalization.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>GridLocalization.designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </Content>
+    <PackageReference Include="Autofac" Version="8.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="LigerShark.WebOptimizer.Core" Version="3.0.422" />
   </ItemGroup>
+
   <ItemGroup>
-    <Content Include="App_GlobalResources\MvcLocalization.resx">
-      <Generator>GlobalResourceProxyGenerator</Generator>
-      <LastGenOutput>MvcLocalization.Designer.cs</LastGenOutput>
-    </Content>
+    <Content Remove="App_Data\**" />
+    <Content Remove="bin\**" />
+    <Content Remove="obj\**" />
   </ItemGroup>
-  <ItemGroup>
-    <WebConfigsToTransform Include="Config\log4net.config">
-      <DestinationRelativePath>Config\log4net.config</DestinationRelativePath>
-      <Exclude>False</Exclude>
-      <TransformFileFolder>$(TransformWebConfigIntermediateLocation)\original</TransformFileFolder>
-      <TransformFile>Config\log4net.$(Configuration).config</TransformFile>
-      <TransformOriginalFolder>$(TransformWebConfigIntermediateLocation)\original</TransformOriginalFolder>
-      <TransformOriginalFile>$(TransformWebConfigIntermediateLocation)\original\%(DestinationRelativePath)</TransformOriginalFile>
-      <TransformOutputFile>$(TransformWebConfigIntermediateLocation)\transformed\%(DestinationRelativePath)</TransformOutputFile>
-      <TransformScope>$(_PackageTempDir)\%(DestinationRelativePath)</TransformScope>
-      <SubType>Designer</SubType>
-    </WebConfigsToTransform>
-    <None Include="Config\log4net.Debug.config">
-      <DependentUpon>log4net.config</DependentUpon>
-    </None>
-    <None Include="Config\log4net.Release.config">
-      <DependentUpon>log4net.config</DependentUpon>
-    </None>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'EFMigrations|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PluginDev|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
-  </Target>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Target Name="ExcludeRootBinariesDeployment">
-    <PropertyGroup>
-      <ExcludeFilesFromDeployment>
-        **\*.cs;
-        **\*.orig;
-        **\*.bak;
-        **\*.log;
-        **\*.csproj;
-        **\*.csproj.user;
-        **\*.DotSettings.user;
-        **\packages.config;
-        **\*.Debug.config;
-        **\*.Release.config;
-        **\*.PluginDev.config;
-        **\*.EFMigrations.config;
-        **\obj\**;
-        **\bin\*.xml; 
-        App_Data\Licenses.lic;
-        App_Data\Settings.txt;
-        App_Data\InstalledPlugins.txt;
-        App_Data\SmartStore.Db.sdf;
-        Plugins\*\bin\**;
-        Themes\*\Content\compiled\**;
-      </ExcludeFilesFromDeployment>
-      <ExcludeFoldersFromDeployment>
-	    x64;
-	    x86;
-        roslyn;
-		bin\da; bin\fi; bin\ja; bin\ko; bin\mk; bin\nl; bin\pt; bin\no; bin\pl; bin\pl; bin\ru-ru; bin\sv; bin\tr; bin\uk; bin\zh-CHS; bin\zh-Hans; bin\zh-Hant;
-      	Exchange;
-      	Media;
-      	Properties;
-      	App_Data\_Backup;
-        App_Data\_temp;
-        App_Data\Tenants;
-        App_Data\Migrations;
-        App_Data\Logs;
-        bin\HostRestart;
-        Administration\bin;
-        Content\Images\Thumbs;
-      </ExcludeFoldersFromDeployment>
-    </PropertyGroup>
-  </Target>
-  <Target Name="ExcludeRootBinariesPackage" DependsOnTargets="ExcludeRootBinariesDeployment" BeforeTargets="ExcludeFilesFromPackage">
-    <ItemGroup>
-      <ExcludeFromPackageFolders Include="$(ExcludeFoldersFromDeployment)">
-        <FromTarget>Project</FromTarget>
-        <InProject>false</InProject>
-      </ExcludeFromPackageFolders>
-      <ExcludeFromPackageFiles Include="$(ExcludeFilesFromDeployment)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="CopyNativeBinaries">
-    <ItemGroup>
-      <SqlCeBinariesx86 Include="$(SolutionDir)..\lib\sqlce\x86\**\*" />
-      <SqlCeBinariesx64 Include="$(SolutionDir)..\lib\sqlce\x64\**\*" />
-      <VC14Binariesx86 Include="$(SolutionDir)..\lib\msvcp140\x86\**\*" />
-      <VC14Binariesx64 Include="$(SolutionDir)..\lib\msvcp140\x64\**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(SqlCeBinariesx86)" DestinationFolder="$(OutputPath)\x86\%(RecursiveDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(SqlCeBinariesx64)" DestinationFolder="$(OutputPath)\x64\%(RecursiveDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(VC14Binariesx86)" DestinationFolder="$(OutputPath)\x86\%(RecursiveDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="@(VC14Binariesx64)" DestinationFolder="$(OutputPath)\x64\%(RecursiveDir)" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="CopyRoslynFiles">
-    <!-- Copying Roslyn tools and their dependencies to the "bin" folder. -->
-    <PropertyGroup>
-      <RoslynFilesDestination>$(ProjectDir)bin\roslyn\</RoslynFilesDestination>
-    </PropertyGroup>
-    <ItemGroup>
-      <RoslynFiles Include="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\tools\Roslyn472\*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(RoslynFiles)" DestinationFolder="$(RoslynFilesDestination)" Condition="!Exists('$(RoslynFilesDestination)csc.exe')" />
-  </Target>
-  <PropertyGroup>
-    <PlaceholderFile>$(ProjectDir)Content\placeholder.txt</PlaceholderFile>
-  </PropertyGroup>
-  <Target Name="CreateEmptyFolders">
-    <Copy SourceFiles="$(PlaceholderFile)" DestinationFolder="$(ProjectDir)Plugins\bin\" ContinueOnError="true" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="AfterBuild" DependsOnTargets="MvcBuildViews">
-    <CallTarget Targets="ExcludeRootBinariesDeployment" />
-    <CallTarget Targets="CopyNativeBinaries" />
-    <!--<CallTarget Targets="CopyRoslynFiles" />-->
-    <CallTarget Targets="CreateEmptyFolders" />
-  </Target>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets'))" />
-    <Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x64.1.2.6\build\LibSassHost.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x64.1.2.6\build\LibSassHost.Native.win-x64.props'))" />
-    <Error Condition="!Exists('..\..\packages\LibSassHost.Native.win-x86.1.2.6\build\LibSassHost.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibSassHost.Native.win-x86.1.2.6\build\LibSassHost.Native.win-x86.props'))" />
-    <Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x64.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x64.props'))" />
-    <Error Condition="!Exists('..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\JavaScriptEngineSwitcher.V8.Native.win-x86.3.5.5\build\net45\JavaScriptEngineSwitcher.V8.Native.win-x86.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs
index ac1fcd17c4..dda6b60ea5 100644
--- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs
+++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using SmartStore.Core.Data;
 using SmartStore.Core.Data.Hooks;
 
diff --git a/src/Tests/SmartStore.Core.Tests/WebHelperTests.cs b/src/Tests/SmartStore.Core.Tests/WebHelperTests.cs
index 563c2918d1..5756149e30 100644
--- a/src/Tests/SmartStore.Core.Tests/WebHelperTests.cs
+++ b/src/Tests/SmartStore.Core.Tests/WebHelperTests.cs
@@ -1,5 +1,5 @@
 using System.Collections.Specialized;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using NUnit.Framework;
 using SmartStore.Core.Fakes;
 using SmartStore.Tests;
diff --git a/src/Tests/SmartStore.Data.Tests/SchemaTests.cs b/src/Tests/SmartStore.Data.Tests/SchemaTests.cs
index d7e94c485f..7a7d706a79 100644
--- a/src/Tests/SmartStore.Data.Tests/SchemaTests.cs
+++ b/src/Tests/SmartStore.Data.Tests/SchemaTests.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using NUnit.Framework;
 using SmartStore.Tests;
 
diff --git a/src/Tests/SmartStore.Data.Tests/TestDbConfiguration.cs b/src/Tests/SmartStore.Data.Tests/TestDbConfiguration.cs
index 03ade15aa8..1ef25ccebb 100644
--- a/src/Tests/SmartStore.Data.Tests/TestDbConfiguration.cs
+++ b/src/Tests/SmartStore.Data.Tests/TestDbConfiguration.cs
@@ -1,5 +1,5 @@
 using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace SmartStore.Data.Tests
 {
diff --git a/src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs
index 91f8a675a9..7482e4e54a 100644
--- a/src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs
+++ b/src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using NUnit.Framework;
 using Rhino.Mocks;
 using SmartStore.Core;
diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs
index ac0980ca3f..30b56d2669 100644
--- a/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs
+++ b/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using NUnit.Framework;
 using Rhino.Mocks;
 using SmartStore.Core;
diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs
index 9a0e0c5eec..cd51d07d5c 100644
--- a/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs
+++ b/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using NUnit.Framework;
 using Rhino.Mocks;
 using SmartStore.Core;
diff --git a/src/Tests/SmartStore.Services.Tests/Payments/TestPaymentMethod.cs b/src/Tests/SmartStore.Services.Tests/Payments/TestPaymentMethod.cs
index f5d6be4423..a68e06a752 100644
--- a/src/Tests/SmartStore.Services.Tests/Payments/TestPaymentMethod.cs
+++ b/src/Tests/SmartStore.Services.Tests/Payments/TestPaymentMethod.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Payments;
 using SmartStore.Services.Payments;
diff --git a/src/Tests/SmartStore.Services.Tests/Shipping/FixedRateTestShippingRateComputationMethod.cs b/src/Tests/SmartStore.Services.Tests/Shipping/FixedRateTestShippingRateComputationMethod.cs
index 1745c0d74a..953f759747 100644
--- a/src/Tests/SmartStore.Services.Tests/Shipping/FixedRateTestShippingRateComputationMethod.cs
+++ b/src/Tests/SmartStore.Services.Tests/Shipping/FixedRateTestShippingRateComputationMethod.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Core.Domain.Shipping;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Shipping;
diff --git a/src/Tests/SmartStore.Tests/TestDbSet.cs b/src/Tests/SmartStore.Tests/TestDbSet.cs
index 3eaa6f0f6c..60ba6e3d6e 100644
--- a/src/Tests/SmartStore.Tests/TestDbSet.cs
+++ b/src/Tests/SmartStore.Tests/TestDbSet.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading;
diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/AdminAuthorizeAttributeTests.cs b/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/AdminAuthorizeAttributeTests.cs
index 4cbb253915..28fbf42689 100644
--- a/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/AdminAuthorizeAttributeTests.cs
+++ b/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/AdminAuthorizeAttributeTests.cs
@@ -1,5 +1,5 @@
 using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Routing;
 using NUnit.Framework;
 using Rhino.Mocks;
 using SmartStore.Core.Fakes;
diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/RewriteUrlAttributeTests.cs b/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/RewriteUrlAttributeTests.cs
index 658cac2431..5a125d5731 100644
--- a/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/RewriteUrlAttributeTests.cs
+++ b/src/Tests/SmartStore.Web.MVC.Tests/Framework/Controllers/RewriteUrlAttributeTests.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Web.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using NUnit.Framework;
 using Rhino.Mocks;
 using SmartStore.Core;
diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RouteTestingExtensions.cs b/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RouteTestingExtensions.cs
index 59baa2e6bb..0a1391b73c 100644
--- a/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RouteTestingExtensions.cs
+++ b/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RouteTestingExtensions.cs
@@ -3,9 +3,9 @@
 using System.Collections.Specialized;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using SmartStore.Collections;
 using SmartStore.Core.Fakes;
 using SmartStore.Tests;
diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs
index 82deee90cd..29697bc037 100644
--- a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs
+++ b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 
 namespace SmartStore.WebApi.Client
 {
diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs
index d84a0bb580..87122fb749 100644
--- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs
+++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiConsumer.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Web;
+using Microsoft.AspNetCore.Http;
 using System.Windows.Forms;
 using Newtonsoft.Json.Linq;
 using SmartStore.WebApi.Client.Models;