diff --git a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs.disabled similarity index 98% rename from src/Libraries/SmartStore.Core/Async/AsyncRunner.cs rename to src/Libraries/SmartStore.Core/Async/AsyncRunner.cs.disabled index 91ffb0db95..32cb855982 100644 --- a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs +++ b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs.disabled @@ -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; @@ -344,6 +344,9 @@ public override SynchronizationContext CreateCopy() } } + // Commented out for .NET 8 migration - IRegisteredObject not available + // Replace with IHostedService in ASP.NET Core + /* internal class BackgroundWorkHost : IRegisteredObject { private readonly CancellationTokenSource _shutdownCancellationTokenSource = new CancellationTokenSource(); @@ -421,4 +424,5 @@ private void FinalShutdown() } } + */ } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/BaseEntity.cs b/src/Libraries/SmartStore.Core/BaseEntity.cs index e2882f9851..6b32f365b7 100644 --- a/src/Libraries/SmartStore.Core/BaseEntity.cs +++ b/src/Libraries/SmartStore.Core/BaseEntity.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using System.Data.Entity.Core.Objects; +// using Microsoft.EntityFrameworkCore.Core.Objects; // Removed for .NET 8 migration using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; using System.Runtime.Serialization; @@ -32,7 +32,7 @@ public Type GetUnproxiedType() { #region Old //var t = GetType(); - //if (t.AssemblyQualifiedName.StartsWith("System.Data.Entity.")) + //if (t.AssemblyQualifiedName.StartsWith("Microsoft.EntityFrameworkCore.")) //{ // // it's a proxied type // t = t.BaseType; diff --git a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs.disabled similarity index 98% rename from src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs rename to src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs.disabled index 332b199c61..45b310a204 100644 --- a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs +++ b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs.disabled @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using SmartStore.Core.Infrastructure.DependencyManagement; +// using SmartStore.Core.Infrastructure.DependencyManagement; // Removed for .NET 8 migration using SmartStore.Utilities; using SmartStore.Utilities.Threading; diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/DisplayControl.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/DisplayControl.cs diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/ICacheableRouteRegistrar.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/ICacheableRouteRegistrar.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/ICacheableRouteRegistrar.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/ICacheableRouteRegistrar.cs diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/IDisplayControl.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IDisplayControl.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/IDisplayControl.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IDisplayControl.cs diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IOutputCacheInvalidationObserver.cs similarity index 98% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IOutputCacheInvalidationObserver.cs index 069a0bd62c..a17a029236 100644 --- a/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs +++ b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IOutputCacheInvalidationObserver.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using SmartStore.Core.Configuration; using SmartStore.Core.Data.Hooks; -using SmartStore.Core.Infrastructure.DependencyManagement; +// using SmartStore.Core.Infrastructure.DependencyManagement; // Removed for .NET 8 migration using SmartStore.Utilities; namespace SmartStore.Core.Caching diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheProvider.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IOutputCacheProvider.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheProvider.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IOutputCacheProvider.cs diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/NullOutputCacheProvider.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/NullOutputCacheProvider.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/NullOutputCacheProvider.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/NullOutputCacheProvider.cs diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/OutputCacheItem.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/OutputCacheItem.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Caching/OutputCache/OutputCacheItem.cs rename to src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/OutputCacheItem.cs diff --git a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs index 601afc2fef..15db02996a 100644 --- a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs +++ b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -using System.Web; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Http; using SmartStore.Utilities; namespace SmartStore.Core.Caching @@ -14,9 +15,9 @@ public class RequestCache : DisposableObject, IRequestCache private readonly IDictionary _emptyDictionary = new Dictionary(); - private readonly HttpContextBase _context; + private readonly HttpContext _context; - public RequestCache(HttpContextBase context) + public RequestCache(HttpContext context) { _context = context; } diff --git a/src/Libraries/SmartStore.Core/Collections/Querystring.cs b/src/Libraries/SmartStore.Core/Collections/Querystring.cs index 84de3dd797..cf8c9bc1e6 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 System.Web; // Removed for .NET 8 migration using SmartStore.Utilities.ObjectPools; namespace SmartStore.Collections diff --git a/src/Libraries/SmartStore.Core/Collections/TreeNode.cs b/src/Libraries/SmartStore.Core/Collections/TreeNode.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Collections/TreeNode.cs rename to src/Libraries/SmartStore.Core/Collections/TreeNode.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs b/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs rename to src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs.disabled diff --git a/src/Libraries/SmartStore.Core/ComponentModel/MapperFactory.cs b/src/Libraries/SmartStore.Core/ComponentModel/MapperFactory.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/ComponentModel/MapperFactory.cs rename to src/Libraries/SmartStore.Core/ComponentModel/MapperFactory.cs.disabled 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/DataProviderFactory.cs b/src/Libraries/SmartStore.Core/Data/DataProviderFactory.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Data/DataProviderFactory.cs rename to src/Libraries/SmartStore.Core/Data/DataProviderFactory.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Data/DataSettings.cs b/src/Libraries/SmartStore.Core/Data/DataSettings.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Data/DataSettings.cs rename to src/Libraries/SmartStore.Core/Data/DataSettings.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs index 11a9944a32..ffbb618216 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs @@ -1,6 +1,8 @@ using System; -using System.Data.Entity.Infrastructure; -using EfState = System.Data.Entity.EntityState; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.ChangeTracking; +using Microsoft.EntityFrameworkCore.Infrastructure; +using EfState = Microsoft.EntityFrameworkCore.EntityState; namespace SmartStore.Core.Data.Hooks { @@ -14,7 +16,7 @@ public interface IHookedEntity /// /// Gets the hooked entity entry /// - DbEntityEntry Entry { get; } + EntityEntry Entry { get; } /// /// Gets the hooked entity instance @@ -61,12 +63,12 @@ public class HookedEntity : IHookedEntity { private Type _entityType; - public HookedEntity(IDbContext context, DbEntityEntry entry) + public HookedEntity(IDbContext context, EntityEntry entry) : this(context.GetType(), entry) { } - internal HookedEntity(Type contextType, DbEntityEntry entry) + internal HookedEntity(Type contextType, EntityEntry entry) { ContextType = contextType; Entry = entry; @@ -78,7 +80,7 @@ public Type ContextType get; } - public DbEntityEntry Entry + public EntityEntry Entry { get; } diff --git a/src/Libraries/SmartStore.Core/Data/IDbContext.cs b/src/Libraries/SmartStore.Core/Data/IDbContext.cs index 95224e0308..6241064213 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 @@ -151,7 +151,7 @@ IList ExecuteStoredProcedureList(string commandText, params ob /// Type of entity /// The entity instance /// The requested new state - void ChangeState(TEntity entity, System.Data.Entity.EntityState requestedState) where TEntity : BaseEntity; + void ChangeState(TEntity entity, Microsoft.EntityFrameworkCore.EntityState requestedState) where TEntity : BaseEntity; /// /// Reloads the entity from the database overwriting any property values with values from the database. diff --git a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs index 430f4eabee..c185381547 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; @@ -41,7 +41,7 @@ public static bool SetToUnchanged(this IDbContext ctx, TEntity entity) { try { - ctx.ChangeState(entity, System.Data.Entity.EntityState.Unchanged); + ctx.ChangeState(entity, Microsoft.EntityFrameworkCore.EntityState.Unchanged); return true; } catch (Exception ex) @@ -111,7 +111,7 @@ public static void LoadCollection( var collection = entry.Collection(navigationProperty); // Avoid System.InvalidOperationException: Member 'IsLoaded' cannot be called for property... - if (entry.State == System.Data.Entity.EntityState.Detached) + if (entry.State == Microsoft.EntityFrameworkCore.EntityState.Detached) { ctx.Attach(entity); } @@ -166,7 +166,7 @@ public static void LoadReference( var reference = entry.Reference(navigationProperty); // Avoid System.InvalidOperationException: Member 'IsLoaded' cannot be called for property... - if (entry.State == System.Data.Entity.EntityState.Detached) + if (entry.State == Microsoft.EntityFrameworkCore.EntityState.Detached) { ctx.Attach(entity); } 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..df8f2d5714 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; @@ -45,7 +45,7 @@ public static void Delete(this IRepository rs, int id) where T : BaseEntit entity.Id = id; // must downcast 'cause of Rhino mocks stub - rs.Context.ChangeState((BaseEntity)entity, System.Data.Entity.EntityState.Deleted); + rs.Context.ChangeState((BaseEntity)entity, Microsoft.EntityFrameworkCore.EntityState.Deleted); } [MethodImpl(MethodImplOptions.AggressiveInlining)] 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 GetVisibilityAffectingPropertyNames() /// Gets or sets a language identifier for which the blog post should be displayed. /// [DataMember] - [Index] public int? LanguageId { get; set; } /// 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 /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// 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. /// [DataMember] - [Index] public bool SubjectToAcl { get; set; } /// @@ -121,7 +120,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// 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 GetVisibilityAffectingPropertyNames() /// Gets or sets the visibility level of the product. /// [DataMember] - [Index] public ProductVisibility Visibility { get; set; } /// @@ -216,7 +215,6 @@ public string Sku /// Gets or sets the manufacturer part number /// [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). /// [DataMember] - [Index] public string Gtin { [DebuggerStepThrough] @@ -669,30 +666,23 @@ public decimal Height /// Gets or sets a value indicating whether the entity is published /// [DataMember] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)] public bool Published { get; set; } /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)] public bool Deleted { get; set; } /// /// Gets or sets a value indicating whether the entity is a system product. /// [DataMember] - [Index] - [Index("IX_Product_SystemName_IsSystemProduct", 2)] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)] public bool IsSystemProduct { get; set; } /// /// Gets or sets the product system name. /// [DataMember] - [Index("IX_Product_SystemName_IsSystemProduct", 1)] public string SystemName { get; set; } /// 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 /// [DataMember] - [Index] public bool AllowFiltering { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index] public int DisplayOrder { get; set; } /// 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 /// [DataMember] - [Index] public bool IsFeaturedProduct { get; set; } /// @@ -38,7 +37,6 @@ public partial class ProductCategory : BaseEntity /// Indicates whether the mapping is created by the user or by the system. /// [DataMember] - [Index] public bool IsSystemMapping { get; set; } /// 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 /// [DataMember] - [Index] public bool IsFeaturedProduct { get; set; } /// 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. /// [DataMember] - [Index("IX_ProductTag_Published")] public bool Published { get; set; } = true; /// 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 /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)] public int ProductId { get; set; } /// @@ -51,14 +50,12 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity /// Gets or sets the attribute control type identifier /// [DataMember] - [Index] public int AttributeControlTypeId { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)] public int DisplayOrder { get; set; } /// 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 /// [DataMember] - [Index("IX_StockQuantity_AllowOutOfStockOrders", 1)] public int StockQuantity { get; set; } /// /// Gets or sets a value indicating whether to allow orders when out of stock /// [DataMember] - [Index("IX_StockQuantity_AllowOutOfStockOrders", 2)] public bool AllowOutOfStockOrders { get; set; } /// 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 /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 1)] public int ProductVariantAttributeId { get; set; } /// @@ -28,7 +27,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the product variant attribute name /// [DataMember] - [Index] public string Name { get; set; } /// @@ -65,14 +63,12 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the display order /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 2)] public int DisplayOrder { get; set; } /// /// Gets or sets the type Id /// [DataMember] - [Index] public int ValueTypeId { get; set; } /// 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. /// [DataMember] - [Index] public bool AllowFiltering { get; set; } /// 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 /// /// Gets or sets the parent menu item identifier. 0 if the item has no parent. /// - [Index("IX_MenuItem_ParentItemId")] public int ParentItemId { get; set; } /// @@ -63,13 +62,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets a value indicating whether the menu item is published. /// - [Index("IX_MenuItem_Published")] public bool Published { get; set; } = true; /// /// Gets or sets the display order. /// - [Index("IX_MenuItem_DisplayOrder")] public int DisplayOrder { get; set; } /// @@ -125,13 +122,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores. /// - [Index("IX_MenuItem_LimitedToStores")] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. /// - [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..a1e9746774 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs @@ -29,13 +29,12 @@ public virtual ICollection Items /// /// Gets or sets the system name. It identifies the menu. /// - [Required, StringLength(400), Index("IX_Menu_SystemName_IsSystemMenu", Order = 0)] + [Required, StringLength(400)] public string SystemName { get; set; } /// /// Gets or sets the value indicating whether this menu is deleteable by a user. /// - [Index("IX_Menu_SystemName_IsSystemMenu", Order = 1)] public bool IsSystemMenu { get; set; } /// @@ -59,7 +58,6 @@ public virtual ICollection Items /// /// Gets or sets a value indicating whether the menu is published. /// - [Index("IX_Menu_Published")] public bool Published { get; set; } = true; /// @@ -70,13 +68,11 @@ public virtual ICollection Items /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores. /// - [Index("IX_Menu_LimitedToStores")] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. /// - [Index("IX_Menu_SubjectToAcl")] public bool SubjectToAcl { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs index 4a8e6d5723..b7a4de20e3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs @@ -23,7 +23,7 @@ public partial class GenericAttribute : BaseEntity /// /// Gets or sets the key /// - [DataMember, Index("IX_GenericAttribute_Key")] + [DataMember] public string Key { get; set; } /// 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 /// /// Gets or sets a value indicating whether the customer has been deleted /// - [Index] - [Index("IX_Customer_Deleted_IsSystemAccount", 1)] public bool Deleted { get; set; } /// /// Gets or sets a value indicating whether the customer account is system /// [DataMember] - [Index] - [Index("IX_Customer_Deleted_IsSystemAccount", 2)] public bool IsSystemAccount { get; set; } /// /// Gets or sets the customer system name /// [DataMember] - [Index] public string SystemName { get; set; } /// /// Gets or sets the last IP address /// - [DataMember, Index("IX_Customer_LastIpAddress")] + [DataMember] public string LastIpAddress { get; set; } /// /// Gets or sets the date and time of entity creation /// - [DataMember, Index("IX_Customer_CreatedOn")] + [DataMember] public DateTime CreatedOnUtc { get; set; } /// @@ -145,7 +140,7 @@ public PasswordFormat PasswordFormat /// /// Gets or sets the date and time of last activity /// - [DataMember, Index("IX_Customer_LastActivity")] + [DataMember] public DateTime LastActivityDateUtc { get; set; } /// @@ -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 /// [DataMember] - [Index] public bool Active { get; set; } /// /// Gets or sets a value indicating whether the customer role is system /// [DataMember] - [Index] - [Index("IX_CustomerRole_SystemName_IsSystemRole", 2)] public bool IsSystemRole { get; set; } /// /// Gets or sets the customer role system name /// [DataMember] - [Index] - [Index("IX_CustomerRole_SystemName_IsSystemRole", 1)] public string SystemName { get; set; } /// 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. /// [DataMember] - [Index] public bool IsSystemMapping { get; set; } /// 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 /// /// Gets or sets the store identifier. Should not be zero. /// - [Index("IX_StoreId_CreatedOn", 0)] public int StoreId { get; set; } /// @@ -43,7 +42,6 @@ public class WalletHistory : BaseEntity /// /// Gets or sets the date ehen the entry was created (in UTC). /// - [Index("IX_StoreId_CreatedOn", 1)] public DateTime CreatedOnUtc { get; set; } /// 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() /// /// Gets or sets the entity identifier in SmartStore /// - [Index("IX_SyncMapping_ByEntity", 0, IsUnique = true)] [DataMember] public int EntityId { get; set; } /// /// Gets or sets the entity's key in the external application /// - [Index("IX_SyncMapping_BySource", 0, IsUnique = true)] [DataMember] public string SourceKey { get; set; } /// /// Gets or sets a name representing the entity type /// - [Index("IX_SyncMapping_ByEntity", 1, IsUnique = true)] - [Index("IX_SyncMapping_BySource", 1, IsUnique = true)] [DataMember] public string EntityName { get; set; } /// /// Gets or sets a name for the external application /// - [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 /// /// Gets or sets the forum group identifier /// - [Index("IX_ForumGroupId_DisplayOrder", Order = 0)] public int ForumGroupId { get; set; } /// @@ -59,7 +58,6 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp /// /// Gets or sets the display order /// - [Index("IX_ForumGroupId_DisplayOrder", Order = 1)] public int DisplayOrder { get; set; } /// 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 /// /// Gets or sets the display order /// - [Index] public int DisplayOrder { get; set; } /// @@ -44,13 +43,11 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores /// - [Index] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL /// - [Index] public bool SubjectToAcl { get; set; } /// 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 /// /// Gets or sets the date and time of instance creation /// - [Index] public DateTime CreatedOnUtc { get; set; } /// @@ -46,7 +45,6 @@ public partial class ForumPost : BaseEntity, IAuditable /// /// Gets or sets a value indicating whether the entity is published /// - [Index] public bool Published { get; set; } /// 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 /// /// Gets or sets the forum identifier /// - [Index("IX_ForumId_Published", Order = 0)] public int ForumId { get; set; } /// @@ -23,19 +22,16 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets the topic type identifier /// - [Index("IX_TopicTypeId_LastPostTime", Order = 0)] public int TopicTypeId { get; set; } /// /// Gets or sets the subject /// - [Index] public string Subject { get; set; } /// /// Gets or sets the number of posts /// - [Index] public int NumPosts { get; set; } /// @@ -62,13 +58,11 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets the last post date and time /// - [Index("IX_TopicTypeId_LastPostTime", Order = 1)] public DateTime? LastPostTime { get; set; } /// /// Gets or sets the date and time of instance creation /// - [Index] public DateTime CreatedOnUtc { get; set; } /// @@ -79,7 +73,6 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets a value indicating whether the entity is published /// - [Index("IX_ForumId_Published", Order = 1)] public bool Published { get; set; } /// 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 /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 1)] public int EntityId { get; set; } /// /// Gets or sets the language identifier /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 4)] public int LanguageId { get; set; } /// /// Gets or sets the locale key group /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 3)] - [Index("IX_LocalizedProperty_LocaleKeyGroup")] public string LocaleKeyGroup { get; set; } /// /// Gets or sets the locale key /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 2)] public string LocaleKey { get; set; } /// 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 /// /// Gets or sets the log level identifier /// - [Index("IX_Log_Level", IsUnique = false)] public int LogLevelId { get; set; } /// @@ -56,7 +55,6 @@ public partial class Log : BaseEntity /// /// Gets or sets the logger name /// - [Index("IX_Log_Logger", IsUnique = false)] public string Logger { get; set; } /// 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 /// [DataMember] - [Index] public Guid DownloadGuid { get; set; } /// @@ -34,14 +33,12 @@ public partial class Download : BaseEntity//, ITransient /// Gets or sets a value indicating whether the entity transient/preliminary /// [DataMember] - [Index("IX_UpdatedOn_IsTransient", 1)] public bool IsTransient { get; set; } /// /// Gets or sets the date and time of instance update /// [DataMember] - [Index("IX_UpdatedOn_IsTransient", 0)] public DateTime UpdatedOnUtc { get; set; } /// @@ -60,14 +57,12 @@ public partial class Download : BaseEntity//, ITransient /// Gets or sets a value indicating the corresponding entity id /// [DataMember] - [Index("IX_EntityId_EntityName", 0)] public int EntityId { get; set; } /// /// Gets or sets a value indicating the corresponding entity name /// [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 GetOutputAffectingPropertyNames() /// Gets or sets the associated folder identifier. /// [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; } /// @@ -56,7 +49,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the SEO friendly name of the media file including file extension /// [DataMember] - [Index("IX_Media_Name", 1)] public string Name { get; set; } /// @@ -75,8 +67,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the (dotless) file extension /// [DataMember] - [Index("IX_Media_MediaType", 2)] - [Index("IX_Media_Extension", 1)] public string Extension { get; set; } /// @@ -89,23 +79,18 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the file media type (image, video, audio, document etc.) /// [DataMember] - [Index("IX_Media_MediaType", 1)] public string MediaType { get; set; } /// /// Gets or sets the file size in bytes /// [DataMember] - [Index("IX_Media_Size", 1)] public int Size { get; set; } /// /// Gets or sets the total pixel size of an image (width * height) /// [DataMember] - [Index("IX_Media_MediaType", 3)] - [Index("IX_Media_Extension", 2)] - [Index("IX_Media_PixelSize", 1)] public int? PixelSize { get; set; } /// @@ -147,13 +132,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// /// Gets or sets a value indicating whether the file has been soft deleted /// - [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; } /// 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. /// [DataMember] - [Index("IX_NameParentId", Order = 0, IsUnique = true)] public int? ParentId { get; set; } /// @@ -26,7 +25,6 @@ public partial class MediaFolder : BaseEntity /// Gets or sets the media folder name. /// [DataMember] - [Index("IX_NameParentId", Order = 1, IsUnique = true)] public string Name { get; set; } /// 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 /// Gets or sets the media file identifier. /// [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. /// [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. /// [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. /// [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 /// /// Gets or sets the body /// - [AllowHtml] public string Body { get; set; } /// 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 /// [DataMember] - [Index("IX_NewsletterSubscription_Email_StoreId", 1)] public string Email { get; set; } /// /// Gets or sets a value indicating whether subscription is active /// [DataMember] - [Index] public bool Active { get; set; } /// @@ -40,7 +38,6 @@ public partial class NewsLetterSubscription : BaseEntity /// Gets or sets the store identifier /// [DataMember] - [Index("IX_NewsletterSubscription_Email_StoreId", 2)] public int StoreId { get; set; } /// 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 GetVisibilityAffectingPropertyNames() /// /// Gets or sets a language identifier for which the news item should be displayed. /// - [Index] public int? LanguageId { get; set; } /// 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 ParseTaxRates(string taxRat /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// 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 /// /// Gets or sets the permission system name. /// - [Index] public string SystemName { get; set; } /// 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 /// /// Gets or sets the type of appropriate ITask class /// - [Index("IX_Type")] public string Type { get; set; } /// /// Gets or sets the value indicating whether a task is enabled /// - [Index("IX_NextRun_Enabled", 1)] public bool Enabled { get; set; } /// @@ -56,7 +54,6 @@ public class ScheduleTask : BaseEntity, ICloneable /// public bool StopOnError { get; set; } - [Index("IX_NextRun_Enabled", 0)] public DateTime? NextRunUtc { get; set; } /// 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 /// /// Gets or sets whether the task is running. /// - [Index("IX_MachineName_IsRunning", 1)] public bool IsRunning { get; set; } /// /// Gets or sets the server machine name. /// - [Index("IX_MachineName_IsRunning", 0)] public string MachineName { get; set; } /// /// Gets or sets the date when the task was started. It is also the date when this entry was created. /// - [Index("IX_Started_Finished", 0)] public DateTime StartedOnUtc { get; set; } /// /// Gets or sets the date when the task has been finished. /// - [Index("IX_Started_Finished", 1)] public DateTime? FinishedOnUtc { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs index 6fd6e8d6fe..562144b8cd 100644 --- a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs +++ b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs @@ -1,4 +1,6 @@ -using System.Web.Mvc; +// using System.Web.Mvc; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc.Filters; +using System.Collections.Generic; namespace SmartStore.Core.Events { @@ -7,6 +9,6 @@ namespace SmartStore.Core.Events /// public class AppRegisterGlobalFiltersEvent { - public GlobalFilterCollection Filters { get; set; } + public IList Filters { get; set; } = new List(); } } diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs index 95576aea9f..f130a2c340 100644 --- a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs +++ b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppStartedEvent.cs @@ -1,9 +1,10 @@ -using System.Web; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Http; namespace SmartStore.Core.Events { public class AppStartedEvent { - public HttpContextBase HttpContext { get; set; } + public HttpContext? HttpContext { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/EnumerableExtensions.cs index f867372efa..15e774de81 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 System.Web; // Removed for .NET 8 migration 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.disabled similarity index 90% rename from src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs rename to src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs.disabled index df752203cd..543d88169d 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs.disabled @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.UI; +// using System.Web.UI; // Removed for .NET 8 migration namespace SmartStore { diff --git a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs.disabled similarity index 90% rename from src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs rename to src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs.disabled index a2618ee834..a545f861d7 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs.disabled @@ -1,16 +1,17 @@ using System; +using Microsoft.AspNetCore.Http; using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; 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 System.Web; // Removed for .NET 8 migration +using Microsoft.Extensions.Caching.Memory; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Identity; using SmartStore.Core; -using SmartStore.Core.Fakes; +// using SmartStore.Core.Fakes; // Removed for .NET 8 migration using SmartStore.Core.Infrastructure; namespace SmartStore @@ -32,11 +33,11 @@ public static class HttpExtensions }; /// - /// Tries to get the instance without throwing exceptions + /// Tries to get the instance without throwing exceptions /// - /// The instance or null. + /// The instance or null. [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static HttpRequestBase SafeGetHttpRequest(this HttpContext httpContext) + public static HttpRequest SafeGetHttpRequest(this HttpContext httpContext) { if (httpContext == null) { @@ -47,10 +48,10 @@ public static HttpRequestBase SafeGetHttpRequest(this HttpContext httpContext) } /// - /// Tries to get the instance without throwing exceptions + /// Tries to get the instance without throwing exceptions /// - /// The instance or null. - public static HttpRequestBase SafeGetHttpRequest(this HttpContextBase httpContext) + /// The instance or null. + public static HttpRequest SafeGetHttpRequest(this HttpContext httpContext) { if (httpContext == null) { @@ -79,7 +80,7 @@ public static HttpRequestBase SafeGetHttpRequest(this HttpContextBase httpContex /// /// /// - public static bool IsAppLocalUrl(this HttpRequestBase request, string url) + public static bool IsAppLocalUrl(this HttpRequest request, string url) { if (string.IsNullOrWhiteSpace(url)) { @@ -156,7 +157,7 @@ public static bool IsHttps(this HttpRequest request) /// Gets a value which indicates whether the HTTP connection uses secure sockets (HTTPS protocol). /// Works with Cloud's load balancers. /// - public static bool IsHttps(this HttpRequestBase request) + public static bool IsHttps(this HttpRequest request) { if (request.IsSecureConnection) { @@ -187,7 +188,7 @@ public static bool IsStaticResourceRequested(this HttpContext context) /// /// Gets a value which indicates whether the current request requests a static resource, like .txt, .pdf, .js, .css etc. /// - public static bool IsStaticResourceRequested(this HttpContextBase context) + public static bool IsStaticResourceRequested(this HttpContext context) { if (context?.Request == null) return false; @@ -200,26 +201,26 @@ public static bool IsStaticResourceRequested(this HttpContextBase context) [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void SetFormsAuthenticationCookie(this HttpWebRequest webRequest, HttpRequestBase httpRequest) + public static void SetFormsAuthenticationCookie(this HttpWebRequest webRequest, HttpRequest httpRequest) { CopyCookie(webRequest, httpRequest, FormsAuthentication.FormsCookieName); } [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void SetAnonymousIdentCookie(this HttpWebRequest webRequest, HttpRequestBase httpRequest) + public static void SetAnonymousIdentCookie(this HttpWebRequest webRequest, HttpRequest httpRequest) { CopyCookie(webRequest, httpRequest, "SMARTSTORE.ANONYMOUS"); } [SuppressMessage("ReSharper", "PossibleNullReferenceException")] [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void SetVisitorCookie(this HttpWebRequest webRequest, HttpRequestBase httpRequest) + public static void SetVisitorCookie(this HttpWebRequest webRequest, HttpRequest httpRequest) { CopyCookie(webRequest, httpRequest, "SMARTSTORE.VISITOR"); } - private static void CopyCookie(HttpWebRequest webRequest, HttpRequestBase sourceHttpRequest, string cookieName) + private static void CopyCookie(HttpWebRequest webRequest, HttpRequest sourceHttpRequest, string cookieName) { Guard.NotNull(webRequest, nameof(webRequest)); Guard.NotNull(sourceHttpRequest, nameof(sourceHttpRequest)); @@ -270,13 +271,13 @@ public static T GetOrAdd(this Cache cache, string key, Func acquirer, Time } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static void RememberAppRelativePath(this HttpContextBase httpContext) + public static void RememberAppRelativePath(this HttpContext httpContext) { httpContext.Items[RememberPathKey] = httpContext.Request.AppRelativeCurrentExecutionFilePath; } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static string GetOriginalAppRelativePath(this HttpContextBase httpContext) + public static string GetOriginalAppRelativePath(this HttpContext httpContext) { return GetItem(httpContext, RememberPathKey, forceCreation: false) ?? httpContext.Request.AppRelativeCurrentExecutionFilePath; } @@ -287,7 +288,7 @@ public static T GetItem(this HttpContext httpContext, string key, Func fac return GetItem(new HttpContextWrapper(httpContext), key, factory, forceCreation); } - public static T GetItem(this HttpContextBase httpContext, string key, Func factory = null, bool forceCreation = true) + public static T GetItem(this HttpContext httpContext, string key, Func factory = null, bool forceCreation = true) { Guard.NotEmpty(key, nameof(key)); diff --git a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs index 94ad48d31e..f9bab583cb 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 System.Web.Mvc; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; // use base SmartStore Namespace to ensure the extension methods are always available namespace SmartStore @@ -8,15 +8,15 @@ public static class RouteExtensions { public static string GetAreaName(this RouteData routeData) { - if (routeData.DataTokens.TryGetValue("area", out object area)) + if (routeData.Values.TryGetValue("area", out object? area)) { - return (area as string); + return (area as string) ?? string.Empty; } - return routeData.Route.GetAreaName(); + return string.Empty; } - public static string GetAreaName(this RouteBase route) + public static string GetAreaName(this IRouter route) { var area = route as IRouteWithArea; if (area != null) diff --git a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs index efea7d0778..aee0a4637f 100644 --- a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs @@ -9,8 +9,8 @@ using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; -using System.Web; -using SmartStore.Core.Html; +// using System.Web; // Removed for .NET 8 migration +// using SmartStore.Core.Html; // Removed for .NET 8 migration using SmartStore.Utilities.ObjectPools; namespace SmartStore diff --git a/src/Libraries/SmartStore.Core/Fakes/Extensions.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/Extensions.cs similarity index 79% rename from src/Libraries/SmartStore.Core/Fakes/Extensions.cs rename to src/Libraries/SmartStore.Core/Fakes.disabled/Extensions.cs index a6b9d765e8..667ba30f68 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 System.Web; // Removed for .NET 8 migration namespace SmartStore.Core.Fakes { @@ -10,7 +10,7 @@ public static class Extentions /// /// HTTP context /// Result - public static bool IsFakeContext(this HttpContextBase httpContext) + public static bool IsFakeContext(this HttpContext httpContext) { if (httpContext == null) throw new ArgumentNullException("httpContext"); 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 88% rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpContext.cs index 6da257d71a..1a38a67c3e 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs +++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpContext.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Security.Principal; -using System.Web; -using System.Web.SessionState; +// using System.Web; // Removed for .NET 8 migration +// using System.Web.SessionState; // Removed for .NET 8 migration namespace SmartStore.Core.Fakes { - public class FakeHttpContext : HttpContextBase + public class FakeHttpContext : HttpContext { private readonly HttpCookieCollection _cookies; private readonly NameValueCollection _formParams; @@ -18,7 +18,7 @@ public class FakeHttpContext : HttpContextBase private readonly SessionStateItemCollection _sessionItems; private readonly NameValueCollection _serverVariables; private HttpResponseBase _response; - private HttpRequestBase _request; + private HttpRequest _request; private readonly Dictionary _items; public static FakeHttpContext Root() @@ -72,9 +72,9 @@ public FakeHttpContext(string relativeUrl, public override IHttpHandler Handler { get; set; } - public override HttpRequestBase Request => _request ?? new FakeHttpRequest(_relativeUrl, _method, _formParams, _queryStringParams, _cookies, _serverVariables); + public override HttpRequest Request => _request ?? new FakeHttpRequest(_relativeUrl, _method, _formParams, _queryStringParams, _cookies, _serverVariables); - public void SetRequest(HttpRequestBase request) + public void SetRequest(HttpRequest request) { _request = request; } diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpHandler.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpHandler.cs similarity index 84% rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpHandler.cs rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpHandler.cs index ea0839801a..125c99f12b 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 System.Web; // Removed for .NET 8 migration 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 95% rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpRequest.cs index 5bc4db024a..5dec627adc 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs +++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpRequest.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Specialized; -using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Core.Fakes { - public class FakeHttpRequest : HttpRequestBase + public class FakeHttpRequest : HttpRequest { private readonly HttpCookieCollection _cookies; private readonly NameValueCollection _formParams; diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpResponse.cs similarity index 94% rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpResponse.cs index 4b5719ed6e..ac0aeba66e 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 System.Web; // Removed for .NET 8 migration 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 91% rename from src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs rename to src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpSessionState.cs index 6d45307e06..af27c888f3 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs +++ b/src/Libraries/SmartStore.Core/Fakes.disabled/FakeHttpSessionState.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Specialized; -using System.Web; -using System.Web.SessionState; +// using System.Web; // Removed for .NET 8 migration +// using System.Web.SessionState; // Removed for .NET 8 migration 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/BBCodeHelper.cs b/src/Libraries/SmartStore.Core/Html.disabled/BBCodeHelper.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/BBCodeHelper.cs rename to src/Libraries/SmartStore.Core/Html.disabled/BBCodeHelper.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CLikeFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CLikeFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/CLikeFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CLikeFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CSharpFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CSharpFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/CSharpFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CSharpFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CodeFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CodeFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CodeFormatHelper.cs similarity index 99% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CodeFormatHelper.cs index ff56b0f0d5..ee32492106 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/CodeFormatHelper.cs +++ b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/CodeFormatHelper.cs @@ -1,6 +1,6 @@ using System; using System.Text.RegularExpressions; -using System.Web; +// using System.Web; // Removed for .NET 8 migration namespace SmartStore.Core.Html.CodeFormatter { diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/HighlightOptions.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/HighlightOptions.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/HighlightOptions.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/HighlightOptions.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/HtmlFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/HtmlFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/HtmlFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/HtmlFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/JavaScriptFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/JavaScriptFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/JavaScriptFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/JavaScriptFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/MshFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/MshFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/MshFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/MshFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/SourceFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/SourceFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/SourceFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/SourceFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/TsqlFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/TsqlFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/VisualBasicFormat.cs b/src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/VisualBasicFormat.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/CodeFormatter/VisualBasicFormat.cs rename to src/Libraries/SmartStore.Core/Html.disabled/CodeFormatter/VisualBasicFormat.cs diff --git a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs b/src/Libraries/SmartStore.Core/Html.disabled/HtmlUtils.cs similarity index 99% rename from src/Libraries/SmartStore.Core/Html/HtmlUtils.cs rename to src/Libraries/SmartStore.Core/Html.disabled/HtmlUtils.cs index 2428d3c4aa..5e22e054ee 100644 --- a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs +++ b/src/Libraries/SmartStore.Core/Html.disabled/HtmlUtils.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -using System.Web; +// using System.Web; // Removed for .NET 8 migration using AngleSharp; using AngleSharp.Dom; using AngleSharp.Extensions; diff --git a/src/Libraries/SmartStore.Core/Html/ResolveLinksHelper.cs b/src/Libraries/SmartStore.Core/Html.disabled/ResolveLinksHelper.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Html/ResolveLinksHelper.cs rename to src/Libraries/SmartStore.Core/Html.disabled/ResolveLinksHelper.cs 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..e208eb6f0b 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; using SmartStore.Utilities; namespace SmartStore.Core.IO diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/ILockFile.cs b/src/Libraries/SmartStore.Core/IO/LockFile.disabled/ILockFile.cs similarity index 100% rename from src/Libraries/SmartStore.Core/IO/LockFile/ILockFile.cs rename to src/Libraries/SmartStore.Core/IO/LockFile.disabled/ILockFile.cs diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/ILockFileManager.cs b/src/Libraries/SmartStore.Core/IO/LockFile.disabled/ILockFileManager.cs similarity index 100% rename from src/Libraries/SmartStore.Core/IO/LockFile/ILockFileManager.cs rename to src/Libraries/SmartStore.Core/IO/LockFile.disabled/ILockFileManager.cs diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/LockFile.cs b/src/Libraries/SmartStore.Core/IO/LockFile.disabled/LockFile.cs similarity index 100% rename from src/Libraries/SmartStore.Core/IO/LockFile/LockFile.cs rename to src/Libraries/SmartStore.Core/IO/LockFile.disabled/LockFile.cs diff --git a/src/Libraries/SmartStore.Core/IO/LockFile/LockFileManager.cs b/src/Libraries/SmartStore.Core/IO/LockFile.disabled/LockFileManager.cs similarity index 100% rename from src/Libraries/SmartStore.Core/IO/LockFile/LockFileManager.cs rename to src/Libraries/SmartStore.Core/IO/LockFile.disabled/LockFileManager.cs diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/DefaultVirtualPathProvider.cs similarity index 97% rename from src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs rename to src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/DefaultVirtualPathProvider.cs index a7eea24f4e..91a9d50861 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/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 System.Web; // Removed for .NET 8 migration +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/IVirtualFolder.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/IVirtualFolder.cs similarity index 100% rename from src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualFolder.cs rename to src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/IVirtualFolder.cs diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/IVirtualPathProvider.cs similarity index 96% rename from src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs rename to src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/IVirtualPathProvider.cs index 2a7d3717f0..752f7af654 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/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/IO/VirtualPath/VirtualFolder.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/VirtualFolder.cs similarity index 100% rename from src/Libraries/SmartStore.Core/IO/VirtualPath/VirtualFolder.cs rename to src/Libraries/SmartStore.Core/IO/VirtualPath.disabled/VirtualFolder.cs diff --git a/src/Libraries/SmartStore.Core/IWebHelper.cs b/src/Libraries/SmartStore.Core/IWebHelper.cs index 31cd154105..e62f2027e9 100644 --- a/src/Libraries/SmartStore.Core/IWebHelper.cs +++ b/src/Libraries/SmartStore.Core/IWebHelper.cs @@ -1,4 +1,5 @@ -using System.Web; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Http; namespace SmartStore.Core { diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs rename to src/Libraries/SmartStore.Core/Infrastructure/ApplicationEnvironment.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs.disabled similarity index 96% rename from src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs rename to src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs.disabled index 14b51e277c..4080dffbb5 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs.disabled @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; -using System.Web.Mvc; -using System.Web.Mvc.Filters; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Filters; // Removed for .NET 8 migration using SmartStore.Core.Logging; namespace SmartStore.Core.Infrastructure @@ -32,7 +33,7 @@ public interface IApplicationStart /// public interface IPostApplicationStart { - void Start(HttpContextBase httpContext); + void Start(HttpContext httpContext); /// /// Called when an error occurred and is false. diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs.disabled similarity index 97% rename from src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs rename to src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs.disabled index ae9af5f59e..276447bba3 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs.disabled @@ -1,6 +1,6 @@ using System; using System.Runtime.Remoting.Messaging; -using System.Web; +// using System.Web; // Removed for .NET 8 migration namespace SmartStore.Core.Infrastructure { diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/AutofacRequestLifetimeHttpModule.cs similarity index 97% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/AutofacRequestLifetimeHttpModule.cs index d32030bcbd..e06e84dc6d 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/AutofacRequestLifetimeHttpModule.cs @@ -1,5 +1,5 @@ using System; -using System.Web; +// using System.Web; // Removed for .NET 8 migration using Autofac.Integration.Mvc; namespace SmartStore.Core.Infrastructure.DependencyManagement diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/ContainerManager.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ContainerManager.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/ContainerManager.cs diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/DefaultLifetimeScopeAccessor.cs similarity index 98% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/DefaultLifetimeScopeAccessor.cs index b4b0886ac5..86bfb2bffd 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeAccessor.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/DefaultLifetimeScopeAccessor.cs @@ -1,5 +1,5 @@ using System; -using System.Web; +// using System.Web; // Removed for .NET 8 migration using Autofac; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/DefaultLifetimeScopeProvider.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/DefaultLifetimeScopeProvider.cs diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/IDependencyRegistrar.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/IDependencyRegistrar.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/IDependencyRegistrar.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/IDependencyRegistrar.cs diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ILifetimeScopeAccessor.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/ILifetimeScopeAccessor.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/ILifetimeScopeAccessor.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/ILifetimeScopeAccessor.cs diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/Work.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/Work.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/Work.cs rename to src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement.disabled/Work.cs diff --git a/src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs b/src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs rename to src/Libraries/SmartStore.Core/Infrastructure/EngineContext.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs b/src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs rename to src/Libraries/SmartStore.Core/Infrastructure/IApplicationEnvironment.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs.disabled similarity index 91% rename from src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs rename to src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs.disabled index cbe93c2a1d..78df366f33 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/IEngine.cs.disabled @@ -1,5 +1,5 @@ using System; -using SmartStore.Core.Infrastructure.DependencyManagement; +// using SmartStore.Core.Infrastructure.DependencyManagement; // Removed for .NET 8 migration namespace SmartStore.Core.Infrastructure { diff --git a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs.disabled similarity index 97% rename from src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs rename to src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs.disabled index 5fabdf7d55..8d703f55f3 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs.disabled @@ -3,11 +3,11 @@ 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.Infrastructure.DependencyManagement; // Removed for .NET 8 migration using SmartStore.Core.Logging; using SmartStore.Core.Plugins; diff --git a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs index 4b6981b2ef..8d12d0a953 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 System.Web; // Removed for .NET 8 migration +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..b5ef0f6e45 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 System.Web; // Removed for .NET 8 migration 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..7ea1f9497f 100644 --- a/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs +++ b/src/Libraries/SmartStore.Core/Localization/LocalizedString.cs @@ -1,10 +1,13 @@ using System; -using System.Web; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Html; +using System.IO; +using System.Text.Encodings.Web; namespace SmartStore.Core.Localization { [Serializable] - public class LocalizedString : IHtmlString + public class LocalizedString : IHtmlContent { private readonly string _localized; private readonly string _textHint; @@ -39,7 +42,7 @@ public static LocalizedString TextOrDefault(string text, LocalizedString default /// /// Returns a js encoded string which already contains delimiters. /// - public IHtmlString JsText => System.Web.Mvc.MvcHtmlString.Create(_localized.EncodeJsString()); + public IHtmlContent JsText => new HtmlString(_localized.EncodeJsString()); public static implicit operator string(LocalizedString obj) { @@ -56,6 +59,11 @@ public override string ToString() return _localized; } + public void WriteTo(TextWriter writer, HtmlEncoder encoder) + { + writer.Write(_localized); + } + public string ToHtmlString() { return _localized; diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs b/src/Libraries/SmartStore.Core/Logging/log4net.disabled/Log4netLogger.cs similarity index 99% rename from src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs rename to src/Libraries/SmartStore.Core/Logging/log4net.disabled/Log4netLogger.cs index be5b37a6b1..7abca08e17 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net.disabled/Log4netLogger.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -using System.Web; +// using System.Web; // Removed for .NET 8 migration 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.disabled/Log4netLoggerFactory.cs similarity index 99% rename from src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs rename to src/Libraries/SmartStore.Core/Logging/log4net.disabled/Log4netLoggerFactory.cs index b949429081..e31e73da4e 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net.disabled/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/Logging/log4net/SmartFileAppender.cs b/src/Libraries/SmartStore.Core/Logging/log4net.disabled/SmartFileAppender.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Logging/log4net/SmartFileAppender.cs rename to src/Libraries/SmartStore.Core/Logging/log4net.disabled/SmartFileAppender.cs 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.disabled/ExtensionReferenceRepository.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/ExtensionReferenceRepository.cs diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/FileBasedProjectSystem.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/FileBasedProjectSystem.cs diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/NugetLogger.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/NugetLogger.cs diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/NullSourceRepository.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/NuGet.disabled/NullSourceRepository.cs diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs b/src/Libraries/SmartStore.Core/Packaging.disabled/PackageBuilder.cs similarity index 100% rename from src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackageBuilder.cs 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 100% rename from src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/PackageInstaller.cs 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..32733ed0e5 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs +++ b/src/Libraries/SmartStore.Core/Packaging.disabled/PackagingUtils.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Linq; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using NuGet; 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 100% rename from src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs rename to src/Libraries/SmartStore.Core/Packaging.disabled/Updater/AppUpdater.cs 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/IConfigurable.cs b/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs index aaee54810c..8ad04df865 100644 --- a/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs +++ b/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs @@ -1,4 +1,5 @@ -using System.Web.Routing; +// using System.Web.Routing; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; namespace SmartStore.Core.Plugins { diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs index d8a3f158af..50165fbb72 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; -using System.Web; -using System.Web.Compilation; -using Microsoft.Web.Infrastructure.DynamicModuleHelper; +// using System.Web; // Removed for .NET 8 migration +// using System.Web.Compilation; // Removed for .NET 8 migration +// using Microsoft.Web.Infrastructure.DynamicModuleHelper; // Removed for .NET 8 migration using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; -using SmartStore.Core.Infrastructure.DependencyManagement; +// using SmartStore.Core.Infrastructure.DependencyManagement; // Removed for .NET 8 migration using SmartStore.Core.Logging; -using SmartStore.Core.Packaging; +// using SmartStore.Core.Packaging; // Removed for .NET 8 migration using SmartStore.Core.Plugins; using SmartStore.Utilities; @@ -21,7 +21,7 @@ // 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")] +// [assembly: PreApplicationStartMethod(typeof(PluginManager), "Initialize")] // Removed for .NET 8 migration namespace SmartStore.Core.Plugins { /// 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; } /// /// True when this set is an internal composite container for rules within another ruleset. /// - [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/IPermissionService.cs b/src/Libraries/SmartStore.Core/Security/IPermissionService.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Security/IPermissionService.cs rename to src/Libraries/SmartStore.Core/Security/IPermissionService.cs.disabled diff --git a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs.disabled similarity index 99% rename from src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs rename to src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs.disabled index b1e4b0399c..6209758cd2 100644 --- a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs +++ b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs.disabled @@ -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..dfc041c967 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -1,810 +1,33 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {6BDA8332-939F-45B7-A25E-7A797260AE59} - Library - Properties + net8.0 SmartStore.Core SmartStore.Core - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true + enable + disable + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\PluginDev\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\HtmlSanitizer.4.0.205\lib\net45\HtmlSanitizer.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - True - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - True - - - - - - - - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - True - - - - ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + - + + + + + + + + + + + + + + + - - - - - - - - - \ No newline at end of file + diff --git a/src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs b/src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs.disabled similarity index 100% rename from src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs rename to src/Libraries/SmartStore.Core/Themes/DefaultThemeRegistry.cs.disabled 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..be231ac724 100644 --- a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs +++ b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs @@ -1,4 +1,5 @@ using System; +using Microsoft.AspNetCore.Http; using System.Collections.Generic; using System.IO; using System.Linq; @@ -8,7 +9,7 @@ using System.Net.Mime; using System.Threading; using System.Threading.Tasks; -using System.Web; +// using System.Web; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.IO; using SmartStore.Core.Logging; @@ -19,9 +20,9 @@ public class FileDownloadManager { private const int _bufferSize = 16384; - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequest _httpRequest; - public FileDownloadManager(HttpRequestBase httpRequest) + public FileDownloadManager(HttpRequest httpRequest) { _httpRequest = httpRequest; } diff --git a/src/Libraries/SmartStore.Core/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs.disabled similarity index 98% rename from src/Libraries/SmartStore.Core/WebHelper.cs rename to src/Libraries/SmartStore.Core/WebHelper.cs.disabled index 14a332af68..de3a82211b 100644 --- a/src/Libraries/SmartStore.Core/WebHelper.cs +++ b/src/Libraries/SmartStore.Core/WebHelper.cs.disabled @@ -10,8 +10,9 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; -using System.Web; -using System.Web.Configuration; +// using System.Web; // Removed for .NET 8 migration +// using System.Web.Configuration; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Http; using SmartStore.Collections; using SmartStore.Core.Data; using SmartStore.Core.Domain.Stores; @@ -30,7 +31,7 @@ public partial class WebHelper : IWebHelper private static readonly Regex s_cssPathPattern = new Regex(@"url\('(?.+)'\)", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.Multiline); private static readonly ConcurrentDictionary s_safeLocalHostNames = new ConcurrentDictionary(); - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private bool? _isCurrentConnectionSecured; private string _storeHost; private string _storeHostSsl; @@ -40,7 +41,7 @@ public partial class WebHelper : IWebHelper private Store _currentStore; - public WebHelper(HttpContextBase httpContext) + public WebHelper(HttpContext httpContext) { _httpContext = httpContext; } @@ -370,7 +371,7 @@ public static bool IsStaticResourceRequested(HttpRequest request) return s_staticExts.IsMatch(request.Path); } - public static bool IsStaticResourceRequested(HttpRequestBase request) + public static bool IsStaticResourceRequested(HttpRequest request) { // unit testable Guard.NotNull(request, nameof(request)); @@ -587,7 +588,7 @@ public static AspNetHostingPermissionLevel GetTrustLevel() /// /// All html attributed named src and href are affected, also occurences of url('path') within embedded stylesheets. /// - public static string MakeAllUrlsAbsolute(string html, HttpRequestBase request) + public static string MakeAllUrlsAbsolute(string html, HttpRequest request) { Guard.NotNull(request, nameof(request)); @@ -634,7 +635,7 @@ public static string MakeAllUrlsAbsolute(string html, string protocol, string ho /// /// Changes the protocol if passed. [SuppressMessage("ReSharper", "AccessToModifiedClosure")] - public static string GetAbsoluteUrl(string url, HttpRequestBase request, bool enforceScheme = false, string protocol = null) + public static string GetAbsoluteUrl(string url, HttpRequest request, bool enforceScheme = false, string protocol = null) { Guard.NotEmpty(url, nameof(url)); Guard.NotNull(request, nameof(request)); diff --git a/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs b/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs index 6cea03e354..9e3cbdea7a 100644 --- a/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs +++ b/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.Entity.Infrastructure.Interception; +using Microsoft.EntityFrameworkCore.Infrastructure.Interception; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs b/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs index 0f9e2754c5..10d311ecd6 100644 --- a/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs +++ b/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.Data.Common; -using System.Data.Entity.Core.Common; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Common; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs b/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs index 06085ea2c7..75a5bae641 100644 --- a/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs +++ b/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.Entity.Core.Common; -using System.Data.Entity.Core.Common.CommandTrees; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Spatial; +using Microsoft.EntityFrameworkCore.Core.Common; +using Microsoft.EntityFrameworkCore.Core.Common.CommandTrees; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Spatial; using SmartStore.Data.Setup; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs b/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs index 37e4bba8d6..5c2f981b5b 100644 --- a/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs +++ b/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.Entity.Core.Common.CommandTrees; -using System.Data.Entity.Core.Mapping; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Common.CommandTrees; +using Microsoft.EntityFrameworkCore.Core.Mapping; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; using System.Diagnostics; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs b/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs index b25df7670f..6bf709fda7 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.Entity.Core.Objects; +using Microsoft.EntityFrameworkCore.Core.Objects; using System.Linq; using System.Text; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs index aa426e1762..7a9d433f21 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Data.Common; -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.Core.EntityClient; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Objects; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using System.Reflection; using SmartStore.ComponentModel; diff --git a/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs b/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs index 7223f8d33a..4daf106289 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; using System.Linq; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; 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/EfMappingViewCache.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs index 02b105b920..604b35aed5 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure.MappingViews; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Infrastructure.MappingViews; using System.Linq; namespace SmartStore.Data.Caching diff --git a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs index 85c0d10238..4f1209ed87 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Core.Mapping; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Infrastructure.MappingViews; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Core.Mapping; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure.MappingViews; using System.IO; using System.Linq; using Newtonsoft.Json; diff --git a/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs b/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs index 3421c4651e..dbfe2380f7 100644 --- a/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs +++ b/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs b/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs index 07c742e82d..c06469a074 100644 --- a/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs +++ b/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/EfRepository.cs b/src/Libraries/SmartStore.Data/EfRepository.cs index 04934f60d3..22d6986a5b 100644 --- a/src/Libraries/SmartStore.Data/EfRepository.cs +++ b/src/Libraries/SmartStore.Data/EfRepository.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Validation; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Validation; using System.Linq; using System.Linq.Expressions; using System.Runtime.CompilerServices; using System.Threading.Tasks; using SmartStore.Core; using SmartStore.Core.Data; -using EfState = System.Data.Entity.EntityState; +using EfState = Microsoft.EntityFrameworkCore.EntityState; namespace SmartStore.Data { diff --git a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs index 1dace89f64..8ca87163db 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; @@ -100,7 +100,7 @@ public static int Execute(this DbContext context, string sql, params object[] pa public static void DumpAttachedEntities(this DbContext context) { context.ChangeTracker.Entries() - .Where(x => x.State != System.Data.Entity.EntityState.Detached) + .Where(x => x.State != Microsoft.EntityFrameworkCore.EntityState.Detached) .ToList() .ForEach(x => "{0} {1} {2}".FormatInvariant((x.Entity as BaseEntity).Id, x.State.ToString(), x.Entity.GetType().Name).Dump()); } diff --git a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs index 1543a8ba41..3868b26a07 100644 --- a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs @@ -1,14 +1,14 @@ 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; +using EfState = Microsoft.EntityFrameworkCore.EntityState; namespace SmartStore.Data { - public static class DbEntityEntryExtensions + public static class EntityEntryExtensions { - public static void ReloadEntity(this DbEntityEntry entry) + public static void ReloadEntity(this EntityEntry entry) { try { @@ -35,7 +35,7 @@ public static void ReloadEntity(this DbEntityEntry entry) /// was attached to the context the first time) /// Returns an empty dictionary if no modification could be detected. /// - public static IDictionary GetModifiedProperties(this DbEntityEntry entry, IDbContext ctx) + public static IDictionary GetModifiedProperties(this EntityEntry entry, IDbContext ctx) { var props = GetModifiedPropertyEntries(entry, ctx).ToDictionary(k => k.Name, v => v.OriginalValue); @@ -46,19 +46,19 @@ public static IDictionary GetModifiedProperties(this DbEntityEnt /// /// Checks whether an entity entry has any modified property. - /// Only entities in state are scanned for changes. + /// Only entities in state are scanned for changes. /// Merged values provided by the are ignored. /// /// The entry instance /// The data context /// true if any property has changed, false otherwise - public static bool HasChanges(this DbEntityEntry entry, IDbContext ctx) + public static bool HasChanges(this EntityEntry entry, IDbContext ctx) { var hasChanges = GetModifiedPropertyEntries(entry, ctx).Any(); return hasChanges; } - internal static IEnumerable GetModifiedPropertyEntries(this DbEntityEntry entry, IDbContext ctx) + internal static IEnumerable GetModifiedPropertyEntries(this EntityEntry entry, IDbContext ctx) { // Be aware of the entity state. you cannot get modified properties for detached entities. EnsureChangesDetected(entry, ctx); @@ -79,13 +79,13 @@ internal static IEnumerable GetModifiedPropertyEntries(this DbE } } - public static bool IsPropertyModified(this DbEntityEntry entry, IDbContext ctx, string propertyName) + public static bool IsPropertyModified(this EntityEntry entry, IDbContext ctx, string propertyName) { object originalValue; return TryGetModifiedProperty(entry, ctx, propertyName, out originalValue); } - public static bool TryGetModifiedProperty(this DbEntityEntry entry, IDbContext ctx, string propertyName, out object originalValue) + public static bool TryGetModifiedProperty(this EntityEntry entry, IDbContext ctx, string propertyName, out object originalValue) { Guard.NotEmpty(propertyName, nameof(propertyName)); @@ -109,7 +109,7 @@ public static bool TryGetModifiedProperty(this DbEntityEntry entry, IDbContext c return false; } - private static void EnsureChangesDetected(DbEntityEntry entry, IDbContext ctx) + private static void EnsureChangesDetected(EntityEntry entry, IDbContext ctx) { var state = entry.State; @@ -127,13 +127,13 @@ private static void EnsureChangesDetected(DbEntityEntry entry, IDbContext ctx) } } - public static void DetectChangesInProperties(this DbEntityEntry entry, IDbContext ctx) + public static void DetectChangesInProperties(this EntityEntry entry, IDbContext ctx) { ctx.DetectChanges(); #region Experimental - //// ChangeDetection for single entity: calls DbEntityEntry.InternalEntry > ObjectStateEntry._stateEntry.DetectChangesInProperties(bool) + //// ChangeDetection for single entity: calls EntityEntry.InternalEntry > ObjectStateEntry._stateEntry.DetectChangesInProperties(bool) //var invoked = false; //try diff --git a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs index 6f685642a4..636da9722f 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.Core; +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..3fd8b75c0d 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; @@ -39,7 +39,7 @@ public static T LoadOriginalCopy(this IDbContext context, T currentCopy) wher return InnerGetCopy(context, currentCopy, e => e.OriginalValues); } - public static DbEntityEntry GetEntry(this IDbContext context, T entity) where T : BaseEntity + public static EntityEntry GetEntry(this IDbContext context, T entity) where T : BaseEntity { var entry = CastOrThrow(context).Entry(entity); return entry; @@ -127,13 +127,13 @@ private static bool IsInSaveOperation(this IDbContext context) return (context as ObjectContextBase)?.IsInSaveOperation == true; } - private static T InnerGetCopy(IDbContext context, T currentCopy, Func, DbPropertyValues> func) where T : BaseEntity + private static T InnerGetCopy(IDbContext context, T currentCopy, Func, DbPropertyValues> func) where T : BaseEntity { // Get the database context var dbContext = CastOrThrow(context); // Get the entity tracking object - DbEntityEntry entry = GetEntityOrDefault(currentCopy, dbContext); + EntityEntry entry = GetEntityOrDefault(currentCopy, dbContext); // The output T output = null; @@ -158,7 +158,7 @@ private static T InnerGetCopy(IDbContext context, T currentCopy, FuncThe current copy. /// The db context. /// - private static DbEntityEntry GetEntityOrDefault(T currentCopy, DbContext dbContext) where T : BaseEntity + private static EntityEntry GetEntityOrDefault(T currentCopy, DbContext dbContext) where T : BaseEntity { return dbContext.ChangeTracker.Entries().Where(e => e.Entity == currentCopy).FirstOrDefault(); } diff --git a/src/Libraries/SmartStore.Data/IEfDataProvider.cs b/src/Libraries/SmartStore.Data/IEfDataProvider.cs index f6fc6e8cc7..a54a63cb3c 100644 --- a/src/Libraries/SmartStore.Data/IEfDataProvider.cs +++ b/src/Libraries/SmartStore.Data/IEfDataProvider.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using SmartStore.Core.Data; namespace SmartStore.Data diff --git a/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs index 339a99b51b..55dac2f886 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.ModelConfiguration; 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..e864ea1aa0 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.ModelConfiguration; 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..23c96c768d 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.ModelConfiguration; 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..a85c1bc505 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.ModelConfiguration; 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..72f5042c14 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.ModelConfiguration; 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..e58d6f1e54 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.ModelConfiguration; 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..f5d1654ad6 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.ModelConfiguration; 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..73f7811039 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.ModelConfiguration; 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..7dd412293a 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.ModelConfiguration; 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..d1ba5697a1 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.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs index 5580f04f00..56fb0b3244 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs index e33b6081a5..c63e191386 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs index 7da5ef6420..9347d6f56b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs index 0e4022315c..a9d9183d6c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; 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..13e53e90f6 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.ModelConfiguration; 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..33fa3f5058 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.ModelConfiguration; 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..3ede8b15a4 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.ModelConfiguration; 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..c5f3751dd4 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.ModelConfiguration; 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..7a8d93cb6c 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.ModelConfiguration; 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..629aa07b6b 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.ModelConfiguration; 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..bd9583fc77 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.ModelConfiguration; 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..2094ffe615 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.ModelConfiguration; 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..4db31fb842 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.ModelConfiguration; 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..a64e5c9c2c 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.ModelConfiguration; 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..40aaf93b0c 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.ModelConfiguration; 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..cc036168b2 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.ModelConfiguration; 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..9a79e9016a 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.ModelConfiguration; 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..11bd5dcb3a 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.ModelConfiguration; 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..ce051fee13 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.ModelConfiguration; 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..a073f48433 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.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs b/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs index 08618ac9b8..f6462d355f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Common; namespace SmartStore.Data.Mapping.Common diff --git a/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs index d9394809fb..87f84ce0a8 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.ModelConfiguration; 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..bb1ae1a2f7 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.ModelConfiguration; 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..c9531e816d 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.ModelConfiguration; 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..cb2e34d17b 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.ModelConfiguration; 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..5db6084217 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.ModelConfiguration; 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..b6221d08f7 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.ModelConfiguration; 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..f9c8e2514b 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.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs index 336620879c..53272a1573 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs index a850cb8fc6..8629a42d38 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs index 87574080f1..7d558a965d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs index d2402d6303..bda9a67c86 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs index 498a39be7d..489e65d7fc 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.DataExchange; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs index ba4ce8536b..8e2aa01b39 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.ModelConfiguration; 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..223f1f1ae4 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.ModelConfiguration; 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..c603f6b65e 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.ModelConfiguration; 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..f2ffd42a31 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.ModelConfiguration; 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..63c8f49154 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.ModelConfiguration; 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..7a25bd047f 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.ModelConfiguration; 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..b3faa910fd 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.ModelConfiguration; 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..8d9399066a 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.ModelConfiguration; 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..3808f9a68d 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.ModelConfiguration; using SmartStore.Core.Domain.Discounts; namespace SmartStore.Data.Mapping.Discounts diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs index c838c6d893..360bfafb89 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs index 92ed155ac8..10a33a2c2b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs index 25d01eece4..7ca5e3d088 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs index 40d9e9d8bb..b339d8469c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs index 0fad931f0d..1b32ff4ff9 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs index 1a8b46113b..a08b80b03f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs index c43e5635ab..720f8a9929 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs index ee9b04ec9a..676fffbacd 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.ModelConfiguration; 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..b2cf851a97 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.ModelConfiguration; 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..e4270ef062 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.ModelConfiguration; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs index b68c55ae20..d22d8f04c7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Logging; namespace SmartStore.Data.Mapping.Logging diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs index c7c667ce48..32d5f37d03 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Logging; namespace SmartStore.Data.Mapping.Logging diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs index 54c139fe45..cf098091f4 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.ModelConfiguration; 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..2f182f5b5b 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.ModelConfiguration; 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..13a4aaaad2 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.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs index 3873f15a54..6aa4caf428 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs index eaa13b5aac..f554e14861 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs index 8a3faf1072..8a5ca069e2 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs index ec2f551d08..8e39a0cb1c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; 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..ca6ef7554b 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.ModelConfiguration; 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..1e1b58173a 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.ModelConfiguration; 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..7864fb7010 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.ModelConfiguration; 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..2f6602342b 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.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs index 8ac9b15950..a9cc82c184 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; 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..251638db92 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.ModelConfiguration; 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..1687e94a7b 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.ModelConfiguration; 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..cfad62ccc3 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.ModelConfiguration; 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..9b84d6460d 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.ModelConfiguration; 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..ac30b1c49f 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.ModelConfiguration; 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..5d20411686 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.ModelConfiguration; 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..a4a78834a0 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.ModelConfiguration; 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..1f6a031c39 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.ModelConfiguration; 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..bfb0a0e182 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.ModelConfiguration; 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..88938edabc 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.ModelConfiguration; 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..feac4e9d1e 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.ModelConfiguration; 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..33edbaf1e3 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.ModelConfiguration; 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..18856ec34f 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.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs index 661c658e1d..1a2dc6dc83 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs b/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs index 01675e8f87..02dd506b9e 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Payments; namespace SmartStore.Data.Mapping.Payments diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs index 925bf98e8e..e084325fc0 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.ModelConfiguration; 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..f2c131c217 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.ModelConfiguration; 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..7eaac16c2c 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.ModelConfiguration; 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..fb28b0f18c 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.ModelConfiguration; 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..75826f4184 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.ModelConfiguration; 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..a079ace867 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.ModelConfiguration; using SmartStore.Core.Domain.Security; namespace SmartStore.Data.Mapping.Security diff --git a/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs index 21bbc06a50..a82f69823d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Seo; namespace SmartStore.Data.Mapping.Seo diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs index e8108ae002..e8fa9057a8 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.ModelConfiguration; 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..f0e7cc5cd8 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.ModelConfiguration; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs index 457c769e63..1dc768f87f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs index 8691c9755d..0fa8779cbe 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Stores; namespace SmartStore.Data.Mapping.Stores diff --git a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs index 9d98b89f75..fef9cb8a41 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Stores; namespace SmartStore.Data.Mapping.Stores diff --git a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs index c582f53566..ed822deeb9 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.ModelConfiguration; 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..6f8036b2c8 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.ModelConfiguration; using SmartStore.Core.Domain.Tasks; namespace SmartStore.Data.Mapping.Tasks diff --git a/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs index 66a8032821..5fc6a17311 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Tax; namespace SmartStore.Data.Mapping.Tax diff --git a/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs b/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs index bab6575777..7bf3a55743 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.ModelConfiguration; using SmartStore.Core.Domain.Themes; namespace SmartStore.Data.Mapping.Themes diff --git a/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs b/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs index acc15e4e16..0e363d72d4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Topics; namespace SmartStore.Data.Mapping.Topics diff --git a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs index 596e5ef91b..0ffa473b5c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs index 5f2db2e10f..e4a256aaf2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs index 2071542cd7..9cbd787f51 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs index 0cbb97ef49..340551ce73 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using Core.Data; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs index 37942deb8d..2f722e4936 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs index c858380a1f..f3aafb584c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class V302Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs index 8fb78dc364..8b81d55251 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs index c4c696c686..6fe9cfe134 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class TierPriceCalcMethod : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs index f2bedc3ccf..22a09cbdba 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs index fae5395bdf..4ad92897c3 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using Core.Domain.Topics; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs index 17d5c9a425..bf6da04fdd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs index 2142dca719..76633a55b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class V303Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs index d955362e1c..c0b5b1fd83 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs index b7984d1b2b..e97e0d9a09 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using Core.Domain.Tasks; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs index a07392cfe4..df4f15dfbd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs index cf6805e1cf..de02db86e4 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class CurrencyRounding : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs index 2024642a96..70fcfb1be0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs index 5020d69b3d..12d54fb9ef 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class IndexOptionNames : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs index 794345d94f..0e0920f8b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs index 8b6f013735..225faa88cc 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; using Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs index 1a420850cf..97c497dc50 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs index cd4527c919..ce957a67d7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.IO; using System.Web.Hosting; using Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs index 4f5a89531e..41a2cb3d64 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs index 7613251157..6fdc4f2d21 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System; using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Collections; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs index a4efc6b562..0771999499 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs index cb8df2f1fb..8d95f3d2c1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs index d3db49312f..3b7e87a86c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs index 8dd8239740..72620e4b88 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs index 2323322d13..802e83a857 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs index fa8929783e..5a43cff381 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ShippingMethodMultistore : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs index 665cb9c0b9..db79150058 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs index 38f873aac7..d2888d8e2b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ExportAttributeMappings : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs index 35a2953735..36bb0f18f9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs index 5b15b5ed48..4190548986 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class Wallet : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs index b6bd4f6aae..9335f87d07 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs index 9d98c90284..a6409a6053 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Stores; diff --git a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs index fc477fb5ce..a50be6a7aa 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs index 346a3c8e6c..482370b817 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Customers; diff --git a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs index c285369161..159e6c446b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs index dfb772e099..4bd9cd4710 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Domain.Topics; diff --git a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs index 6516923338..786272c9ef 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs index f42a572047..73866443d6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Configuration; diff --git a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs index f041a2400e..8e7a309c7e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs index e74f179a68..458fc1d07c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class RefundReturnRequests : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs index 4bc2296375..1d1a83cea2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs index f2d93452c9..55721951e8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Tasks; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs index dbfaf98582..8336c4428f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs index 0b211b6e2c..f66dde852a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System; using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs index a646dea18f..34104f9d7b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs index a525ea429a..66daa5f1b7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class TopicAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs index a3154b6e73..67be54ed55 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs index 341a2322b7..2cb7760af7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class OrderItemDeliveryTime : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs index 923d368911..ab88e5271e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs index caadf9da72..fdeaf05799 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs index 0bcd55246f..85c01bda17 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs index 9b7aa16571..c74650b17a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ProductPreviewPicture : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs index c28cdd698c..78fc1d740c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs index cf6adcbfff..da4286a21e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge4 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs index a8abf3ecf1..5fb014a4f0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs index 3304f86e1a..4b31f7c35b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class NewsletterSubscriptionLanguage : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs index 55b7fcd313..d983b4567e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs index 0c7e1af33d..1cd3fc2122 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ForumGroupAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs index df1f55332e..3e8fca9b89 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs index 37d44c2b2e..04022b33b7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ForumPostVote : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs index 9cf3ad8ecd..1134e897f7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs index 910446ec89..4487450ea5 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class DataExchangeEnhancements : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs index 65a34605b6..c61e8868a4 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs index 964d170410..7553e18035 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; public partial class IsSystemProductIndex : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs index d342d27f89..2305234573 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs index 847bea3807..b2c381cc56 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class LocalizedPropertyKeyGroupIndex : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs index 61f95300e6..0016dee3b2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs index 6c6ba2e7a5..1fd31eac9d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class TaskHistoryErrorLength : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs index 4205b2c00f..f5f3528aab 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs index 90640d3991..86aef0e770 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; public partial class ProductIndexSeekExport : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs index 4d82aade02..999b0ea201 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs index c0a44dcdc9..94e3b06554 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class TopicHtmlIdAndBodyCss : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs index b943551be8..a3078f50b8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs index ae8714e7d7..356e07a72a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs index 7a420fcffe..c6b5776bb1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs index d26335d830..0221019bf7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Topics; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs index e07144c09d..f30e8b6377 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs index 88c8d19d1b..1fe680dd5e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs index a194593e7c..bf759d8bed 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs index 4bd176f7f9..8559c5f8c2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V321Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs index 186f72e27d..6a8b4e72f0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs index 5f5ee9c386..690d3eba09 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Directory; diff --git a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs index 784b2cb7ce..cd68aba44f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs index f856a343e3..3bf88299ed 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class CategoryExternalLink : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs index e0cda0f6b7..9dc89e843c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs index 689a322ec2..36cbbb248c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs index f6561f32ae..b516d5e042 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs index e51e96adb5..40437ffbed 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class RuleSystem : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs index e6839de954..60e7406431 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs index 020c785b60..d71d7c1695 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System; using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs index be8c91d1d2..c6e6e989c0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs index 81056149ca..6e5e3e906e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V322Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs index 2689514cb0..adb3460958 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs index ee1db0c32e..0ad5208c64 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge5 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs index 8d61f6d810..cd0ac7867a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs index b3d720ca95..992569a29c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs index 8d24538a98..a7ef5f4e41 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs index c5948be73d..f98399e8a7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MenuItemMultistore : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs index 01d2f697a9..611753fa69 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs index 8dc2ea6c66..857e43cd89 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class BlogAndNewsItemPictures : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs index ea13123073..96842d5fc0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs index c9b18aac65..0b4cf9c47a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Tasks; diff --git a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs index c9efb16413..4aedd9ec4e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs index f33fea2e5e..f64bf9f0b7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge6 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs index ff3538cadb..9b77fbe868 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs index dd167ee0d9..abc23b49d6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs index f084fe871c..ec28d1b748 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs index 514a30a8f3..3452436091 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge7 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs index 44b6784d80..ed6eb87793 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs index 96ddfb67fa..a5441b50ae 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Tasks; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs index 8fd955896f..bb99d4795e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs index 78d3aa6849..e31e78276b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Messages; diff --git a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs index 325eb24496..e1f7a4bda1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs index 27839d3937..48ea0757d0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class AddNewPermissions : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs index ed934504ae..1111d84dde 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs index 0f8d65fdb3..f4aa908f57 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class SpecificationAttributeColorAndPicture : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs index 362b02beb3..b84fd0aa3d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs index a3603f70c5..2571ad1034 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ManufacturerBottomDescription : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs index 198f5378e0..757884a1b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs index d0391353e4..edb2bbda00 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs index 287c106f5c..a711f9feba 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs index e0d19a569e..ded8322e47 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs @@ -1,9 +1,9 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Builders; - using System.Data.Entity.Migrations.Model; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Builders; + using Microsoft.EntityFrameworkCore.Migrations.Model; using SmartStore.Core.Data; public partial class PictureMediaRename : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs index e5997cafc4..5066b843a0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs index fb3fc9139d..34c918a5f1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class PictureMediaRename1 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs index 7984e35545..ff75e22366 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs index 72b39d7843..c92552a818 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs index 3e65742e14..693c0aa0fe 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs index b3e70a5953..c322ebd0cb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Messages; diff --git a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs index db117a9ec5..e6621bfab9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs index e5ee0c0891..31bb82b449 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ProductCondition : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs index 30eaed8497..f0acc8ec74 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs index e7a616ff0a..0b77f9f291 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ManufacturerSubjectToAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs index e56eab80b2..51cedb0729 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs index 7d752fe47f..0f564c149e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ShipmentTrackingUrl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs index d829eb7571..26ec169596 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs index b210c5ef59..cdb2937541 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MediaManager : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs index 171f291d76..840a40b74c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs index d1d37ebb47..3051bf768f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge8 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs index 081c95329a..f95e72ed26 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs index 24bd074a26..b316e9fce9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs index 78b5637134..df08512bec 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs index bcf8c00d5f..4c2003c44b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MediaManager2 : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs index aaa30bb291..ac2030083b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs index 799ce565aa..c8829c8558 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Cms; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs index ce453cbe79..0140a6a002 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs index 5069c892c2..ed16cd4584 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Tasks; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs index d87fcba817..49fc1a9258 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs index bfcb56642b..d3f89f27ba 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs index 50ab827064..502d6f6075 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs index 99ac87c6de..0e84955e53 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs index e4153785ef..47e3798dca 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs index e6d328c13a..75b49430c3 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class CampaignSubjectToAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs index dd34b95167..1d47fb7e5b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs index d80781eac3..bb53ed3d83 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MediaManager3 : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs index 395c46d11f..141b8484f4 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs index 6ec22fa5c1..17f181e7cd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs index 9387aac6ac..03d02d65ef 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs index 66ff8fec6f..b1caa81a35 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class MediaFileIndexReorg : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs index 94d37bbc96..ad1aee5bdf 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs index 049b0f2f23..b42415e1fb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V401Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs index 5d7b94d21e..fc3c452230 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs index 31eef90291..fc8c42a138 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class NewPropertiesAndIndexes : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs index e9d53d3e43..fa519c1fd7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs index 2b3fdefbff..3d4859a66b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class AddCustomerRoleOrderAmount : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs index ec697d5c0b..e84886f536 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs index 910fea9429..98ba643524 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class RenamedCustomerRoleOrderTotal : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs index 664b26aadd..e951228336 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs index 4aaa198af3..3ffa60fcb2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge9 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs index 9a78bf96fb..1bce120da8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs index 227a055aa8..d609fed8fc 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs index 6a218b39fb..25513ab885 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs index 4cf6cab153..160ea738b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; diff --git a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs index b4b28db84f..f8e71c0f68 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs index 818986dceb..0d12a10108 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs index 1051bb9ea1..529dd45551 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs index 01d2fb1e83..ded32dd453 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class AttributeChoiceBehaviour : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs index e662cced0e..c61b86cd53 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs index 53fcbb0cdc..04a3014b0a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Blogs; diff --git a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs index 316f66a305..5030890538 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs index 34543f8e68..cfd7eecb66 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Media; diff --git a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs index 05f0cd1fa7..74106c037d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs index 0312293126..2061ef86a5 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class AddBlogAndNewsLanguage : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs index 7c33223814..c085002a1f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs index fd19393cf6..21ed847f25 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V411Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs index db9463e650..885ac44061 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs index 9dae67f2b9..0d82a7f2b0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 9afb1372cc..f8078174d7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using Setup; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs index 8503451f1f..1fcf7d2222 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Validation; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Validation; using System.Linq; using System.Text; using System.Threading; @@ -11,7 +11,7 @@ using SmartStore.Core.Data.Hooks; using SmartStore.Utilities; using SmartStore.Utilities.ObjectPools; -using EfState = System.Data.Entity.EntityState; +using EfState = Microsoft.EntityFrameworkCore.EntityState; namespace SmartStore.Data { @@ -27,7 +27,7 @@ private enum SaveStage PostSave } - private IEnumerable GetChangedEntries() + private IEnumerable GetChangedEntries() { return ChangeTracker.Entries().Where(x => x.State > EfState.Unchanged); } @@ -161,7 +161,7 @@ private static bool IsHookableEntityType(Type entityType) class SaveChangesOperation : IDisposable { private SaveStage _stage; - private IEnumerable _changedEntries; + private IEnumerable _changedEntries; private ObjectContextBase _ctx; private IDbHookHandler _hookHandler; @@ -171,7 +171,7 @@ public SaveChangesOperation(ObjectContextBase ctx, IDbHookHandler hookHandler) _hookHandler = hookHandler; } - public IEnumerable ChangedEntries => _changedEntries; + public IEnumerable ChangedEntries => _changedEntries; public SaveStage Stage => _stage; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.cs index 26d5a65685..f4e5552779 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; @@ -11,7 +11,7 @@ using SmartStore.Core.Data; using SmartStore.Core.Data.Hooks; using SmartStore.Utilities; -using EfState = System.Data.Entity.EntityState; +using EfState = Microsoft.EntityFrameworkCore.EntityState; namespace SmartStore.Data { @@ -417,7 +417,7 @@ public int DetachEntities(Func predicate, bool unchangedEntiti return numDetached; } - bool Match(DbEntityEntry entry) + bool Match(EntityEntry entry) { if (entry.State > EfState.Detached && predicate(entry.Entity)) { @@ -439,7 +439,7 @@ internal int DetachInternal(BaseEntity obj, ISet objSet, bool deep) return DetachInternal(this.Entry(obj), objSet, deep); } - internal int DetachInternal(DbEntityEntry entry, ISet objSet, bool deep) + internal int DetachInternal(EntityEntry entry, ISet objSet, bool deep) { var obj = entry.Entity; int numDetached = 0; 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..6614da5147 100644 --- a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Migrations; -using System.Data.Entity.Migrations.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Linq; using SmartStore.Core.Events; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs b/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs index 8513c8352e..7a0e08cf11 100644 --- a/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs +++ b/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs @@ -1,5 +1,5 @@ -using System.Data.Entity.Migrations.Infrastructure; -using System.Data.Entity.Migrations.Model; +using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations.Model; using System.Reflection; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs index 1e48290630..e008ef8b87 100644 --- a/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs @@ -1,5 +1,5 @@ using System.Data.Entity; -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Migrations; namespace SmartStore.Data.Setup diff --git a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs index a4d10d520a..91f568a9ed 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Collections; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs b/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs index 4ed6df0496..3f52b2d27e 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using System.IO; using System.Linq; using System.Text.RegularExpressions; diff --git a/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs b/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs index e58a59a192..c0c027fec7 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 System.Data.Entity.Infrastructure.DependencyResolution; -using System.Web.Hosting; +using Microsoft.EntityFrameworkCore.Core.Common; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure.DependencyResolution; +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..97ea1c7052 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.ModelConfiguration; 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..87fc887526 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -1,1016 +1,27 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144} - Library - Properties + net8.0 SmartStore.Data SmartStore.Data - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true + enable + disable + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - latest - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - latest - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - latest - - - true - bin\PluginDev\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - latest - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll - True - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - True - ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.ConnectionInfo.dll - - - True - ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Management.Sdk.Sfc.dll - - - True - ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - True - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 201705281903241_MoreIndexes.cs - - - - 201706020759565_UpdateMediaPath.cs - - - - 201707190940318_V302Resources.cs - - - - 201707281452589_TierPriceCalcMethod.cs - - - - 201708251628482_SystemTopics.cs - - - - 201709141000226_V303Resources.cs - - - - 201709251538312_UpdateTrustedShopsTask.cs - - - - 201710102038287_CurrencyRounding.cs - - - - 201710252016556_IndexOptionNames.cs - - - - 201711112331162_ProductMainPictureId.cs - - - - 201711222311112_MoveFsMedia.cs - - - - 201711291017168_SyncStringResources.cs - - - - 201712081631552_Liquid.cs - - - - 201712290151517_AddressFormat.cs - - - - 201802081830029_ShippingMethodMultistore.cs - - - - 201802270844034_ExportAttributeMappings.cs - - - - 201804060721031_Wallet.cs - - - - 201804090744324_ForceSslForAllPages.cs - - - - 201804200835273_V310Resources.cs - - - - 201804252356096_TopicSlugs.cs - - - - 201805250724399_V315Resources.cs - - - - 201806051221399_RefundReturnRequests.cs - - - - 201806231547270_ScheduleTaskHistory.cs - - - - 201807051830375_MoveCustomerFields.cs - - - - 201807122120062_TopicAcl.cs - - - - 201807191020207_OrderItemDeliveryTime.cs - - - - 201807201157391_DownloadVersions.cs - - - - 201807311708428_ProductPreviewPicture.cs - - - - 201808051818238_Merge4.cs - - - - 201809171309522_NewsletterSubscriptionLanguage.cs - - - - 201809261026134_ForumGroupAcl.cs - - - - 201810011954195_ForumPostVote.cs - - - - 201810231214068_DataExchangeEnhancements.cs - - - - 201811061745204_IsSystemProductIndex.cs - - - - 201811082148279_LocalizedPropertyKeyGroupIndex.cs - - - - 201811161142587_TaskHistoryErrorLength.cs - - - - 201811202204501_ProductIndexSeekExport.cs - - - - 201902211855242_TopicHtmlIdAndBodyCss.cs - - - - 201904110735029_Menus.cs - - - - 201905020948354_WidgetTopics.cs - - - - 201905101159134_V320Resources.cs - - - - 201905271110370_V321Resources.cs - - - - 201906252008551_QuantityUnitNamePlural.cs - - - - 201907032251575_CategoryExternalLink.cs - - - - 201907250103367_RuleSystem.cs - - - - 201908050758298_MoveFurtherCustomerFields.cs - - - - 201908150749388_V322Resources.cs - - - - 201907221803421_GranularPermissions.cs - - - - 201908211821559_Merge5.cs - - - - 201908211825244_ProductTagPublished.cs - - - - 201908261226350_MenuItemMultistore.cs - - - - 201909291043284_BlogAndNewsItemPictures.cs - - - - 201910021805242_RemoveOldPermissions.cs - - - - 201910162004581_Merge6.cs - - - - 201911090805330_ProductVisibility.cs - - - - 201911120909434_Merge7.cs - - - - 201911141820264_ScheduleTaskPriority.cs - - - - 201912051209105_MessageTemplateEmailAddress.cs - - - - 201912111821362_AddNewPermissions.cs - - - - 202001141118171_SpecificationAttributeColorAndPicture.cs - - - - 202001221054109_ManufacturerBottomDescription.cs - - - - 202001301039020_DiscountRuleSets.cs - - - - 202002172101120_PictureMediaRename.cs - - - - 202002180228163_PictureMediaRename1.cs - - - - 202002280005340_MediaManager.cs - - - - 202002191252074_RemoveDiscountRequirements.cs - - - - 202002211011108_GenericMessageTemplate.cs - - - - 202002241354543_ProductCondition.cs - - - - 202002251510114_ManufacturerSubjectToAcl.cs - - - - 202002271206204_ShipmentTrackingUrl.cs - - - - 202003022018038_Merge8.cs - - - - 202003052100521_CustomerRoleMappings.cs - - - - 202003112359492_MediaManager2.cs - - - - 202003251118391_CategoryRuleSets.cs - - - - 202003171812584_CookieManager.cs - - - - 202003311314082_CookieManagerCountries.cs - - - - 202004301922188_RemoveCustomerCustomerRoles.cs - - - - 202005111006305_CampaignSubjectToAcl.cs - - - - 202005201826512_MediaManager3.cs - - - - 202006250801086_V400Resources.cs - - - - 202007160058551_MediaFileIndexReorg.cs - - - - 202007241131557_V401Resources.cs - - - - 202007291847004_NewPropertiesAndIndexes.cs - - - - 202007301117363_AddCustomerRoleOrderAmount.cs - - - - 202008181949580_RenamedCustomerRoleOrderTotal.cs - - - - 202009021705132_Merge9.cs - - - - 202009041122208_ShopIcons.cs - - - - 202009090817220_DeliveryTimeMinMaxDays.cs - - - - 202010011005387_TopicCookieType.cs - - - - 202010030939136_AttributeChoiceBehaviour.cs - - - - 202010121359446_RemoveBlogAndNewsLanguage.cs - - - - 202011091154314_V410Resources.cs - - - - 202012051645539_AddBlogAndNewsLanguage.cs - - - - 202101251149352_V411Resources.cs - - - - 202112171231491_V420Resources.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - - - 201705281903241_MoreIndexes.cs - - - 201706020759565_UpdateMediaPath.cs - - - 201707190940318_V302Resources.cs - - - 201707281452589_TierPriceCalcMethod.cs - - - 201708251628482_SystemTopics.cs - - - 201709141000226_V303Resources.cs - - - 201709251538312_UpdateTrustedShopsTask.cs - - - 201710102038287_CurrencyRounding.cs - - - 201710252016556_IndexOptionNames.cs - - - 201711112331162_ProductMainPictureId.cs - - - 201711222311112_MoveFsMedia.cs - - - 201711291017168_SyncStringResources.cs - - - 201712081631552_Liquid.cs - - - 201712290151517_AddressFormat.cs - - - 201802081830029_ShippingMethodMultistore.cs - - - 201802270844034_ExportAttributeMappings.cs - - - 201804060721031_Wallet.cs - - - 201804090744324_ForceSslForAllPages.cs - - - 201804200835273_V310Resources.cs - - - 201804252356096_TopicSlugs.cs - - - 201805250724399_V315Resources.cs - - - 201806051221399_RefundReturnRequests.cs - - - 201806231547270_ScheduleTaskHistory.cs - - - 201807051830375_MoveCustomerFields.cs - - - 201807122120062_TopicAcl.cs - - - 201807191020207_OrderItemDeliveryTime.cs - - - 201807201157391_DownloadVersions.cs - - - 201807311708428_ProductPreviewPicture.cs - - - 201808051818238_Merge4.cs - - - 201809171309522_NewsletterSubscriptionLanguage.cs - - - 201809261026134_ForumGroupAcl.cs - - - 201810011954195_ForumPostVote.cs - - - 201810231214068_DataExchangeEnhancements.cs - - - 201811061745204_IsSystemProductIndex.cs - - - 201811082148279_LocalizedPropertyKeyGroupIndex.cs - - - 201811161142587_TaskHistoryErrorLength.cs - - - 201811202204501_ProductIndexSeekExport.cs - - - 201902211855242_TopicHtmlIdAndBodyCss.cs - - - 201904110735029_Menus.cs - - - 201905020948354_WidgetTopics.cs - - - 201905101159134_V320Resources.cs - - - 201905271110370_V321Resources.cs - - - 201906252008551_QuantityUnitNamePlural.cs - - - 201907032251575_CategoryExternalLink.cs - - - 201907250103367_RuleSystem.cs - - - 201907221803421_GranularPermissions.cs - - - 201908050758298_MoveFurtherCustomerFields.cs - - - 201908150749388_V322Resources.cs - - - 201908211821559_Merge5.cs - - - 201908211825244_ProductTagPublished.cs - - - 201908261226350_MenuItemMultistore.cs - - - 201909291043284_BlogAndNewsItemPictures.cs - - - 201910021805242_RemoveOldPermissions.cs - - - 201910162004581_Merge6.cs - - - 201911090805330_ProductVisibility.cs - - - 201911120909434_Merge7.cs - - - 201911141820264_ScheduleTaskPriority.cs - - - 201912051209105_MessageTemplateEmailAddress.cs - - - 201912111821362_AddNewPermissions.cs - - - 202001141118171_SpecificationAttributeColorAndPicture.cs - - - 202001221054109_ManufacturerBottomDescription.cs - - - 202001301039020_DiscountRuleSets.cs - - - 202002172101120_PictureMediaRename.cs - - - 202002180228163_PictureMediaRename1.cs - - - 202002280005340_MediaManager.cs - - - 202002191252074_RemoveDiscountRequirements.cs - - - 202002211011108_GenericMessageTemplate.cs - - - 202002241354543_ProductCondition.cs - - - 202002251510114_ManufacturerSubjectToAcl.cs - - - 202002271206204_ShipmentTrackingUrl.cs - - - 202003022018038_Merge8.cs - - - 202003052100521_CustomerRoleMappings.cs - - - 202003112359492_MediaManager2.cs - - - 202003251118391_CategoryRuleSets.cs - - - 202003171812584_CookieManager.cs - - - 202003311314082_CookieManagerCountries.cs - - - 202004301922188_RemoveCustomerCustomerRoles.cs - - - 202005111006305_CampaignSubjectToAcl.cs - - - 202005201826512_MediaManager3.cs - - - 202006250801086_V400Resources.cs - - - 202007160058551_MediaFileIndexReorg.cs - - - 202007241131557_V401Resources.cs - - - 202007291847004_NewPropertiesAndIndexes.cs - - - 202007301117363_AddCustomerRoleOrderAmount.cs - - - 202008181949580_RenamedCustomerRoleOrderTotal.cs - - - 202009021705132_Merge9.cs - - - 202009041122208_ShopIcons.cs - - - 202009090817220_DeliveryTimeMinMaxDays.cs - - - 202010011005387_TopicCookieType.cs - - - 202010030939136_AttributeChoiceBehaviour.cs - - - 202010121359446_RemoveBlogAndNewsLanguage.cs - - - 202011091154314_V410Resources.cs - - - 202012051645539_AddBlogAndNewsLanguage.cs - - - 202101251149352_V411Resources.cs - - - 202112171231491_V420Resources.cs - - - - + - + + - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - - - - - - - - - - - - - - - - - \ No newline at end of file + 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..1c24c17d20 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; @@ -33,7 +33,7 @@ using SmartStore.Rules.Domain; using SmartStore.Utilities; using SmartStore.Utilities.ObjectPools; -using EfState = System.Data.Entity.EntityState; +using EfState = Microsoft.EntityFrameworkCore.EntityState; namespace SmartStore.Data.Utilities { 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..70c8b73fdd 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 System.Web; // Removed for .NET 8 migration 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..bbaeb67de1 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Identity; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Services.Customers; @@ -11,7 +11,7 @@ namespace SmartStore.Services.Authentication { public partial class FormsAuthenticationService : IAuthenticationService { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly ICustomerService _customerService; private readonly CustomerSettings _customerSettings; private readonly PrivacySettings _privacySettings; @@ -20,7 +20,7 @@ public partial class FormsAuthenticationService : IAuthenticationService private Customer _cachedCustomer; public FormsAuthenticationService( - HttpContextBase httpContext, + HttpContext httpContext, ICustomerService customerService, CustomerSettings customerSettings, PrivacySettings privacySettings) 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..1f2ee89b33 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Customers; using SmartStore.Services.Search; @@ -15,13 +15,13 @@ public partial class CompareProductsService : ICompareProductsService { private const string COMPARE_PRODUCTS_COOKIE_NAME = "sm.CompareProducts"; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IProductService _productService; private readonly ICatalogSearchService _catalogSearchService; private readonly PrivacySettings _privacySettings; public CompareProductsService( - HttpContextBase httpContext, + HttpContext httpContext, IProductService productService, ICatalogSearchService catalogSearchService, PrivacySettings privacySettings) diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs index 7c7f4df528..23ff458414 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Localization; @@ -16,7 +16,7 @@ namespace SmartStore.Services.Catalog.Extensions { public class ProductUrlHelper { - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequest _httpRequest; private readonly ICommonServices _services; private readonly IProductAttributeParser _productAttributeParser; private readonly IProductAttributeService _productAttributeService; @@ -27,7 +27,7 @@ public class ProductUrlHelper private readonly int _languageId; public ProductUrlHelper( - HttpRequestBase httpRequest, + HttpRequest httpRequest, ICommonServices services, IProductAttributeParser productAttributeParser, IProductAttributeService productAttributeService, diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductVariantQueryExtensions.cs index da76ad1190..432da3abcd 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Media; using SmartStore.Services.Catalog.Modelling; @@ -21,7 +21,7 @@ public static string CreateSelectedAttributesXml( ILocalizationService localization, IDownloadService downloadService, CatalogSettings catalogSettings, - HttpRequestBase request, + HttpRequest request, List warnings) { var result = string.Empty; 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/IProductVariantQueryFactory.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs index 178e8d4efc..82891bc833 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/IProductVariantQueryFactory.cs @@ -8,7 +8,7 @@ public interface IProductVariantQueryFactory ProductVariantQuery Current { get; } /// - /// Creates a name value collection with product variants from the current + /// Creates a name value collection with product variants from the current /// by looking up corresponding keys in posted form and/or query string /// /// Product variant query diff --git a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs index c7cb504693..b38e9a7489 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 System.Web; // Removed for .NET 8 migration using SmartStore.Collections; using SmartStore.Services.Search.Modelling; @@ -15,13 +15,13 @@ public class ProductVariantQueryFactory : IProductVariantQueryFactory internal static readonly Regex IsGiftCardKey = new Regex(@"giftcard[0-9]+-[0-9]+-\.\w+$", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); internal static readonly Regex IsCheckoutAttributeKey = new Regex(@"cattr[0-9]+", RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled); - protected readonly HttpContextBase _httpContext; + protected readonly HttpContext _httpContext; protected readonly ICommonServices _services; protected readonly ICatalogSearchQueryAliasMapper _catalogSearchQueryAliasMapper; private Multimap _queryItems; public ProductVariantQueryFactory( - HttpContextBase httpContext, + HttpContext httpContext, ICommonServices services, ICatalogSearchQueryAliasMapper catalogSearchQueryAliasMapper) { @@ -348,7 +348,7 @@ protected virtual void ConvertCheckoutAttribute(ProductVariantQuery query, strin } } - protected virtual void ConvertItems(HttpRequestBase request, ProductVariantQuery query, string key, ICollection values) + protected virtual void ConvertItems(HttpRequest request, ProductVariantQuery query, string key, ICollection values) { } } diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs index e0454c592a..6c4697993c 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Directory; @@ -30,7 +30,7 @@ public partial class PriceCalculationService : IPriceCalculationService private readonly IProductAttributeService _productAttributeService; private readonly IDownloadService _downloadService; private readonly ICommonServices _services; - private readonly HttpRequestBase _httpRequestBase; + private readonly HttpRequest _httpRequestBase; private readonly ITaxService _taxService; private readonly TaxSettings _taxSettings; @@ -44,7 +44,7 @@ public PriceCalculationService( IProductAttributeService productAttributeService, IDownloadService downloadService, ICommonServices services, - HttpRequestBase httpRequestBase, + HttpRequest httpRequestBase, ITaxService taxService, TaxSettings taxSettings) { diff --git a/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/ProductAttributeFormatter.cs index 8e54c8d8a1..3b422c2d91 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 System.Web; // Removed for .NET 8 migration 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..0ee4028ba5 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Customers; using SmartStore.Services.Security; @@ -16,7 +16,7 @@ public partial class RecentlyViewedProductsService : IRecentlyViewedProductsServ #region Fields private readonly ICommonServices _services; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IProductService _productService; private readonly IAclService _aclService; private readonly CatalogSettings _catalogSettings; @@ -34,7 +34,7 @@ public partial class RecentlyViewedProductsService : IRecentlyViewedProductsServ /// Catalog settings public RecentlyViewedProductsService( ICommonServices services, - HttpContextBase httpContext, + HttpContext httpContext, IProductService productService, IAclService aclService, CatalogSettings catalogSettings, 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..af84727ec1 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 System.Web.Mvc.Async; -using System.Web.Mvc.Html; -using System.Web.Routing; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Async; // Removed for .NET 8 migration +// using System.Web.Mvc.Html; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core.Logging; @@ -408,7 +408,7 @@ public ChildActionMvcHandler(RequestContext context) { } - protected override void AddVersionHeader(HttpContextBase httpContext) + protected override void AddVersionHeader(HttpContext httpContext) { // No version header for child actions } diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs index 0e15cb8771..26aa94c2a9 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 System.Web; // Removed for .NET 8 migration +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..2025e82ee5 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 System.Web; // Removed for .NET 8 migration +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..a4397af43c 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 System.Web; // Removed for .NET 8 migration +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..2bc5dc327b 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 System.Web; // Removed for .NET 8 migration namespace SmartStore.Services.Common { diff --git a/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs b/src/Libraries/SmartStore.Services/Common/UAParserUserAgent.cs index 9f1705d9a3..9e47ebf8a6 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 System.Web; // Removed for .NET 8 migration using SmartStore.Utilities; using uap = UAParser; @@ -105,7 +105,7 @@ public class UAParserUserAgent : IUserAgent #endregion - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private string _rawValue; private UserAgentInfo _userAgent; @@ -125,7 +125,7 @@ static UAParserUserAgent() : uap.Parser.GetDefault(); } - public UAParserUserAgent(HttpContextBase httpContext) + public UAParserUserAgent(HttpContext httpContext) { this._httpContext = httpContext; } diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs index 486f1a42b1..1e2bda3195 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Services.Customers { @@ -27,7 +27,7 @@ public partial class CookieManager : ICookieManager { private readonly ICommonServices _services; private readonly ITypeFinder _typeFinder; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly PrivacySettings _privacySettings; public const string ConsentCookieName = "CookieConsent"; @@ -38,7 +38,7 @@ public partial class CookieManager : ICookieManager public CookieManager( ICommonServices services, ITypeFinder typeFinder, - HttpContextBase httpContext, + HttpContext httpContext, PrivacySettings privacySettings) { _services = services; 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..a98414d400 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 System.Web; // Removed for .NET 8 migration using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Data; @@ -34,7 +34,7 @@ public partial class CustomerService : ICustomerService private readonly IGenericAttributeService _genericAttributeService; private readonly Lazy _rewardPointsSettings; private readonly ICommonServices _services; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IUserAgent _userAgent; private readonly CustomerSettings _customerSettings; private readonly Lazy _gdprTool; @@ -49,7 +49,7 @@ public CustomerService( IGenericAttributeService genericAttributeService, Lazy rewardPointsSettings, ICommonServices services, - HttpContextBase httpContext, + HttpContext httpContext, IUserAgent userAgent, CustomerSettings customerSettings, Lazy gdprTool) diff --git a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs index 7a246b92a4..aa45c821da 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 System.Web; // Removed for .NET 8 migration +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/Excel/ExcelDataReader.cs b/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs index 9031e7792d..b7caae0742 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs @@ -116,7 +116,7 @@ public IReadOnlyCollection GetColumnHeaders() public string GetFormatted(int i) { ValidateDataReader(); - return _sheet.Cells[ExcelRowIndex(_currentRowIndex), i + 1].Text; + return _sheet.Cells[ExcelRowi + 1].Text; } public int GetColumnIndex(string name) @@ -196,7 +196,7 @@ public object this[int i] { ValidateDataReader(); // Excel indexes start from 1 - return _sheet.GetValue(ExcelRowIndex(_currentRowIndex), i + 1); + return _sheet.GetValue(ExcelRowi + 1); } } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs index 076b161bf9..1bf2932cf7 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 System.Web; // Removed for .NET 8 migration using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Data; @@ -54,7 +54,7 @@ public partial class DataExporter : IDataExporter private readonly ICommonServices _services; private readonly IDbContext _dbContext; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly Lazy _priceFormatter; private readonly Lazy _exportProfileService; private readonly Lazy _localizedEntityService; @@ -103,7 +103,7 @@ public partial class DataExporter : IDataExporter public DataExporter( ICommonServices services, IDbContext dbContext, - HttpContextBase httpContext, + HttpContext httpContext, Lazy priceFormatter, Lazy exportProfileService, Lazy localizedEntityService, diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs index 946769b317..b0d2858994 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 System.Web; // Removed for .NET 8 migration 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..79f42ecaaa 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 System.Web; // Removed for .NET 8 migration 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..b420345653 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 System.Web; // Removed for .NET 8 migration 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..5ad1020482 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.Core.Metadata.Edm; +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/Hooks/StoreSaveHook.cs b/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs index dafd38a099..5389694f91 100644 --- a/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs +++ b/src/Libraries/SmartStore.Services/Hooks/StoreSaveHook.cs @@ -11,9 +11,9 @@ public class StoreSaveHook : DbSaveHook { private readonly ITaskScheduler _taskScheduler; private readonly IStoreService _storeService; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; - public StoreSaveHook(ITaskScheduler taskScheduler, IStoreService storeService, HttpContextBase httpContext) + public StoreSaveHook(ITaskScheduler taskScheduler, IStoreService storeService, HttpContext httpContext) { _taskScheduler = taskScheduler; _storeService = storeService; diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs index ceffa079a2..ac85f7ec2b 100644 --- a/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs +++ b/src/Libraries/SmartStore.Services/Localization/LocalizedUrlHelper.cs @@ -5,7 +5,7 @@ namespace SmartStore.Services.Localization { public class LocalizedUrlHelper { - public LocalizedUrlHelper(HttpRequestBase httpRequest, bool rawUrl = false) + public LocalizedUrlHelper(HttpRequest httpRequest, bool rawUrl = false) : this(httpRequest.ApplicationPath, rawUrl ? httpRequest.RawUrl : httpRequest.AppRelativeCurrentExecutionFilePath, rawUrl) { Guard.NotNull(httpRequest, nameof(httpRequest)); diff --git a/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs b/src/Libraries/SmartStore.Services/Localization/LocalizedValue.cs index c383f2c992..747cdf986a 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 System.Web; // Removed for .NET 8 migration 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/Events.cs b/src/Libraries/SmartStore.Services/Media/Events.cs index 583f34a90a..3ff5d55d01 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 System.Web; // Removed for .NET 8 migration using SmartStore.Services.Media.Imaging; namespace SmartStore.Services.Media @@ -47,7 +47,7 @@ public ImageUploadedEvent(ProcessImageQuery query, Size size) /// public class ImageQueryCreatedEvent { - public ImageQueryCreatedEvent(ProcessImageQuery query, HttpContextBase httpContext, string mimeType, string extension) + public ImageQueryCreatedEvent(ProcessImageQuery query, HttpContext httpContext, string mimeType, string extension) { Query = query; HttpContext = httpContext; @@ -56,7 +56,7 @@ public ImageQueryCreatedEvent(ProcessImageQuery query, HttpContextBase httpConte } public ProcessImageQuery Query { get; private set; } - public HttpContextBase HttpContext { get; private set; } + public HttpContext HttpContext { get; private set; } public string MimeType { get; private set; } public string Extension { get; private set; } } diff --git a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs index 0ac54584ec..3dde8847eb 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Media; using SmartStore.Core.IO; @@ -28,7 +28,7 @@ public MediaHandlerContext() public IMediaService MediaService { get; set; } public IPermissionService PermissionService { get; set; } public Customer CurrentCustomer { get; set; } - public HttpContextBase HttpContext { get; set; } + public HttpContext HttpContext { get; set; } public int MediaFileId { get; set; } public string RawPath { get; set; } diff --git a/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs b/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs index e460dd94ef..9f82edbb14 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Caching; @@ -56,7 +56,7 @@ public partial class PictureService : ScopedServiceBase, IPictureService private readonly IImageProcessor _imageProcessor; private readonly IImageCache _imageCache; private readonly Provider _storageProvider; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly ICacheManager _cacheManager; private readonly string _host; @@ -84,7 +84,7 @@ public PictureService( IImageCache imageCache, IProviderManager providerManager, IStoreContext storeContext, - HttpContextBase httpContext, + HttpContext httpContext, ICacheManager cacheManager) { _pictureRepository = pictureRepository; 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..0a1cfaa510 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; using SmartStore.Core; using SmartStore.Core.Domain.Media; using SmartStore.Services.Configuration; @@ -10,7 +10,7 @@ namespace SmartStore.Services.Media { public partial class MediaUrlGenerator : IMediaUrlGenerator { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly string _host; private readonly string _appPath; @@ -29,7 +29,7 @@ public MediaUrlGenerator( ISettingService settingService, MediaSettings mediaSettings, IStoreContext storeContext, - HttpContextBase httpContext) + HttpContext httpContext) { _httpContext = httpContext; 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..48b77c8c79 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs @@ -1,7 +1,7 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; -using System.Web.UI; +// using System.Web.UI; // Removed for .NET 8 migration 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..b06d3f28ca 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; @@ -159,7 +159,7 @@ protected virtual void TrackSingle(BaseEntity entity, int mediaFileId, string pr if (dbTrack != null) { file.Tracks.Remove(track); - _dbContext.ChangeState(dbTrack, System.Data.Entity.EntityState.Deleted); + _dbContext.ChangeState(dbTrack, Microsoft.EntityFrameworkCore.EntityState.Deleted); } } @@ -267,7 +267,7 @@ protected virtual void TrackManyCore(IEnumerable tracks, string albu if (dbTrack != null) { file.Tracks.Remove(track); - _dbContext.ChangeState(dbTrack, System.Data.Entity.EntityState.Deleted); + _dbContext.ChangeState(dbTrack, Microsoft.EntityFrameworkCore.EntityState.Deleted); } } 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..dd7ed77a1d 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Messages; @@ -16,12 +16,12 @@ namespace SmartStore.Services.Messages public class CreateAttachmentsConsumer : IConsumer { private readonly PdfSettings _pdfSettings; - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequest _httpRequest; private readonly Lazy _fileDownloadManager; public CreateAttachmentsConsumer( PdfSettings pdfSettings, - HttpRequestBase httpRequest, + HttpRequest httpRequest, Lazy fileDownloadManager) { this._pdfSettings = pdfSettings; 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..933d25a175 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 System.Web; // Removed for .NET 8 migration 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..334f7ba744 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 System.Web; // Removed for .NET 8 migration 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..c094593a25 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 System.Web; // Removed for .NET 8 migration 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..ce3564db54 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 System.Web; // Removed for .NET 8 migration +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..fda59a0d5a 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Search; @@ -43,7 +43,7 @@ public class CatalogSearchQueryFactory : SearchQueryFactoryBase, ICatalogSearchQ protected readonly ICatalogSearchQueryAliasMapper _catalogSearchQueryAliasMapper; public CatalogSearchQueryFactory( - HttpContextBase httpContext, + HttpContext httpContext, CatalogSettings catalogSettings, SearchSettings searchSettings, ICommonServices services, diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs index 03026bf532..50869d3ae9 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/ICatalogSearchQueryFactory.cs @@ -3,7 +3,7 @@ public interface ICatalogSearchQueryFactory { /// - /// Creates a instance from the current + /// Creates a instance from the current /// by looking up corresponding keys in posted form and/or query string /// /// The query object diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs b/src/Libraries/SmartStore.Services/Search/Extensions/FacetUrlHelper.cs index 407dc43f9c..f9f5757b7b 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 System.Web; // Removed for .NET 8 migration using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Search; @@ -17,7 +17,7 @@ public class FacetUrlHelper private readonly ICatalogSearchQueryAliasMapper _catalogAliasMapper; private readonly IForumSearchQueryAliasMapper _forumAliasMapper; private readonly IWorkContext _workContext; - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequest _httpRequest; private readonly int _languageId; private readonly string _url; @@ -44,7 +44,7 @@ public FacetUrlHelper( ICatalogSearchQueryAliasMapper catalogAliasMapper, IForumSearchQueryAliasMapper forumAliasMapper, IWorkContext workContext, - HttpRequestBase httpRequest) + HttpRequest httpRequest) { _catalogAliasMapper = catalogAliasMapper; _forumAliasMapper = forumAliasMapper; 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..f2d22f4f6d 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Forums; @@ -35,7 +35,7 @@ public class ForumSearchQueryFactory : SearchQueryFactoryBase, IForumSearchQuery public ForumSearchQueryFactory( ICommonServices services, - HttpContextBase httpContext, + HttpContext httpContext, IForumSearchQueryAliasMapper forumSearchQueryAliasMapper, IGenericAttributeService genericAttributeService, ForumSearchSettings searchSettings, diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs index fc936ce5a6..144b1be497 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/IForumSearchQueryFactory.cs @@ -3,7 +3,7 @@ public interface IForumSearchQueryFactory { /// - /// Creates a instance from the current + /// Creates a instance from the current /// by looking up corresponding keys in posted form and/or query string /// /// The query object diff --git a/src/Libraries/SmartStore.Services/Search/SearchQueryFactoryBase.cs b/src/Libraries/SmartStore.Services/Search/SearchQueryFactoryBase.cs index 0fa710c25d..cb8c6aa79b 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 System.Web; // Removed for .NET 8 migration using SmartStore.Collections; using SmartStore.Utilities; @@ -7,11 +7,11 @@ namespace SmartStore.Services.Search { public abstract partial class SearchQueryFactoryBase { - protected readonly HttpContextBase _httpContext; + protected readonly HttpContext _httpContext; private Multimap _aliases; - protected SearchQueryFactoryBase(HttpContextBase httpContext) + protected SearchQueryFactoryBase(HttpContext httpContext) { _httpContext = httpContext; } 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..f1d93adddd 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Data; using SmartStore.Core.Domain.Security; using SmartStore.Core.Infrastructure; @@ -39,7 +39,7 @@ public InstallPermissionsStarter( public bool ThrowOnError => true; public int MaxAttempts => 1; - public void Start(HttpContextBase httpContext) + public void Start(HttpContext httpContext) { var removeUnusedPermissions = true; var providers = new List(); 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..0d2c6d6a4a 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 System.Web; // Removed for .NET 8 migration 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..6bd6aad2c1 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -1,845 +1,21 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {210541AD-F659-47DA-8763-16F36C5CD2F4} - Library - Properties + net8.0 SmartStore.Services SmartStore.Services - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true + enable + disable + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - latest - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - latest - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - latest - - - true - bin\PluginDev\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - latest - - - - ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\CronExpressionDescriptor.2.15.0\lib\netstandard2.0\CronExpressionDescriptor.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EPPlus.4.5.3.1\lib\net40\EPPlus.dll - - - ..\..\packages\ImageProcessor.2.8.0\lib\net452\ImageProcessor.dll - - - ..\..\packages\ImageProcessor.Plugins.WebP.1.3.0\lib\net452\ImageProcessor.Plugins.WebP.dll - - - ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll - - - ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll - - - ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll - True - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NReco.PdfGenerator.1.2.0\lib\net45\NReco.PdfGenerator.dll - - - ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - - - ..\..\packages\PreMailer.Net.2.0.1\lib\net45\PreMailer.Net.dll - - - - - - - - - - - - ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - ..\..\packages\UAParser.3.1.44\lib\net45\UAParser.dll - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Settings.settings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Reference.map - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - - - - - - Designer - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - Reference.map - - - MSDiscoCodeGenerator - Reference.cs - - + - - Dynamic - Web References\EuropeCheckVatService\ - https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl - - - - - Settings - SmartStore_Services_EuropeCheckVatService_checkVatService - + + + - + + + - - - MSBuild:UpdateDesignTimeXaml - - - - - - - - - - \ No newline at end of file + diff --git a/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/ITaskScheduler.cs index af80694d8c..b27e38386d 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Services.Stores; @@ -68,7 +68,7 @@ public interface ITaskScheduler public static class ITaskSchedulerExtensions { - internal static void SetBaseUrl(this ITaskScheduler scheduler, IStoreService storeService, HttpContextBase httpContext) + internal static void SetBaseUrl(this ITaskScheduler scheduler, IStoreService storeService, HttpContext httpContext) { string url = ""; diff --git a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs index c9990757c2..1ba0ce37be 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Core; +using Microsoft.EntityFrameworkCore.Core; 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/TaskExecutionContext.cs b/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs index 0c79140495..13372620ef 100644 --- a/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs +++ b/src/Libraries/SmartStore.Services/Tasks/TaskExecutionContext.cs @@ -98,7 +98,7 @@ public virtual void SetProgress(int? progress, string message, bool immediately try { var dbContext = _componentContext.Resolve(); - //dbContext.ChangeState(_originalTask, System.Data.Entity.EntityState.Modified); + //dbContext.ChangeState(_originalTask, Microsoft.EntityFrameworkCore.EntityState.Modified); dbContext.SaveChanges(); } catch { } 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..713a7d6ec3 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Events; using SmartStore.Core.Infrastructure; using SmartStore.Core.Logging; @@ -35,7 +35,7 @@ public TaskSchedulerStarter( public int MaxAttempts => 10; public bool ThrowOnError => false; - public void Start(HttpContextBase httpContext) + public void Start(HttpContext httpContext) { var tasks = _taskService.GetAllTasks(true); _taskService.CalculateFutureSchedules(tasks, true /* isAppStart */); 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..c54b7a65ed 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 System.Web; // Removed for .NET 8 migration using System.IO; namespace SmartStore.Services.Themes @@ -26,7 +26,7 @@ public class ThemeVariablesService : IThemeVariablesService private readonly IRequestCache _requestCache; private readonly IEventPublisher _eventPublisher; private readonly Lazy _themeFileResolver; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; public ThemeVariablesService( IRepository rsVariables, @@ -34,7 +34,7 @@ public ThemeVariablesService( IRequestCache requestCache, IEventPublisher eventPublisher, Lazy themeFileResolver, - HttpContextBase httpContext) + HttpContext httpContext) { _rsVariables = rsVariables; _themeRegistry = themeRegistry; diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs index f3f9e19667..63d2c1f8cb 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Services; using SmartStore.Core.Html; using SmartStore.Core.Logging; @@ -14,13 +14,13 @@ namespace SmartStore.AmazonPay.Controllers { public class AmazonPayCheckoutController : AmazonPayControllerBase { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IAmazonPayService _apiService; private readonly IGenericAttributeService _genericAttributeService; private readonly IOrderProcessingService _orderProcessingService; public AmazonPayCheckoutController( - HttpContextBase httpContext, + HttpContext httpContext, IAmazonPayService apiService, IGenericAttributeService genericAttributeService, IOrderProcessingService orderProcessingService) diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs index 014492316e..611d4f6a73 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Models; using SmartStore.AmazonPay.Services; using SmartStore.ComponentModel; @@ -21,14 +21,14 @@ namespace SmartStore.AmazonPay.Controllers { public class AmazonPayController : PaymentControllerBase { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IAmazonPayService _apiService; private readonly Lazy _scheduleTaskService; private readonly Lazy _openAuthenticationService; private readonly Lazy _externalAuthenticationSettings; public AmazonPayController( - HttpContextBase httpContext, + HttpContext httpContext, IAmazonPayService apiService, Lazy scheduleTaskService, Lazy openAuthenticationService, 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..5aa7660e50 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using AmazonPay; using AmazonPay.Responses; using AmazonPay.StandardPaymentRequests; @@ -40,7 +40,7 @@ namespace SmartStore.AmazonPay.Services { public partial class AmazonPayService : IAmazonPayService { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IRepository _orderRepository; private readonly ICommonServices _services; private readonly IPaymentService _paymentService; @@ -61,7 +61,7 @@ public partial class AmazonPayService : IAmazonPayService private readonly CompanyInformationSettings _companyInformationSettings; public AmazonPayService( - HttpContextBase httpContext, + HttpContext httpContext, IRepository orderRepository, ICommonServices services, IPaymentService paymentService, @@ -1417,7 +1417,7 @@ public VoidPaymentResult Void(VoidPaymentRequest request) return result; } - public void ProcessIpn(HttpRequestBase request) + public void ProcessIpn(HttpRequest request) { string json = null; try diff --git a/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs b/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs index 05e0589571..4042bded9f 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; @@ -39,7 +39,7 @@ bool SetOrderReferenceDetails( VoidPaymentResult Void(VoidPaymentRequest request); - void ProcessIpn(HttpRequestBase request); + void ProcessIpn(HttpRequest request); void StartDataPolling(); diff --git a/src/Plugins/SmartStore.AmazonPay/Services/Internal/AmazonPayExtensions.cs b/src/Plugins/SmartStore.AmazonPay/Services/Internal/AmazonPayExtensions.cs index 0956b119b8..5e35d2cfff 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 System.Web; // Removed for .NET 8 migration using SmartStore.AmazonPay.Services; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; @@ -86,7 +86,7 @@ internal static string ToAmazonLanguageCode(this string twoLetterLanguageCode, c } } - internal static bool HasAmazonPayState(this HttpContextBase httpContext) + internal static bool HasAmazonPayState(this HttpContext httpContext) { var checkoutState = httpContext.GetCheckoutState(); var checkoutStateKey = AmazonPayPlugin.SystemName + ".CheckoutState"; @@ -101,7 +101,7 @@ internal static bool HasAmazonPayState(this HttpContextBase httpContext) return false; } - internal static AmazonPayCheckoutState GetAmazonPayState(this HttpContextBase httpContext, ILocalizationService localizationService) + internal static AmazonPayCheckoutState GetAmazonPayState(this HttpContext httpContext, ILocalizationService localizationService) { var checkoutState = httpContext.GetCheckoutState(); diff --git a/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs b/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs index dc02828931..bfd16846fe 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Services.Cms; using SmartStore.Web.Models.ShoppingCart; @@ -12,9 +12,9 @@ namespace SmartStore.AmazonPay.Widgets [FriendlyName("Amazon Pay")] public class AmazonPayWidget : IWidget { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; - public AmazonPayWidget(HttpContextBase httpContext) + public AmazonPayWidget(HttpContext httpContext) { _httpContext = httpContext; } 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..de787aff5d 100644 --- a/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs +++ b/src/Plugins/SmartStore.DevTools/DependencyRegistrar.cs @@ -1,4 +1,4 @@ -using System.Web; +// using System.Web; // Removed for .NET 8 migration using Autofac; using Autofac.Integration.Mvc; using SmartStore.Core.Data; @@ -20,7 +20,7 @@ public virtual void Register(ContainerBuilder builder, ITypeFinder typeFinder, b { builder.Register(c => { - var ctx = c.Resolve(); + var ctx = c.Resolve(); if (ProfilerHttpModule.MiniProfilerStarted(ctx.ApplicationInstance)) { 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..e063e1ab00 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Services; using SmartStore.Services.Common; using SmartStore.Services.Customers; @@ -102,7 +102,7 @@ public void OnResultExecuted(ResultExecutedContext filterContext) _services.Chronometer.StepStop("ActionFilter"); } - private bool ShouldProfile(HttpContextBase ctx) + private bool ShouldProfile(HttpContext ctx) { if (_mobileDeviceHelper.Value.IsMobileDevice()) return false; 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..b5ef6f6133 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Caching; using SmartStore.Services; using SmartStore.Services.Customers; @@ -97,7 +97,7 @@ public void OnResultExecuted(ResultExecutedContext filterContext) { } - private bool ShouldRender(HttpContextBase ctx) + private bool ShouldRender(HttpContext ctx) { if (!_services.WorkContext.CurrentCustomer.IsAdmin()) { diff --git a/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs b/src/Plugins/SmartStore.DevTools/ProfilerHttpModule.cs index 9cb991484f..0f52023c0c 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 System.Web; // Removed for .NET 8 migration 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..593b79becc 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -1,357 +1,20 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {542B9C12-E2A1-49BB-9134-0E3484F9D669} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.DevTools SmartStore.DevTools - v4.7.2 - 512 - - ..\..\ - true - true - - - 4.0 - true - - - - - - - - - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.DevTools\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.DevTools\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset + enable + disable + false + - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - False - - - ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - ..\..\packages\MiniProfiler.4.2.1\lib\net461\MiniProfiler.dll - True - - - ..\..\packages\MiniProfiler.EF6.4.2.1\lib\net461\MiniProfiler.EF6.dll - True - - - ..\..\packages\MiniProfiler.Shared.4.2.1\lib\net461\MiniProfiler.Shared.dll - True - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - False - - - - - - ..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll - False - - - ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - False - - - - ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - False - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - + + + + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - - - {4f1f649c-1020-45be-a487-f416d9297ff3} - SmartStore.Web - False - - - - - PreserveNewest - - - - - - Designer - Always - - - Designer - Always - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - bin\ - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - 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}". - - - - - - - - - - False - True - 63704 - / - http://localhost:52742/ - False - True - http://www.smartstore.net - False - - - - - - del "$(TargetDir)MiniProfiler.pdb" /q /s -del "$(TargetDir)MiniProfiler.EntityFramework6.pdb" /q /s - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs index 398f771ff5..855a7d8340 100644 --- a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs +++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs @@ -6,8 +6,8 @@ using System.Linq; using System.Net; using System.Text; -using System.Web; -using System.Web.Script.Serialization; +// using System.Web; // Removed for .NET 8 migration +// using System.Web.Script.Serialization; // Removed for .NET 8 migration using DotNetOpenAuth.AspNet; using DotNetOpenAuth.AspNet.Clients; using Newtonsoft.Json; @@ -79,18 +79,18 @@ public FacebookOAuth2Client(string appId, string appSecret, params string[] requ _requestedScopes = requestedScopes; } - public override void RequestAuthentication(HttpContextBase context, Uri returnUrl) + public override void RequestAuthentication(HttpContext context, Uri returnUrl) { string redirectUrl = this.GetServiceLoginUrl(returnUrl).AbsoluteUri; context.Response.Redirect(redirectUrl, endResponse: true); } - public new AuthenticationResult VerifyAuthentication(HttpContextBase context) + public new AuthenticationResult VerifyAuthentication(HttpContext context) { throw new NoNullAllowedException(); } - public override AuthenticationResult VerifyAuthentication(HttpContextBase context, Uri returnPageUrl) + public override AuthenticationResult VerifyAuthentication(HttpContext context, Uri returnPageUrl) { string code = context.Request.QueryString["code"]; if (string.IsNullOrEmpty(code)) diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs index 41594bc23e..42b8e9f7fe 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using DotNetOpenAuth.AspNet; using Newtonsoft.Json.Linq; using SmartStore.Core.Domain.Customers; @@ -24,7 +24,7 @@ public class FacebookProviderAuthorizer : IOAuthProviderFacebookAuthorizer private readonly IExternalAuthorizer _authorizer; private readonly IOpenAuthenticationService _openAuthenticationService; private readonly ExternalAuthenticationSettings _externalAuthenticationSettings; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly ICommonServices _services; private FacebookOAuth2Client _facebookApplication; @@ -36,7 +36,7 @@ public class FacebookProviderAuthorizer : IOAuthProviderFacebookAuthorizer public FacebookProviderAuthorizer(IExternalAuthorizer authorizer, IOpenAuthenticationService openAuthenticationService, ExternalAuthenticationSettings externalAuthenticationSettings, - HttpContextBase httpContext, + HttpContext httpContext, ICommonServices services) { _authorizer = authorizer; 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..d2dc5d9c99 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.ModelConfiguration; using SmartStore.GoogleMerchantCenter.Domain; namespace SmartStore.GoogleMerchantCenter.Data diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.Designer.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.Designer.cs index ea2edf43b3..4b8cac0b4e 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.Designer.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.0.2-21211")] diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.cs index 7365f0641d..38acf9642d 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201403112356126_Initial.cs @@ -1,6 +1,6 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Initial : DbMigration { diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.Designer.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.Designer.cs index da776c17b4..c65302b7cd 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.Designer.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")] diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.cs index ca926c3bbb..720506bce2 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201408020941244_IsTouched.cs @@ -1,7 +1,7 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class IsTouched : DbMigration { diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.Designer.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.Designer.cs index 981e039008..f269442e3a 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.Designer.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")] diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.cs index 9e998ea211..8294b13d8c 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201504211854125_IsActive.cs @@ -1,6 +1,6 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class IsActive : DbMigration { diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.Designer.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.Designer.cs index 652bba012c..b81b8eeb13 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.Designer.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.cs index 3624eee2bc..a83c0917c3 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201601061649324_IsBundle.cs @@ -1,6 +1,6 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class IsBundle : DbMigration { diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.Designer.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.Designer.cs index 251c767acc..26217e3708 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.Designer.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.cs index 063459188e..4d45c1714c 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/201705250945238_Indexes.cs @@ -1,6 +1,6 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Indexes : DbMigration { diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/Configuration.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/Configuration.cs index fcb9afab52..cbac07f63a 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/Configuration.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/Migrations/Configuration.cs @@ -1,6 +1,6 @@ namespace SmartStore.GoogleMerchantCenter.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; internal sealed class Configuration : DbMigrationsConfiguration { 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..2bf686cfe4 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.EntityFrameworkCore.Migrations; +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..fdda3c0c2f 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using Autofac; using FluentValidation; using FluentValidation.Results; @@ -21,11 +21,11 @@ namespace SmartStore.OfflinePayment.Controllers public class OfflinePaymentController : PaymentControllerBase { private readonly IComponentContext _ctx; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IMediaService _mediaService; public OfflinePaymentController( - HttpContextBase httpContext, + HttpContext httpContext, IComponentContext ctx, IMediaService mediaService) { 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 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 ExpireMonths { get; set; } public IList 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..f77b9776d5 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -1,271 +1,20 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {692E9D31-1393-47BF-B372-63F671052F89} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.OfflinePayment SmartStore.OfflinePayment - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - + enable + disable + false - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - + + + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + - - - Always - - - PreserveNewest - - - Designer - Always - - - Designer - Always - - - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51143 - / - http://localhost:56865/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs index b1722773e2..ee7ab2aff4 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 System.Web; // Removed for .NET 8 migration +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..b1d9efc396 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Payments; using SmartStore.PayPal.Models; using SmartStore.PayPal.Settings; @@ -16,14 +16,14 @@ namespace SmartStore.PayPal.Controllers { public class PayPalDirectController : PayPalControllerBase { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; public PayPalDirectController( IPaymentService paymentService, IOrderService orderService, IOrderProcessingService orderProcessingService, PaymentSettings paymentSettings, - HttpContextBase httpContext) : base( + HttpContext httpContext) : base( paymentService, orderService, orderProcessingService) 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..27687d77d8 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Common; @@ -29,7 +29,7 @@ namespace SmartStore.PayPal.Controllers { public class PayPalInstalmentsController : PayPalRestApiControllerBase { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly IGenericAttributeService _genericAttributeService; private readonly IOrderService _orderService; private readonly ICurrencyService _currencyService; @@ -38,7 +38,7 @@ public class PayPalInstalmentsController : PayPalRestApiControllerBase _pluginFinder; public PayPalInstalmentsController( - HttpContextBase httpContext, + HttpContext httpContext, IPayPalService payPalService, IGenericAttributeService genericAttributeService, IOrderService orderService, diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs index 9da0dd3d08..36cc945eae 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Customers; @@ -33,7 +33,7 @@ namespace SmartStore.PayPal.Controllers { public class PayPalPlusController : PayPalRestApiControllerBase { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly PluginMediator _pluginMediator; private readonly IGenericAttributeService _genericAttributeService; private readonly IPaymentService _paymentService; @@ -42,7 +42,7 @@ public class PayPalPlusController : PayPalRestApiControllerBase _orderService; private readonly Lazy _genericAttributeService; private readonly Lazy _currencyService; @@ -43,7 +43,7 @@ public class InstalmentsMessageZoneEventConsumer : IConsumer public InstalmentsMessageZoneEventConsumer( ICommonServices services, - HttpContextBase httpContext, + HttpContext httpContext, Lazy orderService, Lazy genericAttributeService, Lazy currencyService, diff --git a/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs index a6b2b77ccb..0e7ebf9c69 100644 --- a/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.PayPal/Extensions/MiscExtensions.cs @@ -16,7 +16,7 @@ public static string GetPayPalUrl(this PayPalSettingsBase settings) "https://www.paypal.com/cgi-bin/webscr"; } - public static PayPalSessionData GetPayPalState(this HttpContextBase httpContext, string providerSystemName) + public static PayPalSessionData GetPayPalState(this HttpContext httpContext, string providerSystemName) { Guard.NotEmpty(providerSystemName, nameof(providerSystemName)); @@ -32,7 +32,7 @@ public static PayPalSessionData GetPayPalState(this HttpContextBase httpContext, } public static PayPalSessionData GetPayPalState( - this HttpContextBase httpContext, + this HttpContext httpContext, string providerSystemName, Customer customer, int storeId, diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs index ff494de305..747d90f6ee 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Customers; using SmartStore.Services; using SmartStore.Services.Common; @@ -15,12 +15,12 @@ public class PayPalExpressCheckoutFilter : IActionFilter private static readonly string[] s_interceptableActions = new string[] { "PaymentMethod" }; private readonly IGenericAttributeService _genericAttributeService; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly ICommonServices _services; public PayPalExpressCheckoutFilter( IGenericAttributeService genericAttributeService, - HttpContextBase httpContext, + HttpContext httpContext, ICommonServices services) { _genericAttributeService = genericAttributeService; 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 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 ExpireMonths { get; set; } public IList 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..5a0976eebf 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; @@ -39,7 +39,7 @@ public partial class PayPalExpressProvider : PayPalProviderBase { 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/Plugin.cs b/src/Plugins/SmartStore.Shipping/Plugin.cs index d8854a88c2..374aaee6e4 100644 --- a/src/Plugins/SmartStore.Shipping/Plugin.cs +++ b/src/Plugins/SmartStore.Shipping/Plugin.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Logging; using SmartStore.Core.Plugins; using SmartStore.Services.Configuration; 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..2feff0cc06 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -1,275 +1,20 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {ACC1E122-B2C8-4441-BDED-D4A77763331A} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Shipping SmartStore.Shipping - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - + enable + disable + false - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ - TRACE - prompt - 4 - false - - - true - ..\..\Presentation\SmartStore.Web\bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - 201403072202413_Initial.cs - - - - - - - - - - - - - - - + + + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + - - - 201403072202413_Initial.cs - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - Designer - PreserveNewest - - - Designer - PreserveNewest - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51377 - / - http://localhost:53076/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs b/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs index 3012800f78..8926af9fa8 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.EntityFrameworkCore.Migrations; +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/Migrations/201403080200108_Initial.Designer.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.Designer.cs index d06c8e7abc..0fa46e5aaf 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.Designer.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.0.2-21211")] diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.cs index a1243f93a2..305b0a9617 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201403080200108_Initial.cs @@ -1,6 +1,6 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Initial : DbMigration { diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.Designer.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.Designer.cs index 521e42a576..e78c08bc39 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.Designer.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")] diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.cs index 5fa2db2934..5a3a9598c4 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201406041606037_SmallQuantitySurcharge.cs @@ -1,6 +1,6 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data; using SmartStore.Data.Setup; diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.Designer.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.Designer.cs index f921102152..5eb4caa4b8 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.Designer.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")] diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.cs index 7fdcef34d8..d39f81e0c4 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/201506290747117_ZipCode.cs @@ -1,6 +1,6 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ZipCode : DbMigration { diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/Configuration.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/Configuration.cs index 0d5a526f97..a86d248c80 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/Configuration.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/Migrations/Configuration.cs @@ -1,6 +1,6 @@ namespace SmartStore.ShippingByWeight.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; internal sealed class Configuration : DbMigrationsConfiguration { 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..2c64ce7d09 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.ModelConfiguration; 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/Migrations/201403112350417_Initial.Designer.cs b/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.Designer.cs index 491f03d88d..d4e6e017c1 100644 --- a/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.Designer.cs +++ b/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Tax.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.0.2-21211")] diff --git a/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.cs b/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.cs index 09fac97d78..49a239bb15 100644 --- a/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.cs +++ b/src/Plugins/SmartStore.Tax/Data/Migrations/201403112350417_Initial.cs @@ -1,6 +1,6 @@ namespace SmartStore.Tax.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Initial : DbMigration { diff --git a/src/Plugins/SmartStore.Tax/Data/Migrations/Configuration.cs b/src/Plugins/SmartStore.Tax/Data/Migrations/Configuration.cs index 535dca9af3..88a0de5b2c 100644 --- a/src/Plugins/SmartStore.Tax/Data/Migrations/Configuration.cs +++ b/src/Plugins/SmartStore.Tax/Data/Migrations/Configuration.cs @@ -1,6 +1,6 @@ namespace SmartStore.Tax.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; internal sealed class Configuration : DbMigrationsConfiguration { diff --git a/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs b/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs index f145987d0f..2067819778 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.ModelConfiguration; 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/Plugin.cs b/src/Plugins/SmartStore.Tax/Plugin.cs index ef50cdce2a..ac32318804 100644 --- a/src/Plugins/SmartStore.Tax/Plugin.cs +++ b/src/Plugins/SmartStore.Tax/Plugin.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Plugins; using SmartStore.Services; using SmartStore.Tax.Data.Migrations; 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..6353c55b2a 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -1,277 +1,20 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {94D1BEEB-64A3-4EB6-9017-D66AFAF4F2B2} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Tax SmartStore.Tax - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - + enable + disable + false - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ - TRACE - prompt - 4 - false - - - true - ..\..\Presentation\SmartStore.Web\bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - 201403112350417_Initial.cs - - - - - - - - - - - - - - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - - + - - PreserveNewest - - - Designer - Always - - - Designer - Always - + + + + - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + - - - 201403112350417_Initial.cs - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51143 - / - http://localhost:56865/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + 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..1ace9878c6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index 97aec40b54..85f33922db 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Data; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Domain.Customers; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index 4271b1f00a..5413f7ee02 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Security; using SmartStore.Services.Blogs; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index 8a8ced7e0f..6e6decca25 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 3740544c0f..1bf5195c72 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index bee90353c4..f70665b7a0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index 42da3db029..b9ce03f946 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; using SmartStore.Services.Customers; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index 247c78e490..4262362e86 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,7 +1,7 @@ using System.Net; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; using SmartStore.Services.Customers; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 3d36a43a54..9c7ae3b06e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; using SmartStore.Services.Common; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index 2fd99d7da9..f1728d3518 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index dcbadc3a51..9437dd91d7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; using SmartStore.Services.Discounts; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index 57718455cb..9ee0ce3181 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; using SmartStore.Services.Media; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index 1dd34341da..9c2d2a77e9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Common; using SmartStore.Services.Common; using SmartStore.Web.Framework.WebApi.OData; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index 0c4a0b3149..89e7d23475 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Localization; using SmartStore.Core.Security; using SmartStore.Services.Localization; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index e895b018ef..3cf6f59328 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Localization; using SmartStore.Services.Localization; using SmartStore.Web.Framework.WebApi.OData; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index 64f4e274c0..fafdbdcdcf 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index 0554a6d8aa..d2d94110b3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index 463a664274..05edec7a4f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs index 3194927122..02fd76f3a0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs @@ -6,8 +6,8 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.ComponentModel; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs index 006634321c..3ebe67b56f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Net; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Collections; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index d412456cb4..cc30e528b7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Messages; using SmartStore.Core.Security; using SmartStore.Services.Messages; 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..52f0efc065 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 27f26cd4af..22ead9e7b7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,7 +1,7 @@ using System.Net; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Payments; using SmartStore.Core.Security; using SmartStore.Services.Payments; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index 30a632b403..0d197f0d6b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 73357da55e..130fe46492 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index 3b0d397166..ba374bd26a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index 7222c931e6..0213f43bf3 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index f21fdbe8b2..690e0cb599 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index 674c5f82bc..38e7f2baa0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index 4f318e3abb..098d20079a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 48aa52f74e..dfe2f9deb6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 0f923bb726..0f4e9a8a80 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index f95e6c1332..c2f8d03d40 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index 9e41d3eb35..c703641516 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 03eea6136d..17db64980f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Http; -using System.Web.Http.ModelBinding; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Http.ModelBinding; // Removed for .NET 8 migration +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Search; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index c381d0da4d..2ebc201a2f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index 7b9125bf41..60def57fb5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; 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..5ef930abc4 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Security; using SmartStore.Services.Configuration; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index ad59cbfe48..d0cbf72930 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Shipping; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index 1c3e24941e..c1f6621820 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Shipping; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index 6395a7e891..f2a206ee02 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; using SmartStore.Services.Shipping; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 6d59fea159..7276ee83e0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index 91d59be2b3..911a726bf4 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index 3801ab926f..bf59d9b487 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index af3078d3b8..a887e0641a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Stores; using SmartStore.Services.Stores; using SmartStore.Web.Framework.WebApi.OData; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index bd6e188a73..9b1858b9e8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Stores; using SmartStore.Core.Security; using SmartStore.Services.Stores; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index 887b6ee2c6..e4c52634aa 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.DataExchange; using SmartStore.Services.DataExchange; using SmartStore.Web.Framework.WebApi.OData; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index 90079f3462..19dff12e50 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Tax; using SmartStore.Core.Security; using SmartStore.Services.Tax; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index 7cfecd460b..5ef7a172ec 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using System.Web.Http; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Services.Catalog; 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..b7930d4c3d 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -1,8 +1,8 @@ using System.Net.Http; using System.Text; -using System.Web.Mvc; -using System.Web.OData; -using System.Web.OData.Builder; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration +// using System.Web.OData.Builder; // Removed for .NET 8 migration using SmartStore.Core.Infrastructure; using SmartStore.Services.Localization; using SmartStore.Utilities; 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/Models/OData/Media/FileItemInfo.cs b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs index 19c90d3c64..2d9bd6fada 100644 --- a/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs +++ b/src/Plugins/SmartStore.WebApi/Models/OData/Media/FileItemInfo.cs @@ -1,5 +1,5 @@ using System.Runtime.Serialization; -using System.Web.OData.Builder; +// using System.Web.OData.Builder; // Removed for .NET 8 migration using SmartStore.Core.Domain.Media; namespace SmartStore.WebApi.Models.OData.Media 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..77984a2a04 100644 --- a/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs +++ b/src/Plugins/SmartStore.WebApi/Services/CustomRoutingConvention.cs @@ -1,8 +1,8 @@ using System.Linq; using System.Net.Http; -using System.Web.Http.Controllers; -using System.Web.OData.Routing; -using System.Web.OData.Routing.Conventions; +// using System.Web.Http.Controllers; // Removed for .NET 8 migration +// using System.Web.OData.Routing; // Removed for .NET 8 migration +// using System.Web.OData.Routing.Conventions; // Removed for .NET 8 migration using SmartStore.Utilities; using SmartStore.Web.Framework.WebApi; diff --git a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerDefaultValueFilter.cs b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerDefaultValueFilter.cs index 7275f80f86..cf31fc58d0 100644 --- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerDefaultValueFilter.cs +++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerDefaultValueFilter.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Http.Description; +// using System.Web.Http.Description; // Removed for .NET 8 migration using Swashbuckle.Swagger; namespace SmartStore.WebApi.Services.Swagger diff --git a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs index 4abef43f37..2faefc3e89 100644 --- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs +++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Web.Http; -using System.Web.Http.Description; -using System.Web.OData; -using System.Web.OData.Routing; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Http.Description; // Removed for .NET 8 migration +// using System.Web.OData; // Removed for .NET 8 migration +// using System.Web.OData.Routing; // Removed for .NET 8 migration using Swashbuckle.Swagger; namespace SmartStore.WebApi.Services.Swagger diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs index 8a3c155430..4f3f5fc886 100644 --- a/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs +++ b/src/Plugins/SmartStore.WebApi/Services/WebApiCatalogSearchQueryModelBinder.cs @@ -1,7 +1,7 @@ using System; using System.Net.Http; -using System.Web.Http.Controllers; -using System.Web.Http.ModelBinding; +// using System.Web.Http.Controllers; // Removed for .NET 8 migration +// using System.Web.Http.ModelBinding; // Removed for .NET 8 migration using SmartStore.Services.Search; using SmartStore.Services.Search.Modelling; using SmartStore.Web.Framework.WebApi.Caching; diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs index 136ac34e0e..33222d959f 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 System.Web; // Removed for .NET 8 migration +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..dba0c6c1f8 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 System.Web.Mvc.Html; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Html; // Removed for .NET 8 migration +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..8f0805d1ad 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 System.Web; // Removed for .NET 8 migration +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..bcf12cfce8 100644 --- a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs +++ b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs @@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using System.Web; -using System.Web.Hosting; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; using Autofac; using Autofac.Builder; using Autofac.Core; @@ -697,7 +697,7 @@ protected override void Load(ContainerBuilder builder) var foundAssemblies = _typeFinder.GetAssemblies(ignoreInactivePlugins: true).ToArray(); builder.RegisterModule(new AutofacWebTypesModule()); - builder.Register(HttpContextBaseFactory).As(); + builder.Register(HttpContextFactory).As(); // register all controllers builder.RegisterControllers(foundAssemblies); @@ -732,7 +732,7 @@ protected override void Load(ContainerBuilder builder) } } - static HttpContextBase HttpContextBaseFactory(IComponentContext ctx) + static HttpContext HttpContextFactory(IComponentContext ctx) { if (IsRequestValid()) { 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..a5195fc0c9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -6,11 +6,11 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading; -using System.Web; -using System.Web.Mvc; -using System.Web.Mvc.Html; -using System.Web.Routing; -using System.Web.WebPages; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Html; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..b929980180 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Utilities; namespace SmartStore.Web.Framework @@ -36,7 +36,7 @@ public static IDisposable BeginHtmlFieldPrefixScope(this HtmlHelper html, string return new HtmlFieldPrefixScope(html.ViewData.TemplateInfo, htmlFieldPrefix); } - private static Queue GetIdsToReuse(HttpContextBase httpContext, string collectionName) + private static Queue GetIdsToReuse(HttpContext httpContext, string collectionName) { // We need to use the same sequence of IDs following a server-side validation failure, // otherwise the framework won't render the validation error messages next to each item. 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..c1c4eba9f9 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 System.Web; // Removed for .NET 8 migration +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..557ab8b6f2 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Infrastructure; using SmartStore.Services.Orders; @@ -23,7 +23,7 @@ public static bool IsAdminArea(this HttpRequest request) return false; } - public static bool IsAdminArea(this HttpRequestBase request) + public static bool IsAdminArea(this HttpRequest request) { try { @@ -55,7 +55,7 @@ public static bool IsPublicArea(this HttpRequest request) return false; } - public static bool IsPublicArea(this HttpRequestBase request) + public static bool IsPublicArea(this HttpRequest request) { try { @@ -69,7 +69,7 @@ public static bool IsPublicArea(this HttpRequestBase request) } } - public static PostedFileResult ToPostedFileResult(this HttpRequestBase httpRequest) + public static PostedFileResult ToPostedFileResult(this HttpRequest httpRequest) { if (httpRequest != null && httpRequest.Files.Count > 0) { @@ -128,7 +128,7 @@ public static IEnumerable ToPostedFileResults(this HttpFileCol } } - public static RouteData GetRouteData(this HttpContextBase httpContext) + public static RouteData GetRouteData(this HttpContext httpContext) { Guard.NotNull(httpContext, nameof(httpContext)); @@ -140,13 +140,13 @@ public static RouteData GetRouteData(this HttpContextBase httpContext) return null; } - public static bool TryGetRouteData(this HttpContextBase httpContext, out RouteData routeData) + public static bool TryGetRouteData(this HttpContext httpContext, out RouteData routeData) { routeData = httpContext.GetRouteData(); return routeData != null; } - public static CheckoutState GetCheckoutState(this HttpContextBase httpContext) + public static CheckoutState GetCheckoutState(this HttpContext httpContext) { Guard.NotNull(httpContext, nameof(httpContext)); @@ -161,14 +161,14 @@ public static CheckoutState GetCheckoutState(this HttpContextBase httpContext) return state; } - public static void RemoveCheckoutState(this HttpContextBase httpContext) + public static void RemoveCheckoutState(this HttpContext httpContext) { Guard.NotNull(httpContext, nameof(httpContext)); httpContext.Session.SafeRemove(CheckoutState.CheckoutStateSessionKey); } - internal static string GetUserThemeChoiceFromCookie(this HttpContextBase context) + internal static string GetUserThemeChoiceFromCookie(this HttpContext context) { if (context == null) return null; @@ -182,7 +182,7 @@ internal static string GetUserThemeChoiceFromCookie(this HttpContextBase context return null; } - internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, string value) + internal static void SetUserThemeChoiceInCookie(this HttpContext context, string value) { if (context?.Request == null) { @@ -206,7 +206,7 @@ internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, st context.Request.Cookies.Set(cookie); } - internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bool createIfMissing) + internal static HttpCookie GetPreviewModeCookie(this HttpContext context, bool createIfMissing) { var httpRequest = context.SafeGetHttpRequest(); var cookie = httpRequest?.Cookies?.Get("sm.PreviewModeOverrides"); @@ -233,7 +233,7 @@ internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bo return cookie; } - internal static void SetPreviewModeValue(this HttpContextBase context, string key, string value) + internal static void SetPreviewModeValue(this HttpContext context, string key, string value) { if (context == null) return; @@ -252,7 +252,7 @@ internal static void SetPreviewModeValue(this HttpContextBase context, string ke } } - public static IDisposable PreviewModeCookie(this HttpContextBase context) + public static IDisposable PreviewModeCookie(this HttpContext context) { var disposable = new ActionDisposable(() => { @@ -275,7 +275,7 @@ public static IDisposable PreviewModeCookie(this HttpContextBase context) return disposable; } - public static string GetContentUrl(this HttpContextBase context, string path) + public static string GetContentUrl(this HttpContext context, string path) { if (path.HasValue()) { diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpSessionStateExtensions.cs index 2f77e252da..fe4c8ad61c 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 System.Web; // Removed for .NET 8 migration namespace SmartStore { diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/PostedFileResult.cs index cf55ba8490..683f2bb34d 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 System.Web; // Removed for .NET 8 migration 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..d1f8fa53b0 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 System.Web; // Removed for .NET 8 migration +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..4a3adaaa41 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 System.Web; // Removed for .NET 8 migration +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..38b727fb5f 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Data; using SmartStore.Core.Security; @@ -29,7 +29,7 @@ public virtual void OnAuthorization(AuthorizationContext filterContext) if (filterContext == null || filterContext.HttpContext == null) return; - HttpRequestBase request = filterContext.HttpContext.Request; + HttpRequest request = filterContext.HttpContext.Request; if (request == null) return; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs index 3b7905ca67..12c5060a06 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 System.Web; // Removed for .NET 8 migration namespace SmartStore.Web.Framework.Filters { @@ -15,7 +15,7 @@ namespace SmartStore.Web.Framework.Filters /// public class ResponseFilterStream : Stream { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; /// /// The original stream @@ -44,7 +44,7 @@ public class ResponseFilterStream : Stream /// /// Original inner stream /// Initial capacity of the capture stream - public ResponseFilterStream(Stream innerStream, HttpContextBase httpContext, int capacity = 5000) + public ResponseFilterStream(Stream innerStream, HttpContext httpContext, int capacity = 5000) { Guard.NotNull(innerStream, nameof(innerStream)); Guard.NotNull(httpContext, nameof(httpContext)); diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs index 43cbd1dce2..31a0ea0bc2 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain; @@ -31,7 +31,7 @@ public virtual void OnAuthorization(AuthorizationContext filterContext) if (filterContext == null || filterContext.HttpContext == null) return; - HttpRequestBase request = filterContext.HttpContext.Request; + HttpRequest request = filterContext.HttpContext.Request; if (request == null) return; 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..45387ff011 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 System.Web; // Removed for .NET 8 migration 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..d6e665f618 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 System.Web.ModelBinding; // Removed for .NET 8 migration 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..5be0921a62 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Infrastructure; @@ -82,7 +82,7 @@ public LocalizedRoute(string url, RouteValueDictionary defaults, RouteValueDicti /// /// An object that contains the values from the route definition. /// - public override RouteData GetRouteData(HttpContextBase httpContext) + public override RouteData GetRouteData(HttpContext httpContext) { if (DataSettings.DatabaseIsInstalled() && SeoFriendlyUrlsForLanguagesEnabled) { 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..6081a288db 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.IO; using SmartStore.Utilities; @@ -193,7 +193,7 @@ public override void ExecuteResult(ControllerContext context) OnExecuted?.Invoke(); } - private FileResponder ResolveResponder(HttpRequestBase request) + private FileResponder ResolveResponder(HttpRequest request) { // Is this a HEAD request if (request.HttpMethod == "HEAD") @@ -219,7 +219,7 @@ private FileResponder ResolveResponder(HttpRequestBase request) return new FullFileResponder(this); } - private static string GenerateETag(HttpContextBase context, DateTime lastModified, DateTime now) + private static string GenerateETag(HttpContext context, DateTime lastModified, DateTime now) { // Get 64-bit FILETIME stamp var lastModFileTime = lastModified.ToFileTime(); diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs index bbf053767c..9529b9c70c 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 System.Web; // Removed for .NET 8 migration namespace SmartStore.Web.Framework.Modelling { @@ -16,7 +16,7 @@ protected FileResponder(IFileResponse fileResponse) protected IFileResponse FileResponse { get; private set; } - public virtual bool TrySendHeaders(HttpContextBase context) + public virtual bool TrySendHeaders(HttpContext context) { var response = context.Response; @@ -42,7 +42,7 @@ public virtual bool TrySendHeaders(HttpContextBase context) return true; } - public abstract void SendFile(HttpContextBase context); + public abstract void SendFile(HttpContext context); } @@ -53,7 +53,7 @@ public HeadFileResponder(IFileResponse fileResponse) { } - public override bool TrySendHeaders(HttpContextBase context) + public override bool TrySendHeaders(HttpContext context) { var response = context.Response; @@ -73,7 +73,7 @@ public override bool TrySendHeaders(HttpContextBase context) return true; } - public override void SendFile(HttpContextBase context) + public override void SendFile(HttpContext context) { // Don't send any file. } @@ -87,7 +87,7 @@ public UnmodifiedFileResponder(IFileResponse fileResponse) { } - public override bool TrySendHeaders(HttpContextBase context) + public override bool TrySendHeaders(HttpContext context) { var response = context.Response; @@ -103,7 +103,7 @@ public override bool TrySendHeaders(HttpContextBase context) return true; } - public override void SendFile(HttpContextBase context) + public override void SendFile(HttpContext context) { // Don't send file, it is unmodified. Let browser fetch from its cache. } @@ -118,7 +118,7 @@ public FullFileResponder(IFileResponse fileResponse) { } - public override bool TrySendHeaders(HttpContextBase context) + public override bool TrySendHeaders(HttpContext context) { base.TrySendHeaders(context); @@ -128,7 +128,7 @@ public override bool TrySendHeaders(HttpContextBase context) return true; } - public override void SendFile(HttpContextBase context) + public override void SendFile(HttpContext context) { var fileLength = FileResponse.FileLength ?? FileResponse.Transmitter.GetFileLength(); FileResponse.Transmitter.TransmitFile(0, fileLength, fileLength, context); @@ -166,7 +166,7 @@ public RangeFileResponder(IFileResponse fileResponse, string rangeHeader) _rangeHeader = rangeHeader; } - public override bool TrySendHeaders(HttpContextBase context) + public override bool TrySendHeaders(HttpContext context) { var fileLength = FileResponse.FileLength ?? FileResponse.Transmitter.GetFileLength(); var etag = FileResponse.ETag; @@ -182,7 +182,7 @@ public override bool TrySendHeaders(HttpContextBase context) return handled; } - public override void SendFile(HttpContextBase context) + public override void SendFile(HttpContext context) { // Do nothing here, we have handled everything in 'TrySendHeaders()' already } @@ -192,7 +192,7 @@ public override void SendFile(HttpContextBase context) // Most of the helpers here were copied over from the internal StaticFileHandler.cs private bool ExecuteRangeRequest( - HttpContextBase context, + HttpContext context, long fileLength, string rangeHeader, string etag, diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs index 10574118e1..750a9bacb6 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileTransmitter.cs @@ -1,13 +1,13 @@ using System; using System.IO; -using System.Web; +// using System.Web; // Removed for .NET 8 migration namespace SmartStore.Web.Framework.Modelling { public abstract class FileTransmitter { public abstract long GetFileLength(); - public abstract void TransmitFile(long offset, long length, long fileLength, HttpContextBase context); + public abstract void TransmitFile(long offset, long length, long fileLength, HttpContext context); } public sealed class FileBufferTransmitter : FileTransmitter @@ -26,7 +26,7 @@ public override long GetFileLength() return GetBuffer().LongLength; } - public override void TransmitFile(long offset, long length, long fileLength, HttpContextBase context) + public override void TransmitFile(long offset, long length, long fileLength, HttpContext context) { context.Response.OutputStream.Write(GetBuffer(), (int)offset, (int)length); } @@ -65,7 +65,7 @@ public override long GetFileLength() return GetStream().Length; } - public override void TransmitFile(long offset, long length, long fileLength, HttpContextBase context) + public override void TransmitFile(long offset, long length, long fileLength, HttpContext context) { var response = context.Response; var stream = GetStream(); 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..f6c39e0c27 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs @@ -1,7 +1,7 @@ using System.Web; -using System.Web.Hosting; -using System.Web.Mvc.Razor; -using System.Web.WebPages.Razor; +using Microsoft.AspNetCore.Hosting; +// using System.Web.Mvc.Razor; // Removed for .NET 8 migration +// using System.Web.WebPages.Razor; // Removed for .NET 8 migration using SmartStore.Utilities; using SmartStore.Web.Framework.Theming; diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginStarter.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginStarter.cs index cd7d9e63a2..a9aa37a4de 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core.Infrastructure; using SmartStore.Core.Plugins; using SmartStore.Services.Localization; @@ -24,7 +24,7 @@ public PluginStarter(IPluginFinder pluginFinder, ILocalizationService locService public bool ThrowOnError => false; public int MaxAttempts => 1; - public void Start(HttpContextBase httpContext) + public void Start(HttpContext httpContext) { //if (!PluginManager.PluginChangeDetected) // return; 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 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..7719914c4a 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.Routing { @@ -12,7 +12,7 @@ public GuidConstraint(bool allowEmpty) { this._allowEmpty = allowEmpty; } - public bool Match(HttpContextBase httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection) + public bool Match(HttpContext httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection) { if (values.ContainsKey(parameterName)) { 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..d6d067bf22 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Security; @@ -16,7 +16,7 @@ public virtual void OnAuthorization(AuthorizationContext filterContext) if (filterContext == null || filterContext.HttpContext == null) return; - HttpRequestBase request = filterContext.HttpContext.Request; + HttpRequest request = filterContext.HttpContext.Request; if (request == null) return; 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..7209994221 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 System.Web; // Removed for .NET 8 migration +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..e5a4c6d6b2 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Identity; using Newtonsoft.Json; using SmartStore.Utilities; @@ -58,7 +58,7 @@ public static HoneypotField DeserializeToken(string token) return result; } - public static bool IsBot(HttpContextBase httpContext) + public static bool IsBot(HttpContext httpContext) { var tokenString = httpContext.Request.Form[TokenFieldName]; if (tokenString.IsEmpty()) diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs index 328b3ce01d..1328d176e4 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs @@ -1,5 +1,5 @@ using System.Web.Mvc; -using System.Web.Mvc.Html; +// using System.Web.Mvc.Html; // Removed for .NET 8 migration namespace SmartStore.Web.Framework.Security { 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..15313a26f2 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Data; @@ -120,7 +120,7 @@ public static string GetUrlPrefixFor(string entityName) /// /// An object that contains the values from the route definition. /// - public override RouteData GetRouteData(HttpContextBase httpContext) + public override RouteData GetRouteData(HttpContext httpContext) { RouteData data = base.GetRouteData(httpContext); 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 { [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..501abe0582 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -1,521 +1,23 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {75FD4163-333C-4DD5-854D-2EF294E45D94} - Library - Properties + net8.0 SmartStore.Web.Framework SmartStore.Web.Framework - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - + enable + disable + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\PluginDev\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll - - - False - ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\Autofac.WebApi2.5.0.0\lib\net461\Autofac.Integration.WebApi.dll - - - ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll - - - ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll - - - ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll - - - ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - - - ..\..\packages\CommonServiceLocator.2.0.5\lib\net47\CommonServiceLocator.dll - - - ..\..\packages\DotLiquid.2.0.254\lib\net45\DotLiquid.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - - ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll - - - ..\..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll - - - ..\..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - ..\..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.OData.5.10.0\lib\net45\System.Web.OData.dll - - - False - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - - - False - ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Designer - - + + + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - + + + + - - - - - \ No newline at end of file + diff --git a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs index 271d4c8e31..2ca800979d 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 System.Web; // Removed for .NET 8 migration +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..9a170e84b7 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 System.Web; // Removed for .NET 8 migration 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..cd36d12bf8 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 System.Web; // Removed for .NET 8 migration +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..a5ffec61bf 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 System.Web; // Removed for .NET 8 migration +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..ff4fb58897 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 System.Web; // Removed for .NET 8 migration +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..6da11ceef1 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/LocalizedDisplayMode.cs @@ -1,6 +1,6 @@ using System; -using System.Web; -using System.Web.WebPages; +// using System.Web; // Removed for .NET 8 migration +// using System.Web.WebPages; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Infrastructure; @@ -21,7 +21,7 @@ public LocalizedDisplayMode(string suffix, bool enables) _enabled = enables; } - public override DisplayInfo GetDisplayInfo(HttpContextBase httpContext, string virtualPath, Func virtualPathExists) + public override DisplayInfo GetDisplayInfo(HttpContext httpContext, string virtualPath, Func virtualPathExists) { if (!_enabled) { @@ -38,7 +38,7 @@ public override DisplayInfo GetDisplayInfo(HttpContextBase httpContext, string v return result; } - private DisplayInfo GetDisplayInfoInternal(HttpContextBase httpContext, string virtualPath, string lang, Func virtualPathExists) + private DisplayInfo GetDisplayInfoInternal(HttpContext httpContext, string virtualPath, string lang, Func virtualPathExists) { string path = this.TransformPath(virtualPath, "{0}{1}".FormatInvariant(base.DisplayModeId, lang.IsEmpty() ? "" : "." + lang)); if (path != null && virtualPathExists(path)) diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs index f05bcca22a..b3f9674705 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 System.Web; // Removed for .NET 8 migration +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..a381fae9c1 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Themes; @@ -18,7 +18,7 @@ public partial class ThemeContext : IThemeContext private readonly ThemeSettings _themeSettings; private readonly IThemeRegistry _themeRegistry; private readonly IMobileDeviceHelper _mobileDeviceHelper; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private bool _themeIsCached; private string _cachedThemeName; @@ -32,7 +32,7 @@ public ThemeContext( ThemeSettings themeSettings, IThemeRegistry themeRegistry, IMobileDeviceHelper mobileDeviceHelper, - HttpContextBase httpContext) + HttpContext httpContext) { this._workContext = workContext; this._storeContext = storeContext; diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs index bb16495453..e54b8b1a0b 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 System.Web; // Removed for .NET 8 migration +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..0d3bd04fd2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs @@ -1,8 +1,8 @@ using System.IO; using System.Linq; using System.Text; -using System.Web.Mvc; -using System.Web.Mvc.Html; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Html; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Core.Themes; diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeVarsRepository.cs index 255a417b68..af87cd5f3d 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 System.Web; // Removed for .NET 8 migration 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..03e0c3db78 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.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.WebPages; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +// using System.Web.WebPages; // Removed for .NET 8 migration using SmartStore.Core.Infrastructure; using SmartStore.Core.Logging; using SmartStore.Core.Themes; @@ -434,7 +434,7 @@ protected virtual bool IsSpecificPath(string name) return (c == '~' || c == '/'); } - protected virtual bool IsMobileDevice(HttpContextBase httpContext) + protected virtual bool IsMobileDevice(HttpContext httpContext) { var mobileDeviceHelper = EngineContext.Current.Resolve(); var result = mobileDeviceHelper.IsMobileDevice(); 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..a9ddfc19d4 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Utilities; namespace SmartStore.Web.Framework.Theming @@ -26,7 +26,7 @@ public TwoLevelViewLocationCache() } - private static IDictionary GetRequestCache(HttpContextBase httpContext) + private static IDictionary GetRequestCache(HttpContext httpContext) { var d = httpContext.Items[s_key] as IDictionary; if (d == null) @@ -37,7 +37,7 @@ private static IDictionary GetRequestCache(HttpContextBase httpC return d; } - public string GetViewLocation(HttpContextBase httpContext, string key) + public string GetViewLocation(HttpContext httpContext, string key) { var d = GetRequestCache(httpContext); string location; @@ -49,7 +49,7 @@ public string GetViewLocation(HttpContextBase httpContext, string key) return location; } - public void InsertViewLocation(HttpContextBase httpContext, string key, string virtualPath) + public void InsertViewLocation(HttpContext httpContext, string key, string virtualPath) { _innerCache.InsertViewLocation(httpContext, key, virtualPath); GetRequestCache(httpContext)[key] = virtualPath; diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs index 7fe8956162..74d1df01ab 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Web.Mvc; -using System.Web.WebPages; +using Microsoft.AspNetCore.Mvc; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..6f7b6a37fb 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 System.Web; // Removed for .NET 8 migration +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..38b44217f6 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 System.Web; // Removed for .NET 8 migration +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..49ccb296d3 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs @@ -1,8 +1,8 @@ using System; using System.IO; -using System.Web; -using System.Web.Mvc; -using System.Web.UI; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +// using System.Web.UI; // Removed for .NET 8 migration 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..25fb2ffdd0 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 System.Web; // Removed for .NET 8 migration +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..44b612f88e 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/IContentContainer.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.WebPages; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..384c8f2605 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,5 @@ using System.Web.Mvc.Html; -using System.Web.UI; +// using System.Web.UI; // Removed for .NET 8 migration 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..6411820f25 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs @@ -1,8 +1,8 @@ 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 System.Web.WebPages; // Removed for .NET 8 migration 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..84a9505ea1 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Web.Routing; -using System.Web.WebPages; +using Microsoft.AspNetCore.Routing; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..b134b99c7d 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.Mvc.Html; -using System.Web.Routing; -using System.Web.WebPages; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Html; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..5ddbf01979 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,6 @@ using System.Collections.Generic; -using System.Web.Routing; -using System.Web.UI; +using Microsoft.AspNetCore.Routing; +// using System.Web.UI; // Removed for .NET 8 migration 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..c57de8c2f3 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,5 @@ using System.Collections.Generic; -using System.Web.WebPages; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..6170e37301 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,6 @@ using System; -using System.Web.Mvc; -using System.Web.WebPages; +using Microsoft.AspNetCore.Mvc; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..9ea0775c4d 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,8 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Web.Mvc; -using System.Web.UI; +using Microsoft.AspNetCore.Mvc; +// using System.Web.UI; // Removed for .NET 8 migration 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..69a11cb85f 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,6 @@ using System.Collections.Generic; -using System.Web.Routing; -using System.Web.WebPages; +using Microsoft.AspNetCore.Routing; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..57356c0fb6 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,7 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.WebPages; +using Microsoft.AspNetCore.Mvc; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..7a36e61b8a 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using System.Web; -using System.Web.Mvc; -using System.Web.WebPages; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..25da7e58de 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 System.Web; // Removed for .NET 8 migration +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..d480be25ea 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Text; -using System.Web.Mvc; -using System.Web.WebPages; +using Microsoft.AspNetCore.Mvc; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..09908a14f1 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 System.Web; // Removed for .NET 8 migration 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..a158cd5711 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs @@ -3,12 +3,12 @@ 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using WebOptimizer; +using Microsoft.AspNetCore.Routing; +// using System.Web.WebPages; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Domain.Themes; @@ -19,7 +19,7 @@ namespace SmartStore.Web.Framework.UI { public partial class PageAssetsBuilder : IPageAssetsBuilder { - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly SeoSettings _seoSettings; private readonly ThemeSettings _themeSettings; private readonly IBundleBuilder _bundleBuilder; @@ -39,7 +39,7 @@ public partial class PageAssetsBuilder : IPageAssetsBuilder public PageAssetsBuilder( SeoSettings seoSettings, ThemeSettings themeSettings, - HttpContextBase httpContext, + HttpContext httpContext, IStoreContext storeContext, IBundleBuilder bundleBuilder) { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs index e30149e103..a03615403e 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json.Linq; using SmartStore.Collections; using SmartStore.Core; @@ -13,12 +13,12 @@ namespace SmartStore.Web.Framework.UI public class WidgetProvider : IWidgetProvider { private readonly IApplicationEnvironment _env; - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequest _httpRequest; private Multimap _zoneWidgetsMap; private Multimap _zoneExpressionWidgetsMap; - public WidgetProvider(IApplicationEnvironment env, HttpRequestBase httpRequest) + public WidgetProvider(IApplicationEnvironment env, HttpRequest httpRequest) { _env = env; _httpRequest = httpRequest; 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/AutofacWebApiDependencyResolver.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyResolver.cs index 5eb89b28a9..149528ef92 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyResolver.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyResolver.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Security; -using System.Web.Http.Dependencies; +// using System.Web.Http.Dependencies; // Removed for .NET 8 migration using Autofac; using SmartStore.Core.Infrastructure; using SmartStore.Core.Infrastructure.DependencyManagement; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyScope.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyScope.cs index e5dfcecc2b..6318cfb628 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyScope.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/AutofacWebApiDependencyScope.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Security; -using System.Web.Http.Dependencies; +// using System.Web.Http.Dependencies; // Removed for .NET 8 migration using Autofac; namespace SmartStore.Web.Framework.WebApi 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..657d287cf6 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 System.Web; // Removed for .NET 8 migration +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..0ac90d8669 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using System.Web.Http; -using System.Web.OData.Builder; -using System.Web.OData.Routing.Conventions; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData.Builder; // Removed for .NET 8 migration +// using System.Web.OData.Routing.Conventions; // Removed for .NET 8 migration namespace SmartStore.Web.Framework.WebApi.Configuration { 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..0f54f70109 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs @@ -1,14 +1,14 @@ 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 System.Web.OData; -using System.Web.OData.Formatter; +using Microsoft.AspNetCore.Mvc; +// using System.Web.OData; // Removed for .NET 8 migration +// using System.Web.OData.Formatter; // Removed for .NET 8 migration using Autofac; using SmartStore.ComponentModel; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs index bd5da2861d..55264c62d7 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs @@ -1,8 +1,8 @@ using System; using System.Net.Http; -using System.Web.Http; -using System.Web.Http.Filters; -using System.Web.OData; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +// using System.Web.OData; // Removed for .NET 8 migration using SmartStore.Web.Framework.WebApi.Caching; namespace SmartStore.Web.Framework.WebApi.OData diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs index 761652fef7..89cf983431 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 System.Web; // Removed for .NET 8 migration 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..d64b4607ef 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs @@ -4,10 +4,10 @@ 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 System.Web.Http.Dependencies; +// using System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +// using System.Web.Http.Controllers; // Removed for .NET 8 migration +// using System.Web.Http.Dependencies; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Logging; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 8fe2772ae6..c6c4b7ce24 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -1,11 +1,11 @@ using System; using System.Net.Http.Formatting; -using System.Web.Http; -using System.Web.Http.Cors; -using System.Web.OData.Builder; -using System.Web.OData.Extensions; -using System.Web.OData.Routing; -using System.Web.OData.Routing.Conventions; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Http.Cors; // Removed for .NET 8 migration +// using System.Web.OData.Builder; // Removed for .NET 8 migration +// using System.Web.OData.Extensions; // Removed for .NET 8 migration +// using System.Web.OData.Routing; // Removed for .NET 8 migration +// using System.Web.OData.Routing.Conventions; // Removed for .NET 8 migration using Newtonsoft.Json; using SmartStore.Core.Infrastructure; using SmartStore.Web.Framework.WebApi.Configuration; diff --git a/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs b/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs index 81f76a00a6..0f77d7c526 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Caching; using SmartStore.Core.Data; @@ -44,12 +44,12 @@ internal Store GetStoreByHostName(string host) const string CacheKey = "stores:all"; private readonly Lazy> _rs; - private readonly Lazy _httpContext; + private readonly Lazy _httpContext; private readonly ICacheManager _cache; private Store _currentStore; - public WebStoreContext(Lazy> rs, Lazy httpContext, ICacheManager cache) + public WebStoreContext(Lazy> rs, Lazy httpContext, ICacheManager cache) { _rs = rs; _httpContext = httpContext; diff --git a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs index 6aa41a3a49..59a53c827b 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 System.Web; // Removed for .NET 8 migration using SmartStore.Core; using SmartStore.Core.Caching; using SmartStore.Core.Domain.Customers; @@ -21,7 +21,7 @@ public partial class WebWorkContext : IWorkContext { private const string VisitorCookieName = "SMARTSTORE.VISITOR"; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly ICustomerService _customerService; private readonly IStoreContext _storeContext; private readonly IAuthenticationService _authenticationService; @@ -47,7 +47,7 @@ public partial class WebWorkContext : IWorkContext public WebWorkContext( ICacheManager cacheManager, - HttpContextBase httpContext, + HttpContext httpContext, ICustomerService customerService, IStoreContext storeContext, IAuthenticationService authenticationService, 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..e3d42374d2 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 System.Web; // Removed for .NET 8 migration +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..9aeea6d8f7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs @@ -4,7 +4,7 @@ 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; 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..e3db380398 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 System.Web; // Removed for .NET 8 migration +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..938d0c2842 100644 --- a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.Mvc.Html; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Mvc.Html; // Removed for .NET 8 migration using SmartStore.Admin.Models.Plugins; using SmartStore.Web.Framework.Plugins; 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 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 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(); } - [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 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 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 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 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 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 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..b39354d9fa 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 System.Web; // Removed for .NET 8 migration +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 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 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 AvailableCultures { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.UniqueSeoCode")] - [AllowHtml] public string UniqueSeoCode { get; set; } public List AvailableTwoLetterLanguageCodes { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.FlagImageFileName")] - [AllowHtml] public string FlagImageFileName { get; set; } public IList FlagFileNames { get; set; } public List 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..fbb628e340 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 System.Web; // Removed for .NET 8 migration +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 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..653b3884a9 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; -using System.Web.Script.Serialization; +using Microsoft.AspNetCore.Mvc; +// using System.Web.Script.Serialization; // Removed for .NET 8 migration using FluentValidation; using FluentValidation.Attributes; using Newtonsoft.Json; @@ -26,15 +26,12 @@ public MessageTemplateModel() public TreeNode 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 AvailableReasonForReturn { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ReturnRequests.Fields.RequestedAction")] public string RequestedAction { get; set; } public IList 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 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 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..3319f2c24a 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -1,1390 +1,21 @@ - - - + - Debug - AnyCPU - - - 2.0 - {152C761A-DD2E-4C1F-AF89-DFB2547A3BCA} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Admin SmartStore.Admin - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - - - - - ..\..\..\ - true - true - 1e5b888b - - + enable + disable + false - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - false - - - - False - ..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - False - - - ..\..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - False - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - False - ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - - - False - ..\..\..\..\lib\SmartStore.Licensing\SmartStore.Licensing.dll - True - - - - - - - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - False - ..\..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - False - - - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - ..\..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - - False - ..\..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - False - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - False - - - {CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144} - SmartStore.Data - False - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - False - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - False - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - 0 - - - - - - - - - - - - - False - True - 43797 - / - - - False - True - http://www.smartstore.net - False - - - - - - - - - - - \ No newline at end of file + 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..9b607547f5 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; @@ -74,7 +74,7 @@ public partial class CatalogHelper private readonly Lazy _dataExporter; private readonly ICatalogSearchService _catalogSearchService; private readonly ICatalogSearchQueryFactory _catalogSearchQueryFactory; - private readonly HttpRequestBase _httpRequest; + private readonly HttpRequest _httpRequest; private readonly UrlHelper _urlHelper; private readonly ProductUrlHelper _productUrlHelper; private readonly ILocalizedEntityService _localizedEntityService; @@ -112,7 +112,7 @@ public CatalogHelper( Lazy dataExporter, ICatalogSearchService catalogSearchService, ICatalogSearchQueryFactory catalogSearchQueryFactory, - HttpRequestBase httpRequest, + HttpRequest httpRequest, UrlHelper urlHelper, ProductUrlHelper productUrlHelper, ILocalizedEntityService localizedEntityService, diff --git a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs index 2b14817c5a..232e26ceb5 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; @@ -52,7 +52,7 @@ public partial class CheckoutController : PublicControllerBase private readonly IPaymentService _paymentService; private readonly IOrderTotalCalculationService _orderTotalCalculationService; private readonly IOrderService _orderService; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly OrderSettings _orderSettings; private readonly PaymentSettings _paymentSettings; private readonly AddressSettings _addressSettings; @@ -81,7 +81,7 @@ public CheckoutController( IPaymentService paymentService, IOrderTotalCalculationService orderTotalCalculationService, IOrderService orderService, - HttpContextBase httpContext, + HttpContext httpContext, OrderSettings orderSettings, PaymentSettings paymentSettings, AddressSettings addressSettings, 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..0bf5265c1b 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 System.Web; // Removed for .NET 8 migration +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..47c843f14b 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 System.Web; // Removed for .NET 8 migration +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..4311c97498 100644 --- a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs @@ -1,14 +1,14 @@ 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 System.Web.SessionState; // Removed for .NET 8 migration 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..e8d7e2b468 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs @@ -5,9 +5,9 @@ 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 System.Web.SessionState; // Removed for .NET 8 migration 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..2a14514a6b 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; @@ -78,7 +78,7 @@ public partial class ShoppingCartController : PublicControllerBase private readonly ICustomerActivityService _customerActivityService; private readonly IGenericAttributeService _genericAttributeService; private readonly IDeliveryTimeService _deliveryTimeService; - private readonly HttpContextBase _httpContext; + private readonly HttpContext _httpContext; private readonly MediaSettings _mediaSettings; private readonly ShoppingCartSettings _shoppingCartSettings; private readonly CatalogSettings _catalogSettings; @@ -140,7 +140,7 @@ public ShoppingCartController( CaptchaSettings captchaSettings, AddressSettings addressSettings, CustomerSettings customerSettings, - HttpContextBase httpContext, + HttpContext httpContext, PluginMediator pluginMediator, IQuantityUnitService quantityUnitService, IMeasureService measureService, diff --git a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs index 8b820e73ae..937e5a90f8 100644 --- a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using System.Web.Mvc; -using System.Web.SessionState; +using Microsoft.AspNetCore.Mvc; +// using System.Web.SessionState; // Removed for .NET 8 migration 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..b78e9af37f 100644 --- a/src/Presentation/SmartStore.Web/Global.asax.cs +++ b/src/Presentation/SmartStore.Web/Global.asax.cs @@ -1,12 +1,12 @@ 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 System.Web; // Removed for .NET 8 migration +// using System.Web.Helpers; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using WebOptimizer; +using Microsoft.AspNetCore.Routing; +// using System.Web.WebPages; // Removed for .NET 8 migration 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..26e8a7a57d 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 System.Web; // Removed for .NET 8 migration using System.Xml; using SmartStore.Core; using SmartStore.Core.Infrastructure; @@ -45,7 +45,7 @@ public string GetResource(string resourceName) public virtual InstallationLanguage GetCurrentLanguage() { - var httpContext = EngineContext.Current.Resolve(); + var httpContext = EngineContext.Current.Resolve(); var cookieLanguageCode = ""; var cookie = httpContext.Request.Cookies[LanguageCookieName]; @@ -94,7 +94,7 @@ private bool MatchLanguageByCurrentCulture(InstallationLanguage language) public virtual void SaveCurrentLanguage(string languageCode) { - var httpContext = EngineContext.Current.Resolve(); + var httpContext = EngineContext.Current.Resolve(); var cookie = new HttpCookie(LanguageCookieName); cookie.HttpOnly = true; 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..4694057b66 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 System.Web.Mvc.Routing.Constraints; // Removed for .NET 8 migration +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..48f747a7ea 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Controllers; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Routing; @@ -52,7 +52,7 @@ where typeof(IController).IsAssignableFrom(t) && t.Namespace == "SmartStore.Web. } } - public bool Match(HttpContextBase httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection) + public bool Match(HttpContext httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection) { if (values.TryGetValue(parameterName, out var value)) { diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs index 578b78e54b..9bbe44a833 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; using SmartStore.Utilities; @@ -68,7 +68,7 @@ public override void OnActionExecuted(ActionExecutedContext filterContext) } } - private string GetMappedPath(HttpRequestBase request) + private string GetMappedPath(HttpRequest request) { var path = request.AppRelativeCurrentExecutionFilePath.TrimStart('~').TrimEnd('/'); var method = request.HttpMethod.EmptyNull(); 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/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..4d22fb316b 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1,2170 +1,23 @@ - - - - - - - - + - Debug - AnyCPU - - - 2.0 - {4F1F649C-1020-45BE-A487-F416D9297FF3} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Web SmartStore.Web - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - ..\..\ - true - - - - - - + enable + disable + false - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - latest - false - AnyCPU - AllFilesInProjectFolder - - - pdbonly - true - bin\ - TRACE - prompt - 4 - latest - false - AllFilesInProjectFolder - false - false - AnyCPU - - - - ..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll - - - False - ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll - - - ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll - - - ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll - - - ..\..\packages\BundleTransformer.JsMin.1.12.6\lib\net40\BundleTransformer.JsMin.dll - - - ..\..\packages\BundleTransformer.NUglify.1.12.16\lib\net40\BundleTransformer.NUglify.dll - - - ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\ClearScript.dll - - - ..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll - True - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Msie.3.4.3\lib\net45\JavaScriptEngineSwitcher.Msie.dll - - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\JavaScriptEngineSwitcher.V8.dll - - - ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\MsieJavaScriptEngine.3.0.7\lib\net45\MsieJavaScriptEngine.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - True - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - - ..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll - - - - ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - False - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - True - - - False - ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - True - True - EditorLocalization.de.resx - - - True - True - EditorLocalization.resx - - - True - True - GridLocalization.de.resx - - - True - True - GridLocalization.resx - - - True - True - MvcLocalization.resx - - - True - True - MvcLocalization.de.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Global.asax - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - Designer - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - MvcLocalization.de.Designer.cs - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - Designer - - - - - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - Web.config - Designer - - - Web.config - Designer - - - - - - True - True - .\output - True - True - Nested - False - - - Designer - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web.config - - - Web.config - - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - - - - - - Designer - - + - - Designer - + + + + + - - GlobalResourceProxyGenerator - EditorLocalization.de.designer.cs - - - GlobalResourceProxyGenerator - EditorLocalization.designer.cs - - - GlobalResourceProxyGenerator - GridLocalization.de.designer.cs - Designer - - - GlobalResourceProxyGenerator - GridLocalization.designer.cs - Designer - + + + - - - GlobalResourceProxyGenerator - MvcLocalization.Designer.cs - - - - - Config\log4net.config - False - $(TransformWebConfigIntermediateLocation)\original - Config\log4net.$(Configuration).config - $(TransformWebConfigIntermediateLocation)\original - $(TransformWebConfigIntermediateLocation)\original\%(DestinationRelativePath) - $(TransformWebConfigIntermediateLocation)\transformed\%(DestinationRelativePath) - $(_PackageTempDir)\%(DestinationRelativePath) - Designer - - - log4net.config - - - log4net.config - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - false - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - True - - - - - - - - **\*.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\**; - - - 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; - - - - - - - Project - false - - - - - - - - - - - - - - - - - - - - $(ProjectDir)bin\roslyn\ - - - - - - - - $(ProjectDir)Content\placeholder.txt - - - - - - - - - - - - - - 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}". - - - - - - - - \ No newline at end of file + diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs index ac1fcd17c4..506caa26d9 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; @@ -19,7 +19,7 @@ public HookedEntityMock(BaseEntity entity, EntityState state) public Type ContextType => typeof(IDbContext); - public DbEntityEntry Entry => null; + public EntityEntry Entry => null; public BaseEntity Entity => _entity; diff --git a/src/Tests/SmartStore.Core.Tests/WebHelperTests.cs b/src/Tests/SmartStore.Core.Tests/WebHelperTests.cs index 563c2918d1..73b7de4ea8 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 System.Web; // Removed for .NET 8 migration using NUnit.Framework; using SmartStore.Core.Fakes; using SmartStore.Tests; @@ -9,7 +9,7 @@ namespace SmartStore.Core.Tests [TestFixture] public class WebHelperTests { - private HttpContextBase _httpContext; + private HttpContext _httpContext; private IWebHelper _webHelper; [Test] 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..ea346bf88a 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 System.Web; // Removed for .NET 8 migration using NUnit.Framework; using Rhino.Mocks; using SmartStore.Core; @@ -33,7 +33,7 @@ public class PriceCalculationServiceTests : ServiceTest IPriceCalculationService _priceCalcService; IDownloadService _downloadService; ICommonServices _services; - HttpRequestBase _httpRequestBase; + HttpRequest _httpRequestBase; ITaxService _taxService; CatalogSettings _catalogSettings; TaxSettings _taxSettings; @@ -65,7 +65,7 @@ public class PriceCalculationServiceTests : ServiceTest _productAttributeService = MockRepository.GenerateMock(); _downloadService = MockRepository.GenerateMock(); - _httpRequestBase = MockRepository.GenerateMock(); + _httpRequestBase = MockRepository.GenerateMock(); _taxService = MockRepository.GenerateMock(); _catalogSettings = new CatalogSettings(); diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs index ac0980ca3f..83e9d51d8a 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 System.Web; // Removed for .NET 8 migration using NUnit.Framework; using Rhino.Mocks; using SmartStore.Core; @@ -88,7 +88,7 @@ public class OrderProcessingServiceTests : ServiceTest IDownloadService _downloadService; INewsLetterSubscriptionService _newsLetterSubscriptionService; ICommonServices _services; - HttpRequestBase _httpRequestBase; + HttpRequest _httpRequestBase; IGeoCountryLookup _geoCountryLookup; Store _store; ICartRuleProvider _cartRuleProvider; @@ -158,7 +158,7 @@ public class OrderProcessingServiceTests : ServiceTest _addressService = MockRepository.GenerateMock(); _addressService.Expect(x => x.GetAddressById(_taxSettings.DefaultTaxAddressId)).Return(new Address() { Id = _taxSettings.DefaultTaxAddressId }); _downloadService = MockRepository.GenerateMock(); - _httpRequestBase = MockRepository.GenerateMock(); + _httpRequestBase = MockRepository.GenerateMock(); _geoCountryLookup = MockRepository.GenerateMock(); _taxService = new TaxService(_addressService, _workContext, _taxSettings, _shoppingCartSettings, pluginFinder, _geoCountryLookup, this.ProviderManager); diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs index 9a0e0c5eec..4bf0eaa774 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 System.Web; // Removed for .NET 8 migration using NUnit.Framework; using Rhino.Mocks; using SmartStore.Core; @@ -64,7 +64,7 @@ public class OrderTotalCalculationServiceTests : ServiceTest ISettingService _settingService; IDownloadService _downloadService; ICommonServices _services; - HttpRequestBase _httpRequestBase; + HttpRequest _httpRequestBase; IGeoCountryLookup _geoCountryLookup; Store _store; Currency _currency; @@ -144,7 +144,7 @@ public class OrderTotalCalculationServiceTests : ServiceTest _addressService = MockRepository.GenerateMock(); _addressService.Expect(x => x.GetAddressById(_taxSettings.DefaultTaxAddressId)).Return(new Address { Id = _taxSettings.DefaultTaxAddressId }); _downloadService = MockRepository.GenerateMock(); - _httpRequestBase = MockRepository.GenerateMock(); + _httpRequestBase = MockRepository.GenerateMock(); _geoCountryLookup = MockRepository.GenerateMock(); _taxService = new TaxService(_addressService, _workContext, _taxSettings, _shoppingCartSettings, pluginFinder, _geoCountryLookup, this.ProviderManager); 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/MemoryRepository.cs b/src/Tests/SmartStore.Tests/MemoryRepository.cs index e1ec7c8376..482e63c01e 100644 --- a/src/Tests/SmartStore.Tests/MemoryRepository.cs +++ b/src/Tests/SmartStore.Tests/MemoryRepository.cs @@ -133,7 +133,7 @@ public IDbContext Context ctx.Stub(x => x.ExecuteStoredProcedureList(Arg.Is.Anything, Arg.Is.Anything)).Return(new List()); ctx.Stub(x => x.GetModifiedProperties(Arg.Is.Anything)).Return(new Dictionary()); ctx.Stub(x => x.BeginTransaction(Arg.Is.Anything)).Return(MockRepository.GenerateMock()); - ctx.Stub(x => x.ChangeState(Arg.Is.TypeOf, Arg.Is.Anything)) + ctx.Stub(x => x.ChangeState(Arg.Is.TypeOf, Arg.Is.Anything)) .WhenCalled(ChangeState); _dbContext = ctx; @@ -146,16 +146,16 @@ public IDbContext Context private void ChangeState(MethodInvocation invocation) { var entity = (T)invocation.Arguments[0]; - var state = (System.Data.Entity.EntityState)invocation.Arguments[1]; + var state = (Microsoft.EntityFrameworkCore.EntityState)invocation.Arguments[1]; - if (state == System.Data.Entity.EntityState.Deleted) + if (state == Microsoft.EntityFrameworkCore.EntityState.Deleted) { if (_dbSet.Contains(entity)) { _dbSet.Remove(entity); } } - else if (state == System.Data.Entity.EntityState.Added) + else if (state == Microsoft.EntityFrameworkCore.EntityState.Added) { if (!_dbSet.Contains(entity)) { 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..70de7a0b55 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 System.Web; // Removed for .NET 8 migration +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core.Fakes; using SmartStore.Tests; @@ -30,7 +30,7 @@ public static class RouteTestingExtensions { #region Utilities - private static HttpContextBase FakeHttpContext(string url, HttpVerbs? httpMethod, HttpVerbs? formMethod) + private static HttpContext FakeHttpContext(string url, HttpVerbs? httpMethod, HttpVerbs? formMethod) { NameValueCollection form = null; @@ -53,18 +53,18 @@ private static HttpContextBase FakeHttpContext(string url, HttpVerbs? httpMethod return context; } - private static HttpContextBase FakeHttpContext(string url, string method) + private static HttpContext FakeHttpContext(string url, string method) { var httpMethod = (HttpVerbs)Enum.Parse(typeof(HttpVerbs), method); return FakeHttpContext(url, httpMethod, null); } - private static HttpContextBase FakeHttpContext(string url, HttpVerbs? httpMethod) + private static HttpContext FakeHttpContext(string url, HttpVerbs? httpMethod) { return FakeHttpContext(url, httpMethod, null); } - private static HttpContextBase FakeHttpContext(string url) + private static HttpContext FakeHttpContext(string url) { return FakeHttpContext(url, null, null); } diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs index 82deee90cd..35af72aa08 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 System.Web; // Removed for .NET 8 migration 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..6d7eb89ac6 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 System.Web; // Removed for .NET 8 migration using System.Windows.Forms; using Newtonsoft.Json.Linq; using SmartStore.WebApi.Client.Models;