diff --git a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs index 91ffb0db95..734c69159e 100644 --- a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs +++ b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using Autofac; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs index ba66c15bf0..d70bb804e9 100644 --- a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs +++ b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs @@ -41,7 +41,6 @@ public virtual IEnumerable GetAll() .OfType(); } - public virtual void Set(T state, string name = null, bool neverExpires = false) { Guard.NotNull(state, nameof(state)); @@ -131,7 +130,6 @@ protected virtual bool OnRemoveCancelTokenSource(string key, bool successive = f return false; } - public CancellationTokenSource GetCancelTokenSource(string name = null) { return OnGetCancelTokenSource(BuildKey(name)); @@ -180,7 +178,6 @@ protected virtual bool OnCancel(string key, bool successive = false) return false; } - protected virtual AsyncStateInfo GetStateInfo(string name = null) { return _states.Get(BuildKey(name)) as AsyncStateInfo; diff --git a/src/Libraries/SmartStore.Core/BaseEntity.cs b/src/Libraries/SmartStore.Core/BaseEntity.cs index e2882f9851..14f9c9a1c3 100644 --- a/src/Libraries/SmartStore.Core/BaseEntity.cs +++ b/src/Libraries/SmartStore.Core/BaseEntity.cs @@ -1,8 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations.Schema; -using System.Data.Entity.Core.Objects; -using System.Diagnostics.CodeAnalysis; -using System.Runtime.CompilerServices; using System.Runtime.Serialization; namespace SmartStore.Core @@ -11,59 +7,39 @@ namespace SmartStore.Core /// Base class for entities /// [DataContract] - public abstract partial class BaseEntity : IEquatable + public abstract partial class BaseEntity { /// /// Gets or sets the entity identifier /// [DataMember] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; } - [SuppressMessage("ReSharper", "PossibleNullReferenceException")] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public virtual string GetEntityName() - { - return GetUnproxiedType().Name; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public Type GetUnproxiedType() - { - #region Old - //var t = GetType(); - //if (t.AssemblyQualifiedName.StartsWith("System.Data.Entity.")) - //{ - // // it's a proxied type - // t = t.BaseType; - //} - - //return t; - #endregion - - return ObjectContext.GetObjectType(GetType()); - } - /// - /// Transient objects are not associated with an item already in storage. For instance, - /// a Product entity is transient if its Id is 0. + /// Checks whether the entity is transient (not persisted to database) /// - public virtual bool IsTransientRecord() + /// True if transient, false otherwise + public bool IsTransient() { return Id == 0; } public override bool Equals(object obj) { - return this.Equals(obj as BaseEntity); + return Equals(obj as BaseEntity); + } + + private static bool IsTransient(BaseEntity obj) + { + return obj != null && Equals(obj.Id, default(int)); } - bool IEquatable.Equals(BaseEntity other) + private Type GetUnproxiedType() { - return this.Equals(other); + return GetType(); } - protected virtual bool Equals(BaseEntity other) + public virtual bool Equals(BaseEntity other) { if (other == null) return false; @@ -71,34 +47,21 @@ protected virtual bool Equals(BaseEntity other) if (ReferenceEquals(this, other)) return true; - if (HasSameNonDefaultIds(other)) + if (!IsTransient(this) && !IsTransient(other) && Equals(Id, other.Id)) { var otherType = other.GetUnproxiedType(); var thisType = GetUnproxiedType(); - return thisType.Equals(otherType); + return thisType.IsAssignableFrom(otherType) || otherType.IsAssignableFrom(thisType); } return false; } - [SuppressMessage("ReSharper", "NonReadonlyMemberInGetHashCode")] public override int GetHashCode() { - if (IsTransientRecord()) - { + if (Equals(Id, default(int))) return base.GetHashCode(); - } - else - { - unchecked - { - // It's possible for two objects to return the same hash code based on - // identically valued properties, even if they're of two different types, - // so we include the object's type in the hash calculation - var hashCode = GetUnproxiedType().GetHashCode(); - return (hashCode * 31) ^ Id.GetHashCode(); - } - } + return Id.GetHashCode(); } public static bool operator ==(BaseEntity x, BaseEntity y) @@ -110,10 +73,5 @@ public override int GetHashCode() { return !(x == y); } - - private bool HasSameNonDefaultIds(BaseEntity other) - { - return !this.IsTransientRecord() && !other.IsTransientRecord() && this.Id == other.Id; - } } } diff --git a/src/Libraries/SmartStore.Core/Caching/NullCache.cs b/src/Libraries/SmartStore.Core/Caching/NullCache.cs index 8910d0b004..43b34b0261 100644 --- a/src/Libraries/SmartStore.Core/Caching/NullCache.cs +++ b/src/Libraries/SmartStore.Core/Caching/NullCache.cs @@ -35,7 +35,6 @@ public Task GetAsync(string key, Func> acquirer, TimeSpan? duratio return acquirer(); } - public ISet GetHashSet(string key, Func> acquirer = null) { return new MemorySet(this); diff --git a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs index 601afc2fef..ebe8513fa9 100644 --- a/src/Libraries/SmartStore.Core/Caching/RequestCache.cs +++ b/src/Libraries/SmartStore.Core/Caching/RequestCache.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections; using System.Collections.Generic; @@ -132,3 +133,5 @@ protected override void OnDispose(bool disposing) } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs b/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs index 64b8570a4e..3baef727f7 100644 --- a/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs +++ b/src/Libraries/SmartStore.Core/Collections/TreeNodeBase.cs @@ -327,7 +327,6 @@ private void AttachTo(T newParent, int? index) ? _children.Where(x => !x.IsLeaf) : Enumerable.Empty(); - [JsonIgnore] public T FirstChild => _children?.FirstOrDefault(); diff --git a/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs b/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs index 2f5301595a..6c53ad28fc 100644 --- a/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs +++ b/src/Libraries/SmartStore.Core/ComponentModel/FastProperty.cs @@ -286,7 +286,6 @@ public static FastProperty Create(PropertyInfo property) return new DelegatedAccessor(property); } - /// /// /// Creates and caches fast property helpers that expose getters for every non-hidden get property @@ -470,8 +469,6 @@ public PropertyKey(Type type, string propertyName) } } - - [DebuggerDisplay("DelegateAccessor: {Name}")] internal sealed class DelegatedAccessor : FastProperty { diff --git a/src/Libraries/SmartStore.Core/ComponentModel/HybridExpando.cs b/src/Libraries/SmartStore.Core/ComponentModel/HybridExpando.cs index 0bb0f7142d..4d7efbca28 100644 --- a/src/Libraries/SmartStore.Core/ComponentModel/HybridExpando.cs +++ b/src/Libraries/SmartStore.Core/ComponentModel/HybridExpando.cs @@ -171,7 +171,6 @@ public override IEnumerable GetDynamicMemberNames() } } - /// /// Try to retrieve a member by name first from instance properties /// followed by the collection entries. @@ -216,7 +215,6 @@ protected virtual bool TryGetMemberCore(string name, out object result) return exists; } - /// /// Property setter implementation tries to retrieve value from instance /// first then into this object @@ -293,7 +291,6 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o return false; } - /// /// Reflection Helper method to retrieve a property /// @@ -353,7 +350,6 @@ protected bool InvokeMethod(object instance, string name, object[] args, out obj return false; } - /// /// Convenience method that provides a string Indexer /// to the Properties collection AND the strongly typed @@ -387,7 +383,6 @@ public object this[string key] set => TrySetMemberCore(key, value); } - /// /// Returns all properties /// diff --git a/src/Libraries/SmartStore.Core/ComponentModel/PropertyBag.cs b/src/Libraries/SmartStore.Core/ComponentModel/PropertyBag.cs index 8b5d5e0db9..aa06b00571 100644 --- a/src/Libraries/SmartStore.Core/ComponentModel/PropertyBag.cs +++ b/src/Libraries/SmartStore.Core/ComponentModel/PropertyBag.cs @@ -109,7 +109,6 @@ public static string MapTypeToXmlType(Type type) //return type.ToString().ToLower(); } - public static Type MapXmlTypeToType(string xmlType) { xmlType = xmlType.ToLower(); @@ -138,7 +137,6 @@ public static Type MapXmlTypeToType(string xmlType) if (xmlType == "base64binary") return typeof(byte[]); - // return null if no match is found // don't throw so the caller can decide more efficiently what to do // with this error result @@ -158,7 +156,6 @@ public System.Xml.Schema.XmlSchema GetSchema() return null; } - /// /// Serializes the dictionary to XML. Keys are /// serialized to element names and values as @@ -211,7 +208,6 @@ public void WriteXml(System.Xml.XmlWriter writer) writer.WriteEndAttribute(); } - // Serialize simple types with WriteValue if (!isCustom) { @@ -231,7 +227,6 @@ public void WriteXml(System.Xml.XmlWriter writer) } } - /// /// Reads the custom serialized format /// @@ -281,7 +276,6 @@ public void ReadXml(System.Xml.XmlReader reader) } } - /// /// Serializes this dictionary to an XML string /// @@ -319,7 +313,6 @@ public bool FromXml(string xml) return true; } - /// /// Creates an instance of a propertybag from an Xml string /// diff --git a/src/Libraries/SmartStore.Core/ComponentModel/SerializationUtils.cs b/src/Libraries/SmartStore.Core/ComponentModel/SerializationUtils.cs index 5228dbcd56..57c22a0420 100644 --- a/src/Libraries/SmartStore.Core/ComponentModel/SerializationUtils.cs +++ b/src/Libraries/SmartStore.Core/ComponentModel/SerializationUtils.cs @@ -147,7 +147,6 @@ public static bool SerializeObject(object instance, XmlTextWriter writer, bool t return retVal; } - /// /// Serializes an object into an XML string variable for easy 'manual' serialization /// @@ -255,8 +254,6 @@ public static byte[] SerializeObjectToByteArray(object instance, bool throwExcep return byteResult; } - - /// /// Deserializes an object from file and returns a reference. /// @@ -399,7 +396,6 @@ public static object DeSerializeObject(byte[] buffer, Type objectType, bool thro return Instance; } - /// /// Returns a string of all the field value pairs of a given object. /// Works only on non-statics. @@ -455,6 +451,3 @@ public enum ObjectToStringTypes } } - - - 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/DataSettings.cs b/src/Libraries/SmartStore.Core/Data/DataSettings.cs index 3f9a7e5b82..3edb5bde7f 100644 --- a/src/Libraries/SmartStore.Core/Data/DataSettings.cs +++ b/src/Libraries/SmartStore.Core/Data/DataSettings.cs @@ -1,356 +1,31 @@ -using System; +using System; using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SqlServerCe; using System.IO; -using System.Linq; -using System.Threading; -using SmartStore.Utilities; -using SmartStore.Utilities.Threading; namespace SmartStore.Core.Data { public partial class DataSettings { - private static readonly ReaderWriterLockSlim s_rwLock = new ReaderWriterLockSlim(); - private static DataSettings s_current = null; - private static Func s_settingsFactory = new Func(() => new DataSettings()); - private static bool? s_installed = null; - private static bool s_TestMode = false; - - protected const char SEPARATOR = ':'; - protected const string FILENAME = "Settings.txt"; - - private DataSettings() + public DataSettings() { RawDataSettings = new Dictionary(); } - #region Static members - - public static void SetDefaultFactory(Func factory) - { - Guard.NotNull(factory, nameof(factory)); - - lock (s_rwLock.GetWriteLock()) - { - s_settingsFactory = factory; - } - } - - public static DataSettings Current - { - get - { - using (s_rwLock.GetUpgradeableReadLock()) - { - if (s_current == null) - { - using (s_rwLock.GetWriteLock()) - { - if (s_current == null) - { - s_current = s_settingsFactory(); - s_current.Load(); - } - } - } - } - - return s_current; - } - } - - public static bool DatabaseIsInstalled() - { - if (s_TestMode) - return false; - - if (!s_installed.HasValue) - { - s_installed = Current.IsValid(); - } - - return s_installed.Value; - } - - internal static void SetTestMode(bool isTestMode) - { - s_TestMode = isTestMode; - } - - public static void Reload() - { - using (s_rwLock.GetWriteLock()) - { - s_current = null; - s_installed = null; - } - } - - public static void Delete() - { - if (s_current?.TenantPath != null) - { - using (s_rwLock.GetWriteLock()) - { - string filePath = Path.Combine(CommonHelper.MapPath(s_current.TenantPath), FILENAME); - try - { - File.Delete(filePath); - } - finally - { - s_current = null; - s_installed = null; - } - } - } - } - - #endregion - - #region Instance members - - public string TenantName - { - get; - private set; - } - - public string TenantPath - { - get; - private set; - } - - public Version AppVersion - { - get; - set; - } - - public string DataProvider - { - get; - set; - } - - public string ProviderInvariantName - { - get - { - if (this.DataProvider.HasValue() && this.DataProvider.IsCaseInsensitiveEqual("sqlserver")) - return "System.Data.SqlClient"; - - // SqlCe should always be the default provider - return "System.Data.SqlServerCe.4.0"; - } - } - - public string ProviderFriendlyName - { - get - { - if (this.DataProvider.HasValue() && this.DataProvider.IsCaseInsensitiveEqual("sqlserver")) - return "SQL Server"; - - // SqlCe should always be the default provider - return "SQL Server Compact (SQL CE)"; - } - } - - public bool IsSqlServer => this.DataProvider.HasValue() && this.DataProvider.IsCaseInsensitiveEqual("sqlserver"); - - public string DataConnectionString - { - get; - set; - } - - public string DataConnectionType - { - get; - set; - } - - public IDictionary RawDataSettings - { - get; - private set; - } + public string DataProvider { get; set; } + public string DataConnectionString { get; set; } + public IDictionary RawDataSettings { get; private set; } public bool IsValid() { - return this.DataProvider.HasValue() && this.DataConnectionString.HasValue(); - } - - public virtual bool Load() - { - using (s_rwLock.GetWriteLock()) - { - this.Reset(); - - var curTenant = ResolveTenant(); - var tenantPath = "~/App_Data/Tenants/" + curTenant; - string filePath = Path.Combine(CommonHelper.MapPath(tenantPath), FILENAME); - - this.TenantName = curTenant; - this.TenantPath = tenantPath; - - if (File.Exists(filePath) && !s_TestMode) - { - string text = File.ReadAllText(filePath); - var settings = ParseSettings(text); - if (settings.Any()) - { - this.RawDataSettings.AddRange(settings); - if (settings.ContainsKey("AppVersion")) - { - this.AppVersion = new Version(settings["AppVersion"]); - } - if (settings.ContainsKey("DataProvider")) - { - this.DataProvider = settings["DataProvider"]; - this.DataConnectionType = this.IsSqlServer - ? typeof(SqlConnection).AssemblyQualifiedName - : typeof(SqlCeConnection).AssemblyQualifiedName; - } - if (settings.ContainsKey("DataConnectionString")) - { - this.DataConnectionString = settings["DataConnectionString"]; - } - - return this.IsValid(); - } - } - - return false; - } - } - - public void Reset() - { - using (s_rwLock.GetWriteLock()) - { - this.RawDataSettings.Clear(); - this.TenantName = null; - this.TenantPath = null; - this.AppVersion = null; - this.DataProvider = null; - this.DataConnectionString = null; - this.DataConnectionType = null; - - s_installed = null; - } - } - - public virtual bool Save() - { - if (!this.IsValid()) - return false; - - using (s_rwLock.GetWriteLock()) - { - string filePath = Path.Combine(CommonHelper.MapPath(this.TenantPath), FILENAME); - if (!File.Exists(filePath)) - { - using (File.Create(filePath)) - { - // we use 'using' to close the file after it's created - } - } - - var text = SerializeSettings(); - File.WriteAllText(filePath, text); - - return true; - } - } - - #endregion - - #region Instance helpers - - protected virtual string ResolveTenant() - { - var tenantsBaseDir = CommonHelper.MapPath("~/App_Data/Tenants"); - var curTenantFile = Path.Combine(tenantsBaseDir, "current.txt"); - - string curTenant = null; - - if (File.Exists(curTenantFile)) - { - curTenant = File.ReadAllText(curTenantFile).EmptyNull().Trim().NullEmpty(); - if (curTenant != curTenant.EmptyNull().ToValidPath()) - { - // File contains invalid path string - curTenant = null; - } - - if (curTenant != null && !Directory.Exists(Path.Combine(tenantsBaseDir, curTenant))) - { - // Specified Tenant directory does not exist - curTenant = null; - } - } - - curTenant = curTenant ?? "Default"; - - var tenantPath = Path.Combine(tenantsBaseDir, curTenant); - - if (curTenant.IsCaseInsensitiveEqual("Default") && !Directory.Exists(tenantPath)) - { - // The Default tenant dir should be created if it doesn't exist - Directory.CreateDirectory(tenantPath); - } - - return curTenant.TrimEnd('/'); + return !String.IsNullOrEmpty(this.DataProvider) && !String.IsNullOrEmpty(this.DataConnectionString); } - protected virtual IDictionary ParseSettings(string text) + public static string SettingsFilePath { - var result = new Dictionary(StringComparer.OrdinalIgnoreCase); - - if (text.IsEmpty()) - return result; - - var settings = new List(); - using (var reader = new StringReader(text)) - { - string str; - while ((str = reader.ReadLine()) != null) - settings.Add(str); - } - - foreach (var setting in settings) + get { - var separatorIndex = setting.IndexOf(SEPARATOR); - if (separatorIndex == -1) - { - continue; - } - string key = setting.Substring(0, separatorIndex).Trim(); - string value = setting.Substring(separatorIndex + 1).Trim(); - - if (key.HasValue() && value.HasValue()) - { - result.Add(key, value); - } + return Path.Combine(CommonHelper.MapPath("~/App_Data/"), "Settings.txt"); } - - return result; } - - protected virtual string SerializeSettings() - { - return string.Format("AppVersion: {0}{3}DataProvider: {1}{3}DataConnectionString: {2}{3}", - this.AppVersion.ToString(), - this.DataProvider, - this.DataConnectionString, - Environment.NewLine); - } - - #endregion } } diff --git a/src/Libraries/SmartStore.Core/Data/DbContextScope.cs b/src/Libraries/SmartStore.Core/Data/DbContextScope.cs index 603bdbde8a..cd84238709 100644 --- a/src/Libraries/SmartStore.Core/Data/DbContextScope.cs +++ b/src/Libraries/SmartStore.Core/Data/DbContextScope.cs @@ -18,7 +18,6 @@ public class DbContextScope : IDisposable private readonly bool _autoCommit; private readonly bool _lazyLoading; - public DbContextScope(IDbContext ctx = null, bool? autoDetectChanges = null, bool? proxyCreation = null, diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs index 11a9944a32..8ee273b2d9 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs @@ -1,138 +1,85 @@ -using System; -using System.Data.Entity.Infrastructure; -using EfState = System.Data.Entity.EntityState; +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.ChangeTracking; namespace SmartStore.Core.Data.Hooks { - public interface IHookedEntity + public class HookedEntity { - /// - /// Gets the impl type of the data context that triggered the hook. - /// - Type ContextType { get; } + private EntityEntry _entry; - /// - /// Gets the hooked entity entry - /// - DbEntityEntry Entry { get; } - - /// - /// Gets the hooked entity instance - /// - BaseEntity Entity { get; } - - /// - /// Gets the unproxied type of the hooked entity instance. - /// - Type EntityType { get; } - - /// - /// Gets or sets the initial (presave) state of the hooked entity. - /// The setter is for internal use only, don't invoke! - /// - EntityState InitialState { get; set; } - - /// - /// Gets or sets the current state of the hooked entity - /// - EntityState State { get; set; } - - /// - /// Gets a value indicating whether the entity state has changed during hooking. - /// - bool HasStateChanged { get; } - - /// - /// Gets a value indicating whether a property has been modified. - /// - /// Name of the property - bool IsPropertyModified(string propertyName); - - /// - /// Gets a value indicating whether the entity is in soft deleted state. - /// This is the case when the entity is an instance of - /// and the value of its Deleted property is true AND has changed since tracking. - /// But when the entity is not in modified state the snapshot comparison is omitted. - /// - bool IsSoftDeleted { get; } - } - - public class HookedEntity : IHookedEntity - { - private Type _entityType; - - public HookedEntity(IDbContext context, DbEntityEntry entry) - : this(context.GetType(), entry) + public HookedEntity(EntityEntry entry) { + _entry = entry; } - internal HookedEntity(Type contextType, DbEntityEntry entry) + public EntityEntry Entry { - ContextType = contextType; - Entry = entry; - InitialState = (EntityState)entry.State; + get { return _entry; } } - public Type ContextType + public Type EntityType { - get; + get { return _entry.Entity.GetType(); } } - public DbEntityEntry Entry + public BaseEntity Entity { - get; + get { return _entry.Entity as BaseEntity; } } - public BaseEntity Entity => Entry.Entity as BaseEntity; + public EntityState State + { + get { return _entry.State; } + } - public Type EntityType => _entityType ?? (_entityType = this.Entity?.GetUnproxiedType()); + public bool HasStateChanged + { + get + { + var currentState = _entry.State; + return InitialState != currentState; + } + } public EntityState InitialState { get; - set; + internal set; } - public EntityState State + public IDictionary ModifiedProperties { - get => (EntityState)Entry.State; - set => Entry.State = (EfState)((int)value); + get + { + var props = new Dictionary(); + + if (_entry.State == EntityState.Modified) + { + foreach (var prop in _entry.Properties) + { + if (prop.IsModified) + { + props[prop.Metadata.Name] = prop.CurrentValue; + } + } + } + + return props; + } } - public bool HasStateChanged => InitialState != State; - public bool IsPropertyModified(string propertyName) { Guard.NotEmpty(propertyName, nameof(propertyName)); - if (State == EntityState.Modified) + if (_entry.State == EntityState.Modified) { - var prop = Entry.Property(propertyName); - if (prop == null) - { - throw new SmartException($"An entity property '{propertyName}' does not exist."); - } - - return prop.CurrentValue != null && !prop.CurrentValue.Equals(prop.OriginalValue); + return _entry.Property(propertyName).IsModified; } return false; } - - public bool IsSoftDeleted - { - get - { - var entity = Entry.Entity as ISoftDeletable; - if (entity != null) - { - return Entry.State == EfState.Modified - ? entity.Deleted && IsPropertyModified("Deleted") - : entity.Deleted; - } - - return false; - } - } } } diff --git a/src/Libraries/SmartStore.Core/Data/IDbContext.cs b/src/Libraries/SmartStore.Core/Data/IDbContext.cs index 95224e0308..5044fca160 100644 --- a/src/Libraries/SmartStore.Core/Data/IDbContext.cs +++ b/src/Libraries/SmartStore.Core/Data/IDbContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Threading.Tasks; namespace SmartStore.Core.Data diff --git a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs index 430f4eabee..789a28b615 100644 --- a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs index dc5a3eed3e..67173d80eb 100644 --- a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs index 1fefc75eb2..f8cfc5e28a 100644 --- a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Linq.Expressions; diff --git a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs index 821d502963..30512c568a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs @@ -167,7 +167,7 @@ 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..734231995d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs @@ -173,7 +173,7 @@ 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..4cfc394f48 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs @@ -109,7 +109,7 @@ 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 +121,7 @@ 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..c6ae12425d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs @@ -90,7 +90,7 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// Gets or sets the visibility level of the product. /// [DataMember] - [Index] + public ProductVisibility Visibility { get; set; } /// @@ -216,7 +216,7 @@ public string Sku /// Gets or sets the manufacturer part number /// [DataMember] - [Index] + public string ManufacturerPartNumber { [DebuggerStepThrough] @@ -228,7 +228,7 @@ 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 +669,27 @@ 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; } /// @@ -760,7 +757,7 @@ public int? QuantityUnitId public bool BasePriceEnabled { get; set; } /// - /// Measure unit for the base price (e.g. "kg", "g", "qm�" etc.) + /// Measure unit for the base price (e.g. "kg", "g", "qm" etc.) /// [DataMember] public string BasePriceMeasureUnit { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs index 9043816b92..9761bab415 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs @@ -37,14 +37,14 @@ 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..38e10388ff 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs @@ -25,7 +25,7 @@ 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 +38,7 @@ 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..700272e7d3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs @@ -25,7 +25,7 @@ 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/ProductMediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs index ad7175b88e..1498dd7316 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductMediaFile.cs @@ -46,7 +46,6 @@ public partial class ProductMediaFile : BaseEntity, IMediaFile [DataMember] public int DisplayOrder { get; set; } - /// /// Gets the media file /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs index ace86b58ef..3d6546268a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs @@ -23,7 +23,7 @@ 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..55ffb4d6fd 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs @@ -18,7 +18,7 @@ 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 +51,14 @@ 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..a187c0c22e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs @@ -24,14 +24,14 @@ 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..685df9bf1e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs @@ -15,7 +15,7 @@ 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 +28,7 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the product variant attribute name /// [DataMember] - [Index] + public string Name { get; set; } /// @@ -65,14 +65,14 @@ 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..72d61a6173 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs @@ -20,11 +20,11 @@ public ProductVariantAttributeCombination() public string Sku { get; set; } [DataMember] - [Index] + public string Gtin { get; set; } [DataMember] - [Index] + public string ManufacturerPartNumber { get; set; } [DataMember] @@ -61,7 +61,7 @@ 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..0d68b3e96c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs @@ -43,7 +43,7 @@ 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..26406fa989 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs @@ -27,7 +27,7 @@ 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 +63,13 @@ 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 +125,13 @@ 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..1a68e840ed 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs @@ -35,7 +35,7 @@ public virtual ICollection Items /// /// 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 +59,7 @@ 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 +70,13 @@ 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/Customers/Customer.cs b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs index c0582bce24..6f54630e76 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs @@ -105,23 +105,21 @@ 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; } /// @@ -317,7 +315,6 @@ public virtual ICollection ForumPosts #region Utils - /// /// Gets a string identifier for the customer's roles by joining all role ids /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs index f5f8e96436..9dd3fba58e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs @@ -43,23 +43,21 @@ 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..3f720b941e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs @@ -26,7 +26,7 @@ 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..bebfc46b75 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs @@ -12,7 +12,7 @@ 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 +43,7 @@ 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/DataExchangeEnums.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs index 7872dc0072..c92fb9f124 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/DataExchangeEnums.cs @@ -2,7 +2,6 @@ { public delegate void ProgressValueSetter(int value, int maximum, string message); - /// /// Data exchange abortion types /// diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs index e14dc21145..186769e40a 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/ExportProfile.cs @@ -121,7 +121,6 @@ public ExportProfile() /// public bool Cleanup { get; set; } - /// /// The scheduling task /// diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs index 09230db0a7..c46df7d785 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs @@ -20,30 +20,28 @@ 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/Directory/DeliveryTime.cs b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs index 5d54d71d2d..21ef5b8174 100644 --- a/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs +++ b/src/Libraries/SmartStore.Core/Domain/Directory/DeliveryTime.cs @@ -78,7 +78,6 @@ public partial class DeliveryTime : BaseEntity, ILocalizedEntity #endregion } - /// /// Represents how to present delivery times. /// diff --git a/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountUsageHistory.cs b/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountUsageHistory.cs index 8419bc98ed..a09c1fa4bb 100644 --- a/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountUsageHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Discounts/DiscountUsageHistory.cs @@ -23,7 +23,6 @@ public partial class DiscountUsageHistory : BaseEntity /// public DateTime CreatedOnUtc { get; set; } - /// /// Gets or sets the discount /// diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs index b4cedb8d01..8375e7b484 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs @@ -13,7 +13,7 @@ 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 +59,7 @@ 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..0b6ecb105a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs @@ -28,7 +28,7 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported /// /// Gets or sets the display order /// - [Index] + public int DisplayOrder { get; set; } /// @@ -44,13 +44,13 @@ 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..8dd3396939 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs @@ -35,7 +35,7 @@ public partial class ForumPost : BaseEntity, IAuditable /// /// Gets or sets the date and time of instance creation /// - [Index] + public DateTime CreatedOnUtc { get; set; } /// @@ -46,7 +46,7 @@ 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..129e2ee781 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs @@ -12,7 +12,7 @@ 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 +23,19 @@ 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 +62,13 @@ 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 +79,7 @@ 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..b9870bad2d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs @@ -13,29 +13,28 @@ 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..843d37522a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs +++ b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs @@ -15,7 +15,7 @@ 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 +56,7 @@ 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..2a29224e03 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs @@ -15,7 +15,7 @@ public partial class Download : BaseEntity//, ITransient /// Gets or sets a GUID /// [DataMember] - [Index] + public Guid DownloadGuid { get; set; } /// @@ -34,14 +34,14 @@ 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 +60,14 @@ 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..989cd83d15 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs @@ -37,13 +37,7 @@ 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 +50,7 @@ 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 +69,7 @@ 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 +82,21 @@ 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 +138,7 @@ 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..36c1bb9fee 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs @@ -14,7 +14,7 @@ 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 +26,7 @@ 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..0e7c91a426 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs @@ -26,7 +26,7 @@ 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 +52,7 @@ 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 +67,7 @@ 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 +82,7 @@ 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..575667ec99 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,7 @@ 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..18e591456e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs @@ -20,14 +20,14 @@ 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 +40,7 @@ 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..3970aa1f71 100644 --- a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs @@ -130,7 +130,7 @@ 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/CheckoutEnums.cs b/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs index 1ba0d1c87e..3c62c14968 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/CheckoutEnums.cs @@ -21,7 +21,6 @@ public enum CheckoutNewsLetterSubscription Activated } - /// /// Setting to hand over customer email to third party /// diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs index d32337103c..c72694c1af 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs @@ -440,7 +440,7 @@ 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/Orders/RecurringPayment.cs b/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs index 02fce4bf05..e4ec2ee8e1 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/RecurringPayment.cs @@ -91,7 +91,6 @@ public DateTime? NextPaymentDate // } // } - // //calculate next payment date // if (latestPayment != null) // { @@ -178,9 +177,6 @@ public RecurringProductCyclePeriod CyclePeriod set => this.CyclePeriodId = (int)value; } - - - /// /// Gets or sets the recurring payment history /// diff --git a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs index aa2f64a941..faf5c2d633 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs @@ -13,7 +13,7 @@ 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/Seo/SeoSettings.cs b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs index 09c0ca7f5a..ef6ed38f15 100644 --- a/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs +++ b/src/Libraries/SmartStore.Core/Domain/Seo/SeoSettings.cs @@ -103,6 +103,5 @@ public SeoSettings() #endregion - } } \ No newline at end of file diff --git a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs index 52d602cb97..0c66a30e45 100644 --- a/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs +++ b/src/Libraries/SmartStore.Core/Domain/Stores/Store.cs @@ -123,7 +123,6 @@ public partial class Store : BaseEntity [DataMember] public virtual Currency PrimaryExchangeRateCurrency { get; set; } - /// /// Gets the security mode for the store /// diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs index bf04b013c6..f10e6f5550 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs @@ -37,13 +37,13 @@ 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 +56,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..ff3420b81d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs @@ -15,25 +15,25 @@ 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/Email/DefaultEmailSender.cs b/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs index 8973a9f3c9..5b380e8b1f 100644 --- a/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs +++ b/src/Libraries/SmartStore.Core/Email/DefaultEmailSender.cs @@ -58,7 +58,6 @@ protected virtual MailMessage BuildMailMessage(EmailMessage original) if (original.Headers != null) msg.Headers.AddRange(original.Headers); - msg.Priority = original.Priority; return msg; diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs index 6fd6e8d6fe..1e35592ad6 100644 --- a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs +++ b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Core.Events { diff --git a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs index 517bab695a..d0f55dbc72 100644 --- a/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/DateTimeExtensions.cs @@ -30,7 +30,6 @@ public static class DateTimeExtensions return value.HasValue ? value.Value.ToLocalTime() : (DateTime?)null; } - /// /// Returns a date that is rounded to the next even hour above the given /// date. diff --git a/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs index 24b46dddf9..cd6fb399e2 100644 --- a/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/DictionaryExtensions.cs @@ -108,7 +108,6 @@ public static ExpandoObject ToExpandoObject(this IDictionary sou return result; } - public static bool TryAdd(this IDictionary source, TKey key, TValue value, bool updateIfExists = false) { if (source == null || key == null) diff --git a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs index df752203cd..1e8d4fde7a 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs @@ -1,7 +1,6 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Collections.Generic; using System.Linq; -using System.Web.UI; - namespace SmartStore { public static class HtmlTextWriterExtensions @@ -19,3 +18,5 @@ public static void AddAttributes(this HtmlTextWriter writer, IDictionary _requestContext = value; } } -} \ No newline at end of file +} +#endif diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs index 4b5719ed6e..ca514309a6 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpResponse.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Text; using System.Web; @@ -31,4 +32,5 @@ public override string ApplyAppPathModifier(string virtualPath) public override HttpCookieCollection Cookies => _cookies; } -} \ No newline at end of file +} +#endif diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs index 6d45307e06..b4e3778041 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Collections; using System.Collections.Specialized; using System.Web; @@ -50,4 +51,5 @@ public override void Remove(string name) _sessionItems.Remove(name); } } -} \ No newline at end of file +} +#endif diff --git a/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs b/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs index 6205f1ca4b..9c6c363927 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakePrincipal.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Linq; using System.Security.Principal; @@ -14,7 +15,6 @@ public FakePrincipal(IIdentity identity, string[] roles) _roles = roles; } - public IIdentity Identity => _identity; public bool IsInRole(string role) @@ -22,4 +22,5 @@ public bool IsInRole(string role) return _roles != null && _roles.Contains(role); } } -} \ No newline at end of file +} +#endif diff --git a/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs b/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs index 6aee1b6e6a..9600024f17 100644 --- a/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs +++ b/src/Libraries/SmartStore.Core/Html/CodeFormatter/TsqlFormat.cs @@ -1,4 +1,4 @@ -#region Copyright � 2001-2003 Jean-Claude Manoli [jc@manoli.net] +#region Copyright 2001-2003 Jean-Claude Manoli [jc@manoli.net] /* * Based on code submitted by Mitsugi Ogawa. * @@ -45,7 +45,6 @@ public partial class TsqlFormat : CodeFormat /// public override bool CaseSensitive => false; - /// /// The list of T-SQL keywords. /// 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/IFileSystemExtensions.cs b/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs index ee815cc1e8..0ce464a82b 100644 --- a/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs +++ b/src/Libraries/SmartStore.Core/IO/IFileSystemExtensions.cs @@ -79,7 +79,6 @@ public static async Task ReadAllTextAsync(this IFileSystem fileSystem, s } } - public static void WriteAllBytes(this IFileSystem fileSystem, string path, byte[] contents) { Guard.NotEmpty(path, nameof(path)); @@ -146,7 +145,6 @@ public static async Task ReadAllBytesAsync(this IFileSystem fileSystem, } } - /// /// Tries to save a stream in the storage provider. /// diff --git a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs index 45bb9e8c77..c117f1c19d 100644 --- a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs +++ b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Utilities; namespace SmartStore.Core.IO @@ -695,8 +695,6 @@ private static string GetDirName(string fullPath) return fullPath; } - - private static long GetDirectorySize(DirectoryInfo directoryInfo) { long size = 0; diff --git a/src/Libraries/SmartStore.Core/IO/MimeTypes.cs b/src/Libraries/SmartStore.Core/IO/MimeTypes.cs index 50c8e79c3c..663812c3a8 100644 --- a/src/Libraries/SmartStore.Core/IO/MimeTypes.cs +++ b/src/Libraries/SmartStore.Core/IO/MimeTypes.cs @@ -759,7 +759,6 @@ public static string MapNameToMimeType(string fileNameOrExtension) } } - return DefaultMimeType; } diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs index a7eea24f4e..70089e5c4d 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs @@ -1,10 +1,11 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Web; -using System.Web.Caching; -using System.Web.Hosting; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Logging; using SmartStore.Utilities; @@ -159,3 +160,5 @@ public bool IsMalformedVirtualPath(string virtualPath) } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs index 2a7d3717f0..c075c41bc1 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs @@ -1,7 +1,8 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections.Generic; using System.IO; -using System.Web.Caching; +using Microsoft.Extensions.Caching.Memory; namespace SmartStore.Core.IO { @@ -38,3 +39,5 @@ public static CacheDependency GetCacheDependency(this IVirtualPathProvider vpp, } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/IPageable.cs b/src/Libraries/SmartStore.Core/IPageable.cs index d0d046c4c0..57ac9d82d5 100644 --- a/src/Libraries/SmartStore.Core/IPageable.cs +++ b/src/Libraries/SmartStore.Core/IPageable.cs @@ -30,7 +30,6 @@ public interface IPageable : IEnumerable [DataMember] int TotalCount { get; set; } - /// /// The 1-based current page index /// @@ -76,7 +75,6 @@ public interface IPageable : IEnumerable bool IsLastPage { get; } } - /// /// Paged list interface /// diff --git a/src/Libraries/SmartStore.Core/IWebHelper.cs b/src/Libraries/SmartStore.Core/IWebHelper.cs index 31cd154105..c72da57953 100644 --- a/src/Libraries/SmartStore.Core/IWebHelper.cs +++ b/src/Libraries/SmartStore.Core/IWebHelper.cs @@ -92,7 +92,6 @@ public partial interface IWebHelper /// The physical path. E.g. "c:\inetpub\wwwroot\bin" string MapPath(string path); - /// /// Modifies query string /// diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs index 14b51e277c..2ff6816d8d 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs @@ -1,8 +1,9 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Filters; using SmartStore.Core.Logging; @@ -178,3 +179,5 @@ class StarterModule } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs index ae9af5f59e..bd225a87e5 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Runtime.Remoting.Messaging; using System.Web; @@ -87,3 +88,5 @@ private string BuildKey() } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs index d32030bcbd..445a4c7b36 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Web; using Autofac.Integration.Mvc; @@ -61,7 +62,6 @@ public static void SetLifetimeScopeProvider(ILifetimeScopeProvider lifetimeScope LifetimeScopeProvider = lifetimeScopeProvider ?? throw new ArgumentNullException("lifetimeScopeProvider"); } - internal static ILifetimeScopeProvider LifetimeScopeProvider { get; @@ -74,3 +74,5 @@ public void Dispose() } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs index eab1548dc0..da7b2f6cba 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using Autofac; using Autofac.Integration.Mvc; @@ -30,3 +31,5 @@ public ILifetimeScope GetLifetimeScope(Action configurationAct } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs index 5fabdf7d55..e27b85fb97 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs @@ -3,7 +3,7 @@ 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; diff --git a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs index 4b6981b2ef..0b76b99458 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/WebAppTypeFinder.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Logging; using SmartStore.Core.Plugins; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs b/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs index 85df064f60..018e61bad4 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expanders/LambdaPathExpander.cs @@ -147,7 +147,6 @@ private void DoExpand(Type type, string path) // DoExpand(type, path); - // //for (int i = 0; i < members.Count; i++) // //{ // // string member = members[i]; diff --git a/src/Libraries/SmartStore.Core/Linq/Expressions/ExpressionVisitor.cs b/src/Libraries/SmartStore.Core/Linq/Expressions/ExpressionVisitor.cs index 63cf7761fd..71d94202fe 100644 --- a/src/Libraries/SmartStore.Core/Linq/Expressions/ExpressionVisitor.cs +++ b/src/Libraries/SmartStore.Core/Linq/Expressions/ExpressionVisitor.cs @@ -5,7 +5,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq.Expressions; - /* * NOTE: This class was re-used from the NHibernate.Linq project. */ diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs index be5b37a6b1..2c9ebfacb8 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs @@ -112,7 +112,6 @@ protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent) } } - // Url & stuff if (container.TryResolve(null, out IWebHelper webHelper)) { diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs index b949429081..35ef73ca8a 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs @@ -3,7 +3,7 @@ using System.Data; using System.IO; using System.Linq; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using log4net; using log4net.Appender; using log4net.Config; @@ -94,7 +94,6 @@ public void FlushAll() } } - #region IRegisteredObject public void Stop(bool immediate) diff --git a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs index 988efe48c4..c263be355b 100644 --- a/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/FolderUpdater.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.IO; @@ -112,3 +113,5 @@ private void GetFolderContent(DirectoryInfo folder, string prefix, List } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs index 644b6b15a7..a0717ea186 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/ExtensionReferenceRepository.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Collections.Generic; using System.Linq; using NuGet; @@ -35,7 +36,6 @@ public override void AddPackage(IPackage package) { } public override void RemovePackage(IPackage package) { } - public override string Source => Project.Root; public override bool SupportsPrereleasePackages => true; @@ -98,3 +98,5 @@ public override IQueryable GetPackages() } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs index 22e5a3c580..7089119c5e 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/FileBasedProjectSystem.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.IO; using System.Runtime.Versioning; @@ -83,3 +84,5 @@ public dynamic GetPropertyValue(string propertyName) } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs index 8a2942f601..3d6085cf65 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/NugetLogger.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using NuGet; using SmartStore.Core.Logging; @@ -39,3 +40,5 @@ public FileConflictResolution ResolveFileConflict(string message) } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs b/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs index 24d9271ae6..465af26856 100644 --- a/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs +++ b/src/Libraries/SmartStore.Core/Packaging/NuGet/NullSourceRepository.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System.Linq; using NuGet; @@ -22,3 +23,5 @@ public override void AddPackage(IPackage package) { } public override void RemovePackage(IPackage package) { } } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs b/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs index d3d23fda59..f97666110f 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections.Generic; using System.IO; @@ -35,7 +36,6 @@ private static bool IgnoreFile(string filePath) _ignoredThemeExtensions.Contains(Path.GetExtension(filePath).NullEmpty() ?? ""); } - public Stream BuildPackage(PluginDescriptor pluginDescriptor) { return BuildPackage(pluginDescriptor.ConvertToExtensionDescriptor()); @@ -136,7 +136,6 @@ private static void EmbedVirtualFile(BuildContext context, string relativePath) context.Builder.Files.Add(file); } - #region Nested type: BuildContext private class BuildContext @@ -187,3 +186,5 @@ public Stream GetStream() #endregion } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs b/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs index 98e98970dd..73250492b6 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Diagnostics.CodeAnalysis; using System.IO; @@ -294,3 +295,5 @@ private void UninstallExtensionIfNeeded(IPackage package) } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs b/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs index 0e399621c1..b31bbbcdb9 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackageManager.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.IO; using SmartStore.Core.Plugins; @@ -93,3 +94,5 @@ public PackagingResult BuildThemePackage(string themeName) } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs index cbaa6e0cd0..62fed8b7fe 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs @@ -1,7 +1,8 @@ +#if false // TODO: .NET 8 migration - temporarily disabled 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; @@ -145,3 +146,5 @@ internal static ExtensionDescriptor GetExtensionDescriptor(this IPackage package } } + +#endif diff --git a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs index 0e5cae0836..3b5986b81a 100644 --- a/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs +++ b/src/Libraries/SmartStore.Core/Packaging/Updater/AppUpdater.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; @@ -463,3 +464,5 @@ protected override void OnDispose(bool disposing) } } + +#endif 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..4c6ee27dbb 100644 --- a/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs +++ b/src/Libraries/SmartStore.Core/Plugins/IConfigurable.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +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..21680e15c8 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -7,7 +7,6 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Web; -using System.Web.Compilation; using Microsoft.Web.Infrastructure.DynamicModuleHelper; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; @@ -21,7 +20,6 @@ // SEE THIS POST for full details of what this does //http://shazwazza.com/post/Developing-a-plugin-framework-in-ASPNET-with-medium-trust.aspx -[assembly: PreApplicationStartMethod(typeof(PluginManager), "Initialize")] namespace SmartStore.Core.Plugins { /// @@ -530,7 +528,6 @@ private static void SetPrivateEnvPath() envPath = envPath.EnsureEndsWith(";") + Path.Combine(AppDomain.CurrentDomain.RelativeSearchPath, "x86"); } - Environment.SetEnvironmentVariable("PATH", envPath, EnvironmentVariableTarget.Process); } 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..92ef06a9f1 100644 --- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs +++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs @@ -17,7 +17,7 @@ public partial class RuleEntity : BaseEntity [DataMember] [Required, StringLength(100)] - [Index("IX_PageBuilder_RuleType")] + public string RuleType { get; set; } //[DataMember] @@ -33,7 +33,7 @@ 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..7a50b106a9 100644 --- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs +++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs @@ -29,18 +29,16 @@ 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; } + 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/Operators/ListOperators.cs b/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs index 12b3b240ca..a7d4f0c391 100644 --- a/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs +++ b/src/Libraries/SmartStore.Core/Rules/Operators/ListOperators.cs @@ -56,7 +56,6 @@ protected override Expression GenerateExpression(Expression left /* member expre //} } - internal class NotAllInOperator : AllInOperator { internal NotAllInOperator() diff --git a/src/Libraries/SmartStore.Core/Rules/Rendering/RuleOptionsResult.cs b/src/Libraries/SmartStore.Core/Rules/Rendering/RuleOptionsResult.cs index 26e590367e..719faf4076 100644 --- a/src/Libraries/SmartStore.Core/Rules/Rendering/RuleOptionsResult.cs +++ b/src/Libraries/SmartStore.Core/Rules/Rendering/RuleOptionsResult.cs @@ -16,7 +16,6 @@ public enum RuleOptionsRequestReason SelectedDisplayNames } - public class RuleOptionsResult { public RuleOptionsResult() : this(null) diff --git a/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs b/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs index 8bba30e8e6..687e277e80 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleDescriptor.cs @@ -40,7 +40,6 @@ public RuleOperator[] Operators } } - public class InvalidRuleDescriptor : RuleDescriptor { public InvalidRuleDescriptor(RuleScope scope) 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/Rules/_Old/MemberAccessTokenizer.cs b/src/Libraries/SmartStore.Core/Rules/_Old/MemberAccessTokenizer.cs index 70e80e8b5b..4c8d3f3850 100644 --- a/src/Libraries/SmartStore.Core/Rules/_Old/MemberAccessTokenizer.cs +++ b/src/Libraries/SmartStore.Core/Rules/_Old/MemberAccessTokenizer.cs @@ -39,6 +39,5 @@ // return null; // } - // } //} diff --git a/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs b/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs index aa6ddba8a6..d8caabc744 100644 --- a/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs +++ b/src/Libraries/SmartStore.Core/Search/Filter/SearchFilter.cs @@ -153,7 +153,6 @@ private static SearchFilter ByField(string fieldName, object term, IndexTypeCode }; } - public static RangeSearchFilter ByRange(string fieldName, string lower, string upper, bool includeLower = true, bool includeUpper = true) { return ByRange(fieldName, lower, upper, IndexTypeCode.String, includeLower, includeUpper); diff --git a/src/Libraries/SmartStore.Core/Search/SearchQuery.cs b/src/Libraries/SmartStore.Core/Search/SearchQuery.cs index b9e10af195..a2bb1ac5d3 100644 --- a/src/Libraries/SmartStore.Core/Search/SearchQuery.cs +++ b/src/Libraries/SmartStore.Core/Search/SearchQuery.cs @@ -205,7 +205,6 @@ public TQuery BuildHits(bool build) ResultFlags &= ~SearchResultFlags.WithHits; } - return (this as TQuery); } @@ -220,7 +219,6 @@ public TQuery BuildFacetMap(bool build) ResultFlags &= ~SearchResultFlags.WithFacets; } - return (this as TQuery); } diff --git a/src/Libraries/SmartStore.Core/Security/IPermissionService.cs b/src/Libraries/SmartStore.Core/Security/IPermissionService.cs index 4acfba9ad5..f013e55158 100644 --- a/src/Libraries/SmartStore.Core/Security/IPermissionService.cs +++ b/src/Libraries/SmartStore.Core/Security/IPermissionService.cs @@ -54,7 +54,6 @@ public partial interface IPermissionService /// Permission. void DeletePermission(PermissionRecord permission); - /// /// Gets a permission role mapping. /// @@ -80,7 +79,6 @@ public partial interface IPermissionService /// Permission role mapping. void DeletePermissionRoleMapping(PermissionRoleMapping mapping); - /// /// Installs permissions. Permissions are automatically installed by . /// @@ -88,7 +86,6 @@ public partial interface IPermissionService /// Whether to remove permissions no longer supported by the providers. void InstallPermissions(IPermissionProvider[] permissionProviders, bool removeUnusedPermissions = false); - /// /// Authorize permission. /// @@ -127,7 +124,6 @@ public partial interface IPermissionService /// true authorized otherwise false. bool AuthorizeByAlias(string permissionSystemName); - /// /// Search all child permissions for an authorization (initial permission included). /// @@ -143,7 +139,6 @@ public partial interface IPermissionService /// true authorization found otherwise false. bool FindAuthorization(string permissionSystemName, Customer customer); - /// /// Gets the permission tree for a customer role. /// diff --git a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs index b1e4b0399c..6209758cd2 100644 --- a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs +++ b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Core.Security { diff --git a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs index 48d48e2d78..e80c04af53 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 @@ -20,7 +20,6 @@ public SmartStoreIdentity(int customerId, string name, string type) public override bool IsAuthenticated => CustomerId != 0; } - public class SmartStorePrincipal : IPrincipal { public SmartStorePrincipal(Customer customer, string type) diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index cd84ae4268..20d437e19c 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -1,810 +1,41 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {6BDA8332-939F-45B7-A25E-7A797260AE59} - Library - Properties - SmartStore.Core + net8.0 SmartStore.Core - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 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 + SmartStore.Core + latest + disable + disable + false + - - ..\..\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/IThemeRegistry.cs b/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs index c095783f33..485ea77aa4 100644 --- a/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs +++ b/src/Libraries/SmartStore.Core/Themes/IThemeRegistry.cs @@ -94,7 +94,6 @@ public partial interface IThemeRegistry event EventHandler BaseThemeChanged; } - public class ThemeFileChangedEventArgs : EventArgs { public string FullPath { get; set; } diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs b/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs index f6609f6cc0..fba3e083bb 100644 --- a/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs +++ b/src/Libraries/SmartStore.Core/Themes/ThemeVariableInfo.cs @@ -44,7 +44,6 @@ public string TypeAsString /// public ThemeManifest Manifest { get; internal set; } - protected override void OnDispose(bool disposing) { if (disposing) 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/DictionaryConverter.cs b/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs index 80417db07f..ac18e8b247 100644 --- a/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs +++ b/src/Libraries/SmartStore.Core/Utilities/DictionaryConverter.cs @@ -214,7 +214,6 @@ private static object RetrieveArrayValues(PropertyInfo arrayProp, IDictionary problems) { WriteToProperty(item, prop, value, problems); diff --git a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs index b54d69e003..68c0d8d14f 100644 --- a/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs +++ b/src/Libraries/SmartStore.Core/Utilities/FileDownloadManager.cs @@ -1,3 +1,4 @@ +#if false // TODO: .NET 8 migration - temporarily disabled using System; using System.Collections.Generic; using System.IO; @@ -224,7 +225,6 @@ private async Task ProcessUrl(FileDownloadManagerContext context, HttpClient cli } } - public class FileDownloadResponse { public FileDownloadResponse(byte[] data, string fileName, string contentType) @@ -343,4 +343,5 @@ public override string ToString() return str; } } -} \ No newline at end of file +} +#endif diff --git a/src/Libraries/SmartStore.Core/Utilities/Range.cs b/src/Libraries/SmartStore.Core/Utilities/Range.cs index 7b10f3e6c3..11342ff2a4 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Range.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Range.cs @@ -28,7 +28,6 @@ public static IEnumerable Create(int count) return Enumerable.Range(0, count); } - /// /// Creates sequence of the integral numbers within the specified range /// @@ -52,7 +51,6 @@ public static IEnumerable Repeat(TResult item, int count) return Enumerable.Repeat(item, count); } - /// /// Creates the generator to iterate from 1 to . /// diff --git a/src/Libraries/SmartStore.Core/Utilities/Retry.cs b/src/Libraries/SmartStore.Core/Utilities/Retry.cs index a7ec849ce6..60276246b0 100644 --- a/src/Libraries/SmartStore.Core/Utilities/Retry.cs +++ b/src/Libraries/SmartStore.Core/Utilities/Retry.cs @@ -74,7 +74,6 @@ public static T Run(Func operation, int attempts, TimeSpan? wait, Action /// Executes an asynchronous action with retry logic. /// diff --git a/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs b/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs index 72cd4bf8b6..f7f4d0ec86 100644 --- a/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs +++ b/src/Libraries/SmartStore.Core/Utilities/StringTokenizer.cs @@ -44,7 +44,6 @@ private string GetNext() // Char an aktueller Cursor-Position char ch = _text[_pos]; - if (_delim.IndexOf(ch) != -1) // Ist Char ein Delim-Zeichen?... { // ...ja! diff --git a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs index aa426e1762..b5e762966e 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs @@ -4,7 +4,7 @@ using System.Data.Entity.Core.EntityClient; using System.Data.Entity.Core.Metadata.Edm; using System.Data.Entity.Core.Objects; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using System.Reflection; using SmartStore.ComponentModel; diff --git a/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs b/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs index 83fe2f2d99..54ac45dab1 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Diagnostics; using System.IO; using System.Reflection; diff --git a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs index 85c0d10238..ccd0c813b2 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Core.Mapping; using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.Entity.Infrastructure.MappingViews; using System.IO; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/EfRepository.cs b/src/Libraries/SmartStore.Data/EfRepository.cs index 04934f60d3..7a13e159da 100644 --- a/src/Libraries/SmartStore.Data/EfRepository.cs +++ b/src/Libraries/SmartStore.Data/EfRepository.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Validation; using System.Linq; using System.Linq.Expressions; diff --git a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs index 1dace89f64..044345cf3c 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; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Diagnostics; using System.Linq; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs index 1543a8ba41..1b012f4c07 100644 --- a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using SmartStore.Core.Data; using EfState = System.Data.Entity.EntityState; diff --git a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs index 6f685642a4..dedc713841 100644 --- a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Data.Entity.Core; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; namespace SmartStore diff --git a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs index 68b043a6a5..724433ab44 100644 --- a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs @@ -1,6 +1,6 @@ using System; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; using System.Linq; using System.Linq.Expressions; diff --git a/src/Libraries/SmartStore.Data/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..55b808569e 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Affiliates; namespace SmartStore.Data.Mapping.Affiliates diff --git a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs index 99f73ff900..0d5f2974cd 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Blogs; namespace SmartStore.Data.Mapping.Blogs diff --git a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs index bca23be8d1..26d50451d0 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Blogs; namespace SmartStore.Data.Mapping.Blogs diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs index 3767cac539..e1d06fe561 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs index 21705b06ae..b320d4657b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs index bc7e36b94c..d4829b5bd4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs index 1dd181d475..28df49819a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs index f74f5cd16d..7db3fc672b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs index 2cd85a86b6..815689ac91 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs index fafd737864..8fd0fd01a8 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs index 5580f04f00..a80c7e36f3 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.Metadata.Builders; 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..f892eb8f4d 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.Metadata.Builders; 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..03cbb01ae0 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.Metadata.Builders; 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..9f13a2bcba 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.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs index d4d26e1ff8..cf5697ae2a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs index a707bed719..cf46e7bd51 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog @@ -14,7 +14,6 @@ public ProductManufacturerMap() .WithMany() .HasForeignKey(pm => pm.ManufacturerId); - this.HasRequired(pm => pm.Product) .WithMany(p => p.ProductManufacturers) .HasForeignKey(pm => pm.ProductId); diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs index 387c86a13a..c077cf0e4c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs index 7996718c6c..318076b136 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs index d49b4f18b0..37f0a221cf 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs index ce61d806b7..3e7e8dfd9c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs index 4daffdc1d7..dea1ddc077 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog @@ -14,7 +14,6 @@ public ProductSpecificationAttributeMap() .WithMany(sao => sao.ProductSpecificationAttributes) .HasForeignKey(psa => psa.SpecificationAttributeOptionId); - this.HasRequired(psa => psa.Product) .WithMany(p => p.ProductSpecificationAttributes) .HasForeignKey(psa => psa.ProductId); diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs index 77e82b37ca..366f90f409 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs index d596e09131..b5724b4780 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs index 7e91dbe2a0..bb2fcc4e81 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs index 8bc170faa6..0d8b325500 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs index 5bc9a202ff..405a43d841 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs index 06b9acf7fd..7fbca3b21a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs index ed57c5b86d..37cf97c9af 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs index a7f7d5a2f5..53acac813f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs index 9f3b5d80d2..d033e566d7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs b/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs index 08618ac9b8..f4dd6248cc 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.Metadata.Builders; 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..7a16f2eac3 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Common; namespace SmartStore.Data.Mapping.Common diff --git a/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs b/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs index 0892840b65..3167ef8487 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Configuration; namespace SmartStore.Data.Mapping.Configuration diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs index fc7466ca9c..bfac3ae710 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs index 817228436a..1ee2da8007 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs index 35a76ed019..30f851c4f7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs index 90359ba9c9..c30c89842b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs index 81fc8dd484..5713346d30 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs index 336620879c..b7cc66bc8c 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.Metadata.Builders; 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..afcd3a76ab 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.Metadata.Builders; 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..02f3ea575f 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.Metadata.Builders; 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..d61ddee0a1 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.Metadata.Builders; 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..0e5189dd2a 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.Metadata.Builders; 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..edc022765f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs index 32a9ef1701..a533d4d90a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs index 7672cd962a..dbe3ef22b4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs index 019a3a8cbb..a9f0b6a38d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs index 3291d5ae30..128e1ba66e 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs index a840571e67..64cc1b717a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs index fd2e6c52c2..3ee375c865 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory @@ -12,7 +12,6 @@ public StateProvinceMap() this.Property(sp => sp.Name).IsRequired().HasMaxLength(100); this.Property(sp => sp.Abbreviation).HasMaxLength(100); - this.HasRequired(sp => sp.Country) .WithMany(c => c.StateProvinces) .HasForeignKey(sp => sp.CountryId); diff --git a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs index 0136595340..9a816c21be 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Discounts; namespace SmartStore.Data.Mapping.Discounts diff --git a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs index 2ef6b8b368..cf0c49f6f9 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Discounts; namespace SmartStore.Data.Mapping.Discounts diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs index c838c6d893..354bf47cdb 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.Metadata.Builders; 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..b30d0f1014 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.Metadata.Builders; 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..0e6ec60b45 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.Metadata.Builders; 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..0a722ed208 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.Metadata.Builders; 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..2718101bc5 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.Metadata.Builders; 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..2e5e5b5f4d 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.Metadata.Builders; 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..81d7c5926c 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.Metadata.Builders; 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..eae0acd591 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs index 077168007a..718332b2fa 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization @@ -12,7 +12,6 @@ public LocaleStringResourceMap() this.Property(lsr => lsr.ResourceName).IsRequired().HasMaxLength(200); this.Property(lsr => lsr.ResourceValue).IsRequired().IsMaxLength(); - this.HasRequired(lsr => lsr.Language) .WithMany(l => l.LocaleStringResources) .HasForeignKey(lsr => lsr.LanguageId); diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs index 0caaa0f2cd..a48c104787 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs index b68c55ae20..c9c83a0089 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.Metadata.Builders; 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..e25357aade 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.Metadata.Builders; 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..3e0efeccf1 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Logging; namespace SmartStore.Data.Mapping.Logging diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs index 2b94e64c0c..f034b44629 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs index e95f99ddeb..42c328aaff 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs index 3873f15a54..d6eb61722e 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.Metadata.Builders; 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..c718d5fbc5 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.Metadata.Builders; 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..fc32e926e0 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.Metadata.Builders; 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..86c31d5995 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.Metadata.Builders; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs index bc5a713680..66ce9b888d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs index e2109fbc89..e31a67a343 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs index 67d301bc0c..07a5eb464c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs index a9dc296150..b7bdfa1da7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs index 8ac9b15950..78f29580d5 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.Metadata.Builders; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs index 9ef6a7ebe2..549bc6e8a6 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs b/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs index 13317df3ff..80533e23c9 100644 --- a/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.News; namespace SmartStore.Data.Mapping.News diff --git a/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs index 5e99db7272..277122382b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.News; namespace SmartStore.Data.Mapping.News diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs index dd2511ce59..ff233e4753 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs index bab207962c..a24a15ce82 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs index 40201e3105..8335718881 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs index bb054850df..b13ab2d5ca 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs index f07ec73c2b..81cc319cfe 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs index 43d7722631..3c180d5e8d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs index f05a9e653f..0b18222ff4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs index 2e2a9d2bda..ecbe98237b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs index 9160cead42..f633f2363b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders @@ -14,8 +14,6 @@ public RecurringPaymentMap() this.Ignore(rp => rp.CyclesRemaining); this.Ignore(rp => rp.CyclePeriod); - - //this.HasRequired(rp => rp.InitialOrder).WithOptional().Map(x => x.MapKey("InitialOrderId")).WillCascadeOnDelete(false); this.HasRequired(rp => rp.InitialOrder) .WithMany() diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs index 67776065ba..7e094f2950 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs index 661c658e1d..9e41e42ebc 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.Metadata.Builders; 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..32fba29374 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.Metadata.Builders; 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..4d1db4810d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Polls; namespace SmartStore.Data.Mapping.Polls diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs index 1f2eaf2e54..ec29a6be6d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Polls; namespace SmartStore.Data.Mapping.Polls diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs index 8e6ff8b3e2..26502c67be 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Polls; namespace SmartStore.Data.Mapping.Polls diff --git a/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs b/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs index 74f4f452f2..104b071145 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Rules.Domain; namespace SmartStore.Data.Mapping.Rules diff --git a/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs index 7c3f705d9a..5a6c969d59 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Security; namespace SmartStore.Data.Mapping.Seo diff --git a/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs index 145234dee3..bda65a4fbc 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Security; namespace SmartStore.Data.Mapping.Security diff --git a/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs index 21bbc06a50..73967485d8 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.Metadata.Builders; 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..0aa5debf1f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs index 056cd938de..732b41ccda 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs index 457c769e63..18d6bbaed2 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.Metadata.Builders; 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..6761aa9417 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.Metadata.Builders; 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..2725576eb3 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.Metadata.Builders; 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..6dd30df75b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Tasks; namespace SmartStore.Data.Mapping.Tasks diff --git a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs index 1e3c8f8818..81c7bb814d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Tasks; namespace SmartStore.Data.Mapping.Tasks diff --git a/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs index 66a8032821..f7272c2615 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.Metadata.Builders; 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..a7e165d8db 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs @@ -1,5 +1,5 @@  -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Core.Domain.Themes; namespace SmartStore.Data.Mapping.Themes diff --git a/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs b/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs index acc15e4e16..04c9bb7416 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.Metadata.Builders; using SmartStore.Core.Domain.Topics; namespace SmartStore.Data.Mapping.Topics diff --git a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs index 5f2db2e10f..d0d118de45 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs index 0cbb97ef49..1faf60a55a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using Core.Data; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs index cd4527c919..f89509098b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; using System.IO; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs index cb8df2f1fb..a9929a33e0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; using System.Linq; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Localization; using SmartStore.Data.Setup; @@ -74,7 +74,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Allowed template variables", "Erlaubte Template Variablen", "Inserts the selected variable in the HTML document.", - "F�gt die gew�hlte Variable in das HTML-Dokument ein."); + "Fgt die gewhlte Variable in das HTML-Dokument ein."); } private Language ResolveMasterLanguage(SmartObjectContext context) diff --git a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs index 346a3c8e6c..7ad21153ad 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs @@ -81,9 +81,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.MaxItemsToDisplayInCatalogMenu", "Max items to display in catalog menu", - "Maximale Anzahl von Elementen im Katalogmen�", + "Maximale Anzahl von Elementen im Katalogmen", "Defines the maximum number of top level items to be displayed in the main catalog menu. All menu items which are exceeding this limit will be placed in a new dropdown menu item.", - "Legt die maximale Anzahl von Menu-Eintr�gen der obersten Hierarchie fest, die im Katalogmen� angezeigt werden. Alle weiteren Menu-Eintr�ge werden innerhalb eines neuen Dropdownmenus ausgegeben."); + "Legt die maximale Anzahl von Menu-Eintrgen der obersten Hierarchie fest, die im Katalogmen angezeigt werden. Alle weiteren Menu-Eintrge werden innerhalb eines neuen Dropdownmenus ausgegeben."); builder.AddOrUpdate("CatalogMenu.MoreLink", "More", "Mehr"); @@ -111,29 +111,29 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Languages.CheckAvailableLanguagesFailed", "An error occurred while checking for other available languages.", - "Bei der Suche nach weiteren verf�gbaren Sprachen trat ein Fehler auf."); + "Bei der Suche nach weiteren verfgbaren Sprachen trat ein Fehler auf."); builder.AddOrUpdate("Admin.Configuration.Languages.NoAvailableLanguagesFound", "There were no other available languages found for version {0}. On translate.smartstore.com you will find more details about available resources.", - "Es wurden keine weiteren verf�gbaren Sprachen f�r Version {0} gefunden. Auf translate.smartstore.com finden Sie weitere Details zu verf�gbaren Ressourcen."); + "Es wurden keine weiteren verfgbaren Sprachen fr Version {0} gefunden. Auf translate.smartstore.com finden Sie weitere Details zu verfgbaren Ressourcen."); builder.AddOrUpdate("Admin.Configuration.Languages.InstalledLanguages", "Installed Languages", "Installierte Sprachen"); builder.AddOrUpdate("Admin.Configuration.Languages.AvailableLanguages", "Available Languages", - "Verf�gbare Sprachen"); + "Verfgbare Sprachen"); builder.AddOrUpdate("Admin.Configuration.Languages.AvailableLanguages.Note", "Click Download to install a new language including all localized resources. On translate.smartstore.com you will find more details about available resources.", - "Klicken Sie auf Download, um eine neue Sprache mit allen lokalisierten Ressourcen zu installieren. Auf translate.smartstore.com finden Sie weitere Details zu verf�gbaren Ressourcen."); + "Klicken Sie auf Download, um eine neue Sprache mit allen lokalisierten Ressourcen zu installieren. Auf translate.smartstore.com finden Sie weitere Details zu verfgbaren Ressourcen."); builder.AddOrUpdate("Common.Translated", "Translated", - "�bersetzt"); + "bersetzt"); builder.AddOrUpdate("Admin.Configuration.Languages.TranslatedPercentage", "{0}% translated", - "{0}% �bersetzt"); + "{0}% bersetzt"); builder.AddOrUpdate("Admin.Configuration.Languages.TranslatedPercentageAtLastImport", "{0}% at the last import", "{0}% beim letzten Import"); @@ -151,23 +151,23 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Languages.OnePublishedLanguageRequired", "At least one published language is required.", - "Mindestens eine ver�ffentlichte Sprache ist erforderlich."); + "Mindestens eine verffentlichte Sprache ist erforderlich."); builder.AddOrUpdate("Admin.Configuration.Languages.Fields.AvailableLanguageSetId", "Available Languages", - "Verf�gbare Sprachen", + "Verfgbare Sprachen", "Specifies the available language whose localized resources are to be imported.", - "Legt die verf�gbare Sprache fest, deren lokalisierte Ressourcen importiert werden sollen."); + "Legt die verfgbare Sprache fest, deren lokalisierte Ressourcen importiert werden sollen."); builder.AddOrUpdate("Admin.Configuration.Languages.UploadFileOrSelectLanguage", "Please upload an import file or select an available language whose resources are to be imported.", - "Bitte laden Sie eine Importdatei hoch oder w�hlen Sie eine verf�gbare Sprache, deren Ressourcen importiert werden sollen."); + "Bitte laden Sie eine Importdatei hoch oder whlen Sie eine verfgbare Sprache, deren Ressourcen importiert werden sollen."); builder.AddOrUpdate("Admin.Configuration.Settings.Shipping.ChargeOnlyHighestProductShippingSurcharge", "Charge the highest shipping surcharge only", - "Nur den h�chsten Transportzuschlag berechnen", + "Nur den hchsten Transportzuschlag berechnen", "Specifies whether to charge only the highest additional shipping surcharge of products.", - "Bestimmt ob bei der Berechnung der Versandkosten nur der h�chste Transportzuschlag von Produkten ber�cksichtigt wird."); + "Bestimmt ob bei der Berechnung der Versandkosten nur der hchste Transportzuschlag von Produkten bercksichtigt wird."); builder.AddOrUpdate("Order.OrderDetails") .Value("en", "Order Details"); @@ -176,11 +176,11 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Generate absolute URLs", "Absolute URLs erzeugen", "Generates absolute URLs for media files by prepending the current host name (e.g. http://myshop.com/media/image/1.jpg instead of /media/image/1.jpg). Has no effect if a CDN URL has been applied to the store.", - "Erzeugt absolute URLs f�r Mediendateien, indem der aktuelle Hostname vorangestellt wird (z.B. http://meinshop.de/media/image/1.jpg statt /media/image/1.jpg). Hat keine Auswirkung, wenn f�r den Store eine CDN-URL eingerichtet wurde."); + "Erzeugt absolute URLs fr Mediendateien, indem der aktuelle Hostname vorangestellt wird (z.B. http://meinshop.de/media/image/1.jpg statt /media/image/1.jpg). Hat keine Auswirkung, wenn fr den Store eine CDN-URL eingerichtet wurde."); builder.AddOrUpdate("Admin.Configuration.Settings.Search.SearchFieldsNote", "The Name, SKU and Short Description fields can be searched in the standard search. Other fields require a search plugin such as the MegaSearch plugin from Premium Edition.", - "In der Standardsuche k�nnen die Felder Name, SKU und Kurzbeschreibung durchsucht werden. F�r weitere Felder ist ein Such-Plugin wie etwa das MegaSearch-Plugin aus der Premium Edition notwendig."); + "In der Standardsuche knnen die Felder Name, SKU und Kurzbeschreibung durchsucht werden. Fr weitere Felder ist ein Such-Plugin wie etwa das MegaSearch-Plugin aus der Premium Edition notwendig."); builder.AddOrUpdate("Admin.DataExchange.Import.FolderName", "Folder path", "Ordnerpfad"); @@ -201,7 +201,6 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "The message template has been copied successfully.", "Die Nachrichtenvorlage wurde erfolgreich kopiert."); - builder.AddOrUpdate("Enums.SmartStore.Core.Domain.DataExchange.ExportEntityType.ShoppingCartItem", "Shopping Cart", "Warenkorb"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Orders.ShoppingCartType.ShoppingCart", "Shopping Cart", "Warenkorb"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Orders.ShoppingCartType.Wishlist", "Wishlist", "Wunschliste"); @@ -210,7 +209,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Do not export bundled products", "Keine Produkt-Bundle exportieren", "Specifies whether to export bundled products. If this option is activated, then the associated bundle items will be exported.", - "Legt fest, ob Produkt-Bundle exportiert werden sollen. Ist diese Option aktiviert, so werden die zum Bundle geh�renden Produkte (Bundle-Bestandteile) exportiert."); + "Legt fest, ob Produkt-Bundle exportiert werden sollen. Ist diese Option aktiviert, so werden die zum Bundle gehrenden Produkte (Bundle-Bestandteile) exportiert."); builder.AddOrUpdate("Admin.DataExchange.Export.Filter.ShoppingCartTypeId", "Shopping cart type", @@ -222,26 +221,26 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Account.AccountActivation.InvalidEmailOrToken", "Unknown email or token. Please register again.", - "Unbekannte E-Mail oder Token. Bitte f�hren Sie die Registrierung erneut durch."); + "Unbekannte E-Mail oder Token. Bitte fhren Sie die Registrierung erneut durch."); builder.AddOrUpdate("Account.PasswordRecoveryConfirm.InvalidEmailOrToken", "Unknown email or token. Please click \"Forgot password\" again, if you want to renew your password.", - "Unbekannte E-Mail oder Token. Klicken Sie bitte erneut \"Passwort vergessen\", falls Sie Ihr Passwort erneuern m�chten."); + "Unbekannte E-Mail oder Token. Klicken Sie bitte erneut \"Passwort vergessen\", falls Sie Ihr Passwort erneuern mchten."); builder.Delete("Account.PasswordRecoveryConfirm.InvalidEmail"); builder.Delete("Account.PasswordRecoveryConfirm.InvalidToken"); builder.AddOrUpdate("Admin.Common.Acl.SubjectTo", "Restrict access", - "Zugriff einschr�nken", + "Zugriff einschrnken", "Determines whether this entity is subject to access restrictions (no = no restriction, yes = accessible only for selected customer groups)", - "Legt fest, ob dieser Datensatz Zugriffsbeschr�nkungen unterliegt (Nein = keine Beschr�nkung, Ja = zug�nglich nur f�r gew�hlte Kundengruppen)"); + "Legt fest, ob dieser Datensatz Zugriffsbeschrnkungen unterliegt (Nein = keine Beschrnkung, Ja = zugnglich nur fr gewhlte Kundengruppen)"); builder.AddOrUpdate("Admin.Common.Acl.AvailableFor", "Customer roles", "Kundengruppen", "Select customer roles who can access the entity. For all inactive roles, this record is hidden.", - "W�hlen Sie Kundengruppen, die auf den Datensatz zugreifen k�nnen. Bei allen nicht aktivierten Gruppen wird dieser Datensatz ausgeblendet."); + "Whlen Sie Kundengruppen, die auf den Datensatz zugreifen knnen. Bei allen nicht aktivierten Gruppen wird dieser Datensatz ausgeblendet."); builder.Delete( "Admin.Catalog.Categories.Fields.SubjectToAcl", @@ -289,10 +288,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Der Auftrag wurde als ausgeliefert markiert"); builder.AddOrUpdate("Admin.Configuration.Settings.Payment.CapturePaymentReason", - "Capture payment amount when�", - "Zahlungsbetrag einziehen, wenn�", + "Capture payment amount when", + "Zahlungsbetrag einziehen, wenn", "Specifies the event when the payment amount is automatically captured. The selected payment method must support capturing for this.", - "Legt das Ereignis fest, zu dem der Zahlunsgbetrag automatisch eingezogen wird. Die gew�hlte Zahlart muss hierf�r Buchungen unterst�tzen."); + "Legt das Ereignis fest, zu dem der Zahlunsgbetrag automatisch eingezogen wird. Die gewhlte Zahlart muss hierfr Buchungen untersttzen."); #region taken from V22Final, because they were never added yet @@ -301,7 +300,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Weiter"); builder.AddOrUpdate("Admin.Common.BackToConfiguration", "Back to configuration", - "Zur�ck zur Konfiguration"); + "Zurck zur Konfiguration"); builder.AddOrUpdate("Admin.Common.UploadFileSucceeded", "The file has been successfully uploaded.", "Die Datei wurde erfolgreich hochgeladen."); @@ -313,7 +312,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Alle importieren"); builder.AddOrUpdate("Admin.Common.ImportSelected", "Import selected", - "Ausgew�hlte importieren"); + "Ausgewhlte importieren"); builder.AddOrUpdate("Admin.Common.UnknownError", "An unknown error has occurred.", "Es ist ein unbekannter Fehler aufgetreten."); @@ -327,31 +326,31 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Product.Picture.Added", "The picture has successfully been added", - "Das Bild wurde erfolgreich zugef�gt"); + "Das Bild wurde erfolgreich zugefgt"); builder.AddOrUpdate("HtmlEditor.ClickToEdit", "Click to edit HTML...", "Hier klicken, um HTML zu editieren..."); builder.AddOrUpdate("Admin.Catalog.Attributes.ProductAttributes.Fields.ExportMappings.Note", "Define mappings of attribute values to export fields according to the pattern <Format prefix>:<Export field name>. Example: gmc:color exports the attribute values for colors to the field color during the Google Merchant Center Export. The mappings are only effective when exporting attribute combinations.", - "Legen Sie Zuordnungen von Attributwerten zu Exportfeldern nach dem Muster <Formatpr�fix>:<Export-Feldname> fest. Beispiel: gmc:color exportiert beim Google Merchant Center Export die Attributwerte f�r Farben in das Feld color. Die Zuordnungen sind nur beim Export von Attributkombinationen wirksam."); + "Legen Sie Zuordnungen von Attributwerten zu Exportfeldern nach dem Muster <Formatprfix>:<Export-Feldname> fest. Beispiel: gmc:color exportiert beim Google Merchant Center Export die Attributwerte fr Farben in das Feld color. Die Zuordnungen sind nur beim Export von Attributkombinationen wirksam."); builder.AddOrUpdate("Admin.Catalog.Attributes.ProductAttributes.Fields.ExportMappings", "Mappings to export fields", "Zuordnungen zu Exportfeldern", "Allows to map attribute values to export fields. Each entry has to be entered in a new line.", - "Erm�glicht die Zuordnung von Attributwerten zu Exportfeldern. Jeder Eintrag muss in einer neuen Zeile erfolgen."); + "Ermglicht die Zuordnung von Attributwerten zu Exportfeldern. Jeder Eintrag muss in einer neuen Zeile erfolgen."); builder.AddOrUpdate("Admin.Configuration.Payment.Methods.AdditionalFee", "Additional fee", - "Zus�tzliche Geb�hr", + "Zustzliche Gebhr", "Specifies an additional fee to be charged to the customer for using the payment method.", - "Legt eine zus�tzliche Geb�hr fest, die dem Kunden f�r die Inanspruchnahme der Zahlart berechnet wird."); + "Legt eine zustzliche Gebhr fest, die dem Kunden fr die Inanspruchnahme der Zahlart berechnet wird."); builder.AddOrUpdate("Admin.Configuration.Payment.Methods.AdditionalFeePercentage", "Additional fee percentage", - "Zus�tzliche Geb�hr prozentual", + "Zustzliche Gebhr prozentual", "Specifies whether the additional fee should be calculated as a percentage. A fixed value is used if this option is disabled.", - "Legt fest, ob die zus�tzliche Geb�hr prozentual berechnet werden soll. Es wird ein fester Wert verwendet, falls diese Option deaktiviert ist."); + "Legt fest, ob die zustzliche Gebhr prozentual berechnet werden soll. Es wird ein fester Wert verwendet, falls diese Option deaktiviert ist."); builder.Delete("Common.Buttons.Default"); builder.AddOrUpdate("Common.Buttons.Secondary", "Secondary", "Secondary"); @@ -369,7 +368,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Check the box if 'State/province' is required.", "Legt fest, ob die Eingabe eines Bundeslandes erforderlich ist."); - builder.AddOrUpdate("Address.Fields.StateProvince.Required", "State is required.", "Bundesland wird ben�tigt"); + builder.AddOrUpdate("Address.Fields.StateProvince.Required", "State is required.", "Bundesland wird bentigt"); builder.AddOrUpdate("Common.Columns", "Columns", "Spalten"); builder.AddOrUpdate("Common.Mru", "Recently", "Zuletzt"); @@ -384,7 +383,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.ContentManagement.Topics.CannotBeDeleted", "This topic is needed by your Shop and can therefore not be deleted.", - "Diese Seite wird von Ihrem Shop ben�tigt und kann daher nicht gel�scht werden."); + "Diese Seite wird von Ihrem Shop bentigt und kann daher nicht gelscht werden."); } } } diff --git a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs index f42a572047..1dd4026554 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs @@ -43,7 +43,6 @@ public void MigrateSettings(SmartObjectContext context) var displayPrivacyAgreementOnContactUs = settings.FirstOrDefault(x => x.Name == "CustomerSettings.DisplayPrivacyAgreementOnContactUs"); if (displayPrivacyAgreementOnContactUs != null) settings.Remove(displayPrivacyAgreementOnContactUs); - var showShareButtonName = TypeHelper.NameOf(y => y.ShowShareButton, true); var showShareButtonSetting = context.Set().FirstOrDefault(x => x.Name == showShareButtonName); if (showShareButtonSetting != null) @@ -74,7 +73,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) { builder.AddOrUpdate("Admin.Configuration.Settings.ShoppingCart.ThirdPartyEmailHandOver.Hint", "Specifies whether customers can agree to a transferring of their email address to third parties when ordering, and whether the checkbox is enabled by default during checkout. Please note that the 'Show activated' option isn't legally compliant in line with the GDPR.", - "Legt fest, ob Kunden bei einer Bestellung der Weitergabe ihrer E-Mail Adresse an Dritte zustimmen k�nnen und ob die Checkbox daf�r standardm��ig aktiviert ist. Bitte beachten Sie, dass die Option 'Aktiviert anzeigen' im Rahmen der DSVGO nicht rechtskonform ist."); + "Legt fest, ob Kunden bei einer Bestellung der Weitergabe ihrer E-Mail Adresse an Dritte zustimmen knnen und ob die Checkbox dafr standardmig aktiviert ist. Bitte beachten Sie, dass die Option 'Aktiviert anzeigen' im Rahmen der DSVGO nicht rechtskonform ist."); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy", "Privacy", "Datenschutz"); @@ -82,7 +81,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Enable cookie consent", "Cookie-Hinweis aktivieren", "Specifies whether the cookie consent box will be displayed in the frontend.", - "Legt fest, ob ein Element f�r die Zustimmung zur Nutzung von Cookies im Frontend angezeigt wird."); + "Legt fest, ob ein Element fr die Zustimmung zur Nutzung von Cookies im Frontend angezeigt wird."); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.CookieConsentBadgetext", "Cookie consent display text", @@ -92,7 +91,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("CookieConsent.BadgeText", "{0} is using cookies, to guarantee the best shopping experience. Partially cookies will be set by third parties. Privacy Info", - "{0} benutzt Cookies, um Ihnen das beste Einkaufserlebnis zu erm�glichen. Zum Teil werden Cookies auch von Drittanbietern gesetzt. Datenschutzerkl�rung"); + "{0} benutzt Cookies, um Ihnen das beste Einkaufserlebnis zu ermglichen. Zum Teil werden Cookies auch von Drittanbietern gesetzt. Datenschutzerklrung"); builder.AddOrUpdate("CookieConsent.Button", "Okay, got it", "Ok, verstanden"); @@ -110,7 +109,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.Delete("Admin.Configuration.Settings.CustomerUser.DisplayPrivacyAgreementOnContactUs.Hint"); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.DisplayGdprConsentOnForms", "Get privacy consent for form submissions", - "Einwilligungserkl�rung in Formularen fordern", + "Einwilligungserklrung in Formularen fordern", "Specifies whether a checkbox is displayed in forms that prompts the user to agree to the processing of his data.", "Bestimmt ob in Formularen eine Checkbox angezeigt wird, die den Benutzer auffordert der Verarbeitung seiner Daten zuzustimmen."); @@ -122,14 +121,14 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.Delete("ContactUs.PrivacyAgreement.DetailText"); builder.AddOrUpdate("Gdpr.Consent.DetailText", "Yes I've read the privacy terms and agree that my data given by me can be stored electronically. My data will thereby only be used to process my inquiry.", - "Ja, ich habe die Datenschutzerkl�rung zur Kenntnis genommen und bin damit einverstanden, dass die von mir angegebenen Daten elektronisch erhoben und gespeichert werden. Meine Daten werden dabei nur zur Bearbeitung meiner Anfrage genutzt."); + "Ja, ich habe die Datenschutzerklrung zur Kenntnis genommen und bin damit einverstanden, dass die von mir angegebenen Daten elektronisch erhoben und gespeichert werden. Meine Daten werden dabei nur zur Bearbeitung meiner Anfrage genutzt."); builder.AddOrUpdate("Gdpr.Anonymous", "Anonymous", "Anonym"); builder.AddOrUpdate("Gdpr.Anonymize", "Anonymize", "Anonymisieren"); - builder.AddOrUpdate("Gdpr.DeletedText", "Deleted", "Gel�scht"); + builder.AddOrUpdate("Gdpr.DeletedText", "Deleted", "Gelscht"); builder.AddOrUpdate("Gdpr.DeletedLongText", "This content was deleted by the author.", - "Dieser Inhalt wurde vom Autor gel�scht."); + "Dieser Inhalt wurde vom Autor gelscht."); builder.AddOrUpdate("Gdpr.Anonymize.Success", "The customer record '{0}' has been anonymized.", "Der Kundendatensatz '{0}' wurde anonymisiert."); @@ -166,7 +165,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Checkout.TermsOfService.IAccept", "I agree with the {0}terms of service{1} and I adhere to them unconditionally. I've read the {3}privacy terms{1} and agree that my data given by me can be stored electronically.", - "Ich habe {0}die AGB{1} und {2}das Widerrufsrecht{1} gelesen und bin mit der Geltung einverstanden. Ich habe die {3}Datenschutzerkl�rung{1} zur Kenntnis genommen und bin damit einverstanden, dass die von mir angegebenen Daten elektronisch erhoben und gespeichert werden."); + "Ich habe {0}die AGB{1} und {2}das Widerrufsrecht{1} gelesen und bin mit der Geltung einverstanden. Ich habe die {3}Datenschutzerklrung{1} zur Kenntnis genommen und bin damit einverstanden, dass die von mir angegebenen Daten elektronisch erhoben und gespeichert werden."); builder.AddOrUpdate("Admin.Customers.Customers.List.SearchDeletedOnly", "Only deactivated customers", "Nur deaktivierte Kunden"); @@ -180,13 +179,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Account.Fields.Newsletter", "I would like to subscribe to the newsletter. I agree to the . Unsubscription is possible at any time.", - "Ich m�chte den Newsletter abonnieren. Mit den Bestimmungen zum Datenschutz bin ich einverstanden. Eine Abmeldung ist jederzeit m�glich."); + "Ich mchte den Newsletter abonnieren. Mit den Bestimmungen zum Datenschutz bin ich einverstanden. Eine Abmeldung ist jederzeit mglich."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.EnableHoneypotProtection", "Enable Honeypot protection", "Honeypot aktivieren", "Honeypot is a simple but reliable bot detection method that does not require any captcha. If active, registration and contact forms are protected against bots and attackers.", - "Honeypot ist eine simple aber zuverl�ssige Bot-Erkennungsmethode, die ganz ohne Captcha auskommt. Wenn aktiv, werden Registrierungs- und Kontaktformular vor Bots und Angreifern gesch�tzt."); + "Honeypot ist eine simple aber zuverlssige Bot-Erkennungsmethode, die ganz ohne Captcha auskommt. Wenn aktiv, werden Registrierungs- und Kontaktformular vor Bots und Angreifern geschtzt."); } } } diff --git a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs index caadf9da72..43d431e30e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; using System.Linq; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs index 88c8d19d1b..a10b58ebf9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs @@ -48,7 +48,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Maximum refund amount", "Maximaler Erstattungsbetrag", "The maximum amount that can be refunded for this return request.", - "Der maximale Betrag, der f�r diesen R�cksendewunsch erstattet werden kann."); + "Der maximale Betrag, der fr diesen Rcksendewunsch erstattet werden kann."); builder.AddOrUpdate("Admin.Customers.Customers.Fields.Title", "Title", @@ -58,7 +58,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.DataExchange.Export.FolderName.Validate", "Please enter a valid, relative folder path for the export data. The path must be at least 3 characters long and not the application folder.", - "Bitte einen g�ltigen, relativen Ordnerpfad f�r die zu exportierenden Daten eingeben. Der Pfad muss mindestens 3 Zeichen lang und nicht der Anwendungsordner sein."); + "Bitte einen gltigen, relativen Ordnerpfad fr die zu exportierenden Daten eingeben. Der Pfad muss mindestens 3 Zeichen lang und nicht der Anwendungsordner sein."); builder.AddOrUpdate("Admin.Catalog.Customers.CustomerSearchType", "Search in:", "Suche in:"); @@ -72,7 +72,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Validation.ExactLengthValidator") .Value("de", "'{PropertyName}' muss genau {MaxLength} lang sein. Sie haben {TotalLength} Zeichen eingegeben."); builder.AddOrUpdate("Validation.ExclusiveBetweenValidator") - .Value("de", "'{PropertyName}' muss gr��er als {From} und kleiner als {To} sein. Sie haben '{Value}' eingegeben."); + .Value("de", "'{PropertyName}' muss grer als {From} und kleiner als {To} sein. Sie haben '{Value}' eingegeben."); builder.AddOrUpdate("Validation.InclusiveBetweenValidator") .Value("de", "'{PropertyName}' muss zwischen {From} and {To} liegen. Sie haben '{Value}' eingegeben."); builder.AddOrUpdate("Validation.NotNullValidator") @@ -84,12 +84,12 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Validation.RegularExpressionValidator") .Value("de", "'{PropertyName}' entspricht nicht dem erforderlichen Muster."); builder.AddOrUpdate("Validation.ScalePrecisionValidator") - .Value("de", "'{PropertyName}' darf insgesamt nicht mehr als {expectedPrecision} Ziffern enthalten, unter Ber�cksichtigung von {expectedScale} Dezimalstellen. {digits} Ziffern und {actualScale} Dezimalstellen wurden gefunden."); + .Value("de", "'{PropertyName}' darf insgesamt nicht mehr als {expectedPrecision} Ziffern enthalten, unter Bercksichtigung von {expectedScale} Dezimalstellen. {digits} Ziffern und {actualScale} Dezimalstellen wurden gefunden."); // Some new resources for custom validators builder.AddOrUpdate("Validation.CreditCardCvvNumberValidator", "'{PropertyName}' is invalid.", - "'{PropertyName}' ist ung�ltig."); + "'{PropertyName}' ist ungltig."); // Get rid of duplicate validator resource entries builder.Delete( @@ -328,13 +328,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Common.DisplayOrder.Hint", "Specifies display order. 1 represents the top of the list.", - "Legt die Anzeige-Priorit�t fest. 1 steht bspw. f�r das erste Element in der Liste."); + "Legt die Anzeige-Prioritt fest. 1 steht bspw. fr das erste Element in der Liste."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.UseInvisibleReCaptcha", "Use invisible reCAPTCHA", "Unsichtbaren reCAPTCHA verwenden", "Does not require the user to click on a checkbox, instead it is invoked directly when the user submits a form. By default only the most suspicious traffic will be prompted to solve a captcha.", - "Der Benutzer muss nicht auf ein Kontrollk�stchen klicken, sondern die Validierung erfolgt direkt beim Absenden eines Formulars. Nur bei 'verd�chtigem' Traffic wird der Benutzer aufgefordert, ein Captcha zu l�sen."); + "Der Benutzer muss nicht auf ein Kontrollkstchen klicken, sondern die Validierung erfolgt direkt beim Absenden eines Formulars. Nur bei 'verdchtigem' Traffic wird der Benutzer aufgefordert, ein Captcha zu lsen."); builder.AddOrUpdate("Admin.ContentManagement.Topics.Fields.ShortTitle", "Short title", @@ -350,7 +350,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Common.Download.Versions", "Versions", "Versionen"); builder.AddOrUpdate("Common.Download.Version", "Version", "Version"); - builder.AddOrUpdate("Common.Download.Delete", "Delete download", "Download l�schen"); + builder.AddOrUpdate("Common.Download.Delete", "Delete download", "Download lschen"); builder.AddOrUpdate("Common.Downloads", "Downloads", "Downloads"); builder.AddOrUpdate("Admin.Catalog.Products.Fields.NewVersionDownloadId", @@ -359,17 +359,17 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Upload a new version of the download file here.", "Laden Sie hier eine neue Version der Download-Datei hoch."); - builder.AddOrUpdate("Admin.Catalog.Products.Download.VersionDelete", "Delete this file version.", "Diese Dateiversion l�schen."); - builder.AddOrUpdate("Admin.Catalog.Products.Download.AddChangelog", "Edit changelog", "�nderungshistorie bearbeiten"); - builder.AddOrUpdate("Customer.Downloads.NoChangelogAvailable", "No changelog available.", "Keine �nderungshistorie verf�gbar."); + builder.AddOrUpdate("Admin.Catalog.Products.Download.VersionDelete", "Delete this file version.", "Diese Dateiversion lschen."); + builder.AddOrUpdate("Admin.Catalog.Products.Download.AddChangelog", "Edit changelog", "nderungshistorie bearbeiten"); + builder.AddOrUpdate("Customer.Downloads.NoChangelogAvailable", "No changelog available.", "Keine nderungshistorie verfgbar."); builder.AddOrUpdate("Admin.Catalog.Products.Download.SemanticVersion.NotValid", "The specified version information is not valid. Please enter the version number in the correct format (e.g.: 1.0.0.0, 2.0 or 3.1.5).", - "Die angegebenen Versionsinformationen sind nicht g�ltig. Bitte geben Sie die Versionsnummer in korrektem Format an (z.B.: 1.0.0.0, 2.0 oder 3.1.5)."); + "Die angegebenen Versionsinformationen sind nicht gltig. Bitte geben Sie die Versionsnummer in korrektem Format an (z.B.: 1.0.0.0, 2.0 oder 3.1.5)."); builder.AddOrUpdate("Admin.Catalog.Products.Fields.HasPreviewPicture", "Exclude first image from gallery", - "Erstes Bild aus Gallerie ausschlie�en", + "Erstes Bild aus Gallerie ausschlieen", "Activate this option if the first image should be displayed as a preview in product lists but not in the product detail gallery.", "Aktivieren Sie diese Option, wenn das erste Bild als Vorschau in Produktlisten, nicht aber in der Produktdetail-Gallerie angezeigt werden soll."); @@ -377,7 +377,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Catalog.Products.Fields.ProductTags.Hint", "Product tags are keywords that this product can also be identified by. Enter a list of the tags to be associated with this product. The more products associated with a particular tag, the larger it will show on the tag cloud.", - "Eine Liste von Schl�sselw�rtern, die das Produkt taxonomisch charakterisieren. Je mehr Produkte einem Schl�sselwort (Tag) zugeordnet sind, desto mehr visuelles Gewicht erh�lt das Tag."); + "Eine Liste von Schlsselwrtern, die das Produkt taxonomisch charakterisieren. Je mehr Produkte einem Schlsselwort (Tag) zugeordnet sind, desto mehr visuelles Gewicht erhlt das Tag."); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.Initial", "Position", "Position"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.Relevance", "Relevance", "Beste Ergebnisse"); @@ -385,10 +385,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.SubjectDesc", "Title: Z to A", "Titel: Z bis A"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.UserNameAsc", "User name: A to Z", "Benutzername: A bis Z"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.UserNameDesc", "User name: Z to A", "Benutzername: Z bis A"); - builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.CreatedOnAsc", "Created on: Oldest first", "Erstellt am: �ltere zuerst"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.CreatedOnAsc", "Created on: Oldest first", "Erstellt am: ltere zuerst"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.CreatedOnDesc", "Created on: Newest first", "Erstellt am: neuere zuerst"); - builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.PostsAsc", "Post number: ascending", "Anzahl Beitr�ge: aufsteigend"); - builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.PostsDesc", "Post number: descending", "Anzahl Beitr�ge: absteigend"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.PostsAsc", "Post number: ascending", "Anzahl Beitrge: aufsteigend"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumTopicSorting.PostsDesc", "Post number: descending", "Anzahl Beitrge: absteigend"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumDateFilter.LastVisit", "Since last visit", "Seit dem letzten Besuch"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Forums.ForumDateFilter.Yesterday", "Yesterday", "Gestern"); @@ -403,29 +403,29 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Search.Facet.Customer", "User name", "Benutzername"); builder.AddOrUpdate("Search.Facet.Date", "Period", "Zeitraum"); builder.AddOrUpdate("Search.Facet.Date.Newer", "and newer", "und neuer"); - builder.AddOrUpdate("Search.Facet.Date.Older", "and older", "und �lter"); + builder.AddOrUpdate("Search.Facet.Date.Older", "and older", "und lter"); builder.AddOrUpdate("Forum.PostText", "Post text", "Beitragstext"); builder.AddOrUpdate("Forum.Sticky", "Sticky topic", "Festes Thema"); - builder.AddOrUpdate("Search.HitsFor", "{0} hits for {1}", "{0} Treffer f�r {1}"); + builder.AddOrUpdate("Search.HitsFor", "{0} hits for {1}", "{0} Treffer fr {1}"); builder.AddOrUpdate("Search.NoMoreHitsFound", "There were no more hits found.", "Es wurden keine weiteren Treffer gefunden."); builder.AddOrUpdate("Admin.Configuration.Settings.Search.WildcardSearchNote", "The wildcard mode can slow down the search for a large number of objects.", - "Der Wildcard-Modus kann bei einer gro�en Anzahl an Objekten die Suche verlangsamen."); + "Der Wildcard-Modus kann bei einer groen Anzahl an Objekten die Suche verlangsamen."); builder.AddOrUpdate("Admin.Configuration.Settings.Search.SearchMode", "Search mode", "Suchmodus", "Specifies the search mode. Please keep in mind that the search mode can - depending on number of objects - strongly affect search performance. 'Is equal to' is the fastest, 'Contains' the slowest.", - "Legt den Suchmodus fest. Bitte beachten Sie, dass der Suchmodus die Geschwindigkeit der Suche (abh�ngig von der Objektanzahl) beeinflusst. 'Ist gleich' ist am schnellsten, 'Beinhaltet' am langsamsten."); + "Legt den Suchmodus fest. Bitte beachten Sie, dass der Suchmodus die Geschwindigkeit der Suche (abhngig von der Objektanzahl) beeinflusst. 'Ist gleich' ist am schnellsten, 'Beinhaltet' am langsamsten."); builder.AddOrUpdate("Admin.Configuration.Settings.Search.Forum.SearchFields", "Search fields", "Suchfelder", "Specifies additional search fields. The topic title is always searched.", - "Legt zus�tzlich zu durchsuchende Felder fest. Der Thementitel wird grunds�tzlich immer durchsucht."); + "Legt zustzlich zu durchsuchende Felder fest. Der Thementitel wird grundstzlich immer durchsucht."); builder.AddOrUpdate("Admin.Configuration.Settings.Search.DefaultSortOrder", "Default sort order", @@ -443,20 +443,19 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Allow sorting", "Sortierung zulassen", "Specifies whether forum posts can be sorted.", - "Legt fest, ob Forenbeitr�ge sortiert werden k�nnen."); + "Legt fest, ob Forenbeitrge sortiert werden knnen."); builder.AddOrUpdate("Admin.Common.DefaultPageSizeOptions", "Page size options", - "Auswahlm�glichkeiten f�r Seitengr��e", + "Auswahlmglichkeiten fr Seitengre", "Comma-separated page size options that a customer can select in lists.", - "Kommagetrennte Liste mit Optionen f�r Seitengr��e, die ein Kunde in Listen w�hlen kann."); + "Kommagetrennte Liste mit Optionen fr Seitengre, die ein Kunde in Listen whlen kann."); builder.AddOrUpdate("Admin.Common.AllowCustomersToSelectPageSize", "Allow customers to select page size", - "Kunde kann Listengr��e �ndern", + "Kunde kann Listengre ndern", "Whether customers are allowed to select the page size from a predefined list of options.", - "Kunden k�nnen die Listengr��e mit Hilfe einer vorgegebenen Optionsliste �ndern."); - + "Kunden knnen die Listengre mit Hilfe einer vorgegebenen Optionsliste ndern."); builder.Delete( "Admin.Configuration.Settings.Search.DefaultSortOrderMode", @@ -504,7 +503,6 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Filter by language", "Nach Sprache filtern"); - builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.CaptchaShowOnForumPage", "Show on forum pages", "Auf Forenseiten anzeigen", @@ -513,7 +511,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Catalog.Products.BundleItems.NoProductLinkageForBundleItem", "The product \"{0}\" cannot be assigned an attribute of the type \"product\" because it is bundle item of a product bundle.", - "Dem Produkt \"{0}\" kann kein Attribut vom Typ \"Produkt\" zugeordnet werden, weil es auf der St�ckliste eines Produkt-Bundle steht."); + "Dem Produkt \"{0}\" kann kein Attribut vom Typ \"Produkt\" zugeordnet werden, weil es auf der Stckliste eines Produkt-Bundle steht."); builder.AddOrUpdate("Search.RelatedSearchTerms", "Related search terms", @@ -525,43 +523,43 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.System.ScheduleTasks.RunPerMachine", "Run per machine", - "Pro Maschine ausf�hren", + "Pro Maschine ausfhren", "Indicates whether the task is executed decidedly on each machine of a web farm.", - "Gibt an, ob die Aufgabe auf jeder Maschine einer Webfarm dezidiert ausgef�hrt wird."); + "Gibt an, ob die Aufgabe auf jeder Maschine einer Webfarm dezidiert ausgefhrt wird."); builder.Delete("Address.Fields.Required.Hint"); builder.AddOrUpdate("Common.FormFields.Required.Hint", "* Input elements with asterisk are required and have to be filled out.", - "* Eingabefelder mit Sternchen sind Pflichfelder und m�ssen ausgef�llt werden."); + "* Eingabefelder mit Sternchen sind Pflichfelder und mssen ausgefllt werden."); builder.AddOrUpdate("Forum.Post.Vote.OnlyRegistered", "Only registered users can vote for posts.", - "Nur registrierte Benutzer k�nnen Beitr�ge bewerten."); + "Nur registrierte Benutzer knnen Beitrge bewerten."); builder.AddOrUpdate("Forum.Post.Vote.OwnPostNotAllowed", "You cannot vote for your own post.", - "Sie k�nnen nicht Ihren eigenen Beitrag bewerten."); + "Sie knnen nicht Ihren eigenen Beitrag bewerten."); builder.AddOrUpdate("Forum.Post.Vote.SuccessfullyVoted", "Thank you for your vote.", - "Danke f�r Ihre Bewertung."); + "Danke fr Ihre Bewertung."); - builder.AddOrUpdate("Common.Liked", "Liked", "Gef�llt"); - builder.AddOrUpdate("Common.LikeIt", "I like it", "Gef�llt mir"); - builder.AddOrUpdate("Common.DoNotLikeIt", "I do not like it anymore", "Gef�llt mir nicht mehr"); + builder.AddOrUpdate("Common.Liked", "Liked", "Gefllt"); + builder.AddOrUpdate("Common.LikeIt", "I like it", "Gefllt mir"); + builder.AddOrUpdate("Common.DoNotLikeIt", "I do not like it anymore", "Gefllt mir nicht mehr"); builder.AddOrUpdate("Admin.Configuration.Settings.Forums.AllowCustomersToVoteOnPosts", "Allow customers to vote on posts", - "Benutzer k�nnen Beitr�ge bewerten", + "Benutzer knnen Beitrge bewerten", "Specifies whether customers can vote on posts.", - "Legt fest, ob Benutzer Beitr�ge bewerten k�nnen."); + "Legt fest, ob Benutzer Beitrge bewerten knnen."); builder.AddOrUpdate("Admin.Configuration.Settings.Forums.AllowGuestsToVoteOnPosts", "Allow guests to vote on posts", - "G�ste k�nnen Beitr�ge bewerten", + "Gste knnen Beitrge bewerten", "Specifies whether guests can vote on posts.", - "Legt fest, ob G�ste Beitr�ge bewerten k�nnen."); + "Legt fest, ob Gste Beitrge bewerten knnen."); // Typos. builder.AddOrUpdate("Admin.Promotions.Discounts.Requirements") @@ -569,23 +567,23 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Promotions.Discounts.Requirements.DiscountRequirementType") .Value("de", "Typ der Voraussetzung"); builder.AddOrUpdate("Admin.Promotions.Discounts.Requirements.DiscountRequirementType.Hint") - .Value("de", "Voraussetzungen f�r den Rabatt"); + .Value("de", "Voraussetzungen fr den Rabatt"); builder.AddOrUpdate("Admin.Promotions.Discounts.Requirements.Remove") - .Value("de", "Voraussetzung f�r den Rabatt entfernen"); + .Value("de", "Voraussetzung fr den Rabatt entfernen"); builder.AddOrUpdate("Admin.Promotions.Discounts.Requirements.SaveBeforeEdit") - .Value("de", "Sie m�ssen den Rabatt zun�chst speichern, bevor Sie Voraussetzungen f�r seine Anwendung festlegen k�nnen"); + .Value("de", "Sie mssen den Rabatt zunchst speichern, bevor Sie Voraussetzungen fr seine Anwendung festlegen knnen"); builder.AddOrUpdate("Common.Voting", "Voting", "Abstimmung"); builder.AddOrUpdate("Common.Answer", "Answer", "Antwort"); - builder.AddOrUpdate("Common.Size", "Size", "Gr��e"); + builder.AddOrUpdate("Common.Size", "Size", "Gre"); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.CustomerFormFields.Description", "Manage form fields that are displayed during registration.", - "Verwalten Sie Formularfelder, die w�hrend der Registrierung angezeigt werden."); + "Verwalten Sie Formularfelder, die whrend der Registrierung angezeigt werden."); builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.AddressFormFields.Description", "Manage form fields that are displayed during checkout and on \"My account\" page.", - "Verwalten Sie Formularfelder, die w�hrend des Checkout-Prozesses und im \"Mein Konto\" Bereich angezeigt werden."); + "Verwalten Sie Formularfelder, die whrend des Checkout-Prozesses und im \"Mein Konto\" Bereich angezeigt werden."); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.DataExchange.RelatedEntityType.TierPrice", "Tier price", "Staffelpreis"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.DataExchange.RelatedEntityType.ProductVariantAttributeValue", "Attribute option", "Attribut-Option"); @@ -593,7 +591,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.DataExchange.Export.ExportRelatedData.Validate", "Related data cannot be exported if the option \"Export attribute combinations\" is activated.", - "Zugeh�rige Daten k�nnen nicht exportiert werden, wenn die Option \"Attributkombinationen exportieren\" aktiviert ist."); + "Zugehrige Daten knnen nicht exportiert werden, wenn die Option \"Attributkombinationen exportieren\" aktiviert ist."); builder.AddOrUpdate("Admin.Common.ProcessingInfo", "{0}: {1} of {2} processed", @@ -603,29 +601,29 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Show subcategories also in subpages", "Unterwarengruppen auch in Unterseiten anzeigen", "Subpage: List index greater than 1 or any active filter.", - "Unterseite: Listenindex gr��er 1 oder mind. ein aktiver Filter."); + "Unterseite: Listenindex grer 1 oder mind. ein aktiver Filter."); builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.ShowDescriptionInSubPages", "Show page description also in subpages", "Seitenbeschreibungen auch in Unterseiten anzeigen", "Subpage: List index greater than 1 or any active filter.", - "Unterseite: Listenindex gr��er 1 oder mind. ein aktiver Filter."); + "Unterseite: Listenindex grer 1 oder mind. ein aktiver Filter."); builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.IncludeFeaturedProductsInSubPages", "Show featured products also in subpages", "Top-Produkte auch in Unterseiten anzeigen", "Subpage: List index greater than 1 or any active filter.", - "Unterseite: Listenindex gr��er 1 oder mind. ein aktiver Filter."); + "Unterseite: Listenindex grer 1 oder mind. ein aktiver Filter."); builder.AddOrUpdate("Admin.Common.CopyOf", "Copy of {0}", "Kopie von {0}"); builder.AddOrUpdate("Admin.Configuration.Languages.DefaultLanguage.Note", "The default language of the shop is {0}. The default is always the first published language.", - "Die Standardsprache des Shops ist {0}. Standard ist stets die erste ver�ffentlichte Sprache."); + "Die Standardsprache des Shops ist {0}. Standard ist stets die erste verffentlichte Sprache."); builder.AddOrUpdate("Admin.Configuration.Languages.AvailableLanguages.Note", "Click Download to install a new language including all localized resources. On translate.smartstore.com you will find more details about available resources.", - "Klicken Sie auf Download, um eine neue Sprache mit allen lokalisierten Ressourcen zu installieren. Auf translate.smartstore.com finden Sie weitere Details zu verf�gbaren Ressourcen."); + "Klicken Sie auf Download, um eine neue Sprache mit allen lokalisierten Ressourcen zu installieren. Auf translate.smartstore.com finden Sie weitere Details zu verfgbaren Ressourcen."); builder.AddOrUpdate("Common.BrowseFiles", "Browse", "Durchsuchen"); builder.AddOrUpdate("Common.Url", "URL", "URL"); @@ -635,10 +633,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Common.Entity.Manufacturer", "Manufacturer", "Hersteller"); builder.AddOrUpdate("Common.Entity.Topic", "Topic", "Seite"); - builder.AddOrUpdate("Common.Entity.SelectProduct", "Select product", "Produkt ausw�hlen"); - builder.AddOrUpdate("Common.Entity.SelectCategory", "Select category", "Warengruppe ausw�hlen"); - builder.AddOrUpdate("Common.Entity.SelectManufacturer", "Select manufacturer", "Hersteller ausw�hlen"); - builder.AddOrUpdate("Common.Entity.SelectTopic", "Select topic", "Seite ausw�hlen"); + builder.AddOrUpdate("Common.Entity.SelectProduct", "Select product", "Produkt auswhlen"); + builder.AddOrUpdate("Common.Entity.SelectCategory", "Select category", "Warengruppe auswhlen"); + builder.AddOrUpdate("Common.Entity.SelectManufacturer", "Select manufacturer", "Hersteller auswhlen"); + builder.AddOrUpdate("Common.Entity.SelectTopic", "Select topic", "Seite auswhlen"); builder.Delete("Admin.Customers.Customers.List.SearchDeletedOnly"); builder.AddOrUpdate("Admin.Customers.Customers.List.SearchActiveOnly", "Only activated customers", "Nur aktivierte Kunden"); @@ -655,7 +653,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Products.EmailAFriend.LoginNote", "Please log in to use this function. Login now", - "Bitte melden Sie sich an, um diese Funktion nutzen zu k�nnen. Jetzt anmelden"); + "Bitte melden Sie sich an, um diese Funktion nutzen zu knnen. Jetzt anmelden"); builder.AddOrUpdate("Account.Login.Fields.UsernameOrEmail", "Username or email", @@ -689,9 +687,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Settings.Tax.VatRequired", "Customers must enter a VAT number", - "Kunden m�ssen eine Steuernummer angeben", + "Kunden mssen eine Steuernummer angeben", "Specifies whether customers must enter a VAT identification number.", - "Legt fest, ob Kunden bei der Registrierung eine Steuernummer angeben m�ssen."); + "Legt fest, ob Kunden bei der Registrierung eine Steuernummer angeben mssen."); builder.AddOrUpdate("Common.Top", "Top", "Oben"); builder.AddOrUpdate("Common.Bottom", "Bottom", "Unten"); @@ -706,29 +704,29 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Common.MoveUp", "Move up", "Nach oben"); builder.AddOrUpdate("Common.MoveDown", "Move down", "Nach unten"); - builder.AddOrUpdate("Common.IncreaseValue", "Increase value", "Wert erh�hen"); + builder.AddOrUpdate("Common.IncreaseValue", "Increase value", "Wert erhhen"); builder.AddOrUpdate("Common.DecreaseValue", "Decrease value", "Wert verringern"); builder.AddOrUpdate("Common.QueryString", "Query string", "Query String"); - builder.AddOrUpdate("Admin.ContentManagement.Menus", "Menus", "Men�s"); - builder.AddOrUpdate("Admin.ContentManagement.AddMenu", "Add menu", "Men� hinzuf�gen"); - builder.AddOrUpdate("Admin.ContentManagement.EditMenu", "Edit menu", "Men� bearbeiten"); + builder.AddOrUpdate("Admin.ContentManagement.Menus", "Menus", "Mens"); + builder.AddOrUpdate("Admin.ContentManagement.AddMenu", "Add menu", "Men hinzufgen"); + builder.AddOrUpdate("Admin.ContentManagement.EditMenu", "Edit menu", "Men bearbeiten"); - builder.AddOrUpdate("Admin.ContentManagement.MenuLinks", "Menu items", "Men� Links"); - builder.AddOrUpdate("Admin.ContentManagement.AddMenuItem", "Add menu item", "Men� Link hinzuf�gen"); - builder.AddOrUpdate("Admin.ContentManagement.EditMenuItem", "Edit menu item", "Men� Link bearbeiten"); + builder.AddOrUpdate("Admin.ContentManagement.MenuLinks", "Menu items", "Men Links"); + builder.AddOrUpdate("Admin.ContentManagement.AddMenuItem", "Add menu item", "Men Link hinzufgen"); + builder.AddOrUpdate("Admin.ContentManagement.EditMenuItem", "Edit menu item", "Men Link bearbeiten"); builder.AddOrUpdate("Admin.ContentManagement.Menus.NoMenuItemsAvailable", "There are no menu links available.", - "Es sind keine Men� Links vorhanden."); + "Es sind keine Men Links vorhanden."); builder.AddOrUpdate("Admin.ContentManagement.Menus.CannotBeDeleted", "This menu is required by your shop and can therefore not be deleted.", - "Dieses Men� wird von Ihrem Shop ben�tigt und kann daher nicht gel�scht werden."); + "Dieses Men wird von Ihrem Shop bentigt und kann daher nicht gelscht werden."); builder.AddOrUpdate("Admin.ContentManagement.Menus.CatalogNote", "The category tree is dynamically integrated into the menu.", - "Der Warengruppenbaum wird dynamisch in das Men� eingebunden."); + "Der Warengruppenbaum wird dynamisch in das Men eingebunden."); builder.AddOrUpdate("Admin.ContentManagement.Menus.SpecifyLinkTarget", "Please specify link target", @@ -745,19 +743,19 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "System name", "Systemname", "The system name of the menu.", - "Der Systemname des Men�s."); + "Der Systemname des Mens."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Template", "Design template", "Design Vorlage", "The template defines the way how the menu is displayed.", - "�ber die Vorlage wird die Darstellungsart des Men�s festgelegt."); + "ber die Vorlage wird die Darstellungsart des Mens festgelegt."); builder.AddOrUpdate("Admin.ContentManagement.Menus.WidgetZone", "Widget zone", "Widget Zone", "Specifies widget zones in which the menu should be displayed.", - "Legt Widget Zonen fest, in denen das Men� dargestellt werden soll."); + "Legt Widget Zonen fest, in denen das Men dargestellt werden soll."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Title", "Title", @@ -767,9 +765,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.ContentManagement.Menus.Published", "Published", - "Ver�ffentlicht", + "Verffentlicht", "Specifies whether the menu is visible in the shop.", - "Legt fest, ob das Men� im Shop sichtbar ist."); + "Legt fest, ob das Men im Shop sichtbar ist."); builder.AddOrUpdate("Admin.ContentManagement.Menus.DisplayOrder", "Display order", @@ -779,9 +777,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.ParentItem", "Parent menu item", - "�bergeordnetes Men�element", + "bergeordnetes Menelement", "Specifies the parent menu item. Leave the field empty to create a first-level menu item.", - "Legt das �bergeordnete Men�element fest. Lassen Sie das Feld leer, um ein Men�element erster Ebene zu erzeugen."); + "Legt das bergeordnete Menelement fest. Lassen Sie das Feld leer, um ein Menelement erster Ebene zu erzeugen."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.LinkTarget", "Target", @@ -793,37 +791,37 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Short description", "Kurzbeschreibung", "Specifies a short description. Used as the 'title' attribute for the menu link.", - "Legt eine Kurzbeschreibung fest. Wird als 'title' Attribut f�r das Men�element verwendet."); + "Legt eine Kurzbeschreibung fest. Wird als 'title' Attribut fr das Menelement verwendet."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.PermissionNames", "Required permissions", "Erforderliche Rechte", "Specifies access permissions that are required to display the menu item (at least 1 permission must be granted).", - "Legt Zugriffsrechte fest, die f�r die Anzeige des Men�elementes erforderlich sind (mind. 1 Recht muss gew�hrt sein)."); + "Legt Zugriffsrechte fest, die fr die Anzeige des Menelementes erforderlich sind (mind. 1 Recht muss gewhrt sein)."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.Published", "Published", - "Ver�ffentlicht", + "Verffentlicht", "Specifies whether the menu item is visible in the shop.", - "Legt fest, ob das Men�element im Shop sichtbar ist."); + "Legt fest, ob das Menelement im Shop sichtbar ist."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.DisplayOrder", "Display order", "Reihenfolge", "Specifies the order of the menu item within a menu level.", - "Legt die Reihenfolge des Men�elements innerhalb einer Men�ebene fest."); + "Legt die Reihenfolge des Menelements innerhalb einer Menebene fest."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.BeginGroup", "Begin group", "Gruppe beginnen", "Inserts a separator before the link and optionally a heading (short description).", - "F�gt vor den Link ein Trennelement sowie optional eine �berschrift ein (Kurzbeschreibung)."); + "Fgt vor den Link ein Trennelement sowie optional eine berschrift ein (Kurzbeschreibung)."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.ShowExpanded", "Show expanded", - "Ge�ffnet anzeigen", + "Geffnet anzeigen", "If selected and this menu item has children, the menu will initially appear expanded.", - "Legt fest, ob das Men� anf�nglich ge�ffnet ist, sofern es Kindelemente besitzt."); + "Legt fest, ob das Men anfnglich geffnet ist, sofern es Kindelemente besitzt."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.NoFollow", "nofollow", @@ -833,7 +831,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.NewWindow", "Open in new browser tab", - "In neuem Browsertab �ffnen"); + "In neuem Browsertab ffnen"); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.Icon", "Icon", @@ -845,13 +843,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "HTML ID", "HTML ID", "Sets the HTML ID attribute for the menu link.", - "Legt das HTML ID Attribut f�r das Men�element fest."); + "Legt das HTML ID Attribut fr das Menelement fest."); builder.AddOrUpdate("Admin.ContentManagement.Menus.Item.CssClass", "CSS class", "CSS Klasse", "Sets a CSS class for the menu link.", - "Legt eine CSS Klasse f�r das Men�element fest."); + "Legt eine CSS Klasse fr das Menelement fest."); builder.Delete("Admin.Configuration.Settings.GeneralCommon.SocialSettings.GooglePlusLink"); builder.Delete("Admin.Configuration.Settings.GeneralCommon.SocialSettings.GooglePlusLink.Hint"); @@ -866,7 +864,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("ShoppingCart.DiscountCouponCode.NoMoreDiscount", "Further discounts are not possible.", - "Eine weitere Rabattierung ist nicht m�glich."); + "Eine weitere Rabattierung ist nicht mglich."); } } } diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs index b3d720ca95..bfcf868fcd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Data.Setup; @@ -42,9 +42,9 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate( "Admin.Catalog.ProductTags.Published", "Published", - "Ver�ffentlicht", + "Verffentlicht", "Tags that have not been published are not visible in the shop, but are taken into account in the product search.", - "Nicht ver�ffentlichte Tags sind im Shop nicht sichtbar, werden aber bei der Produktsuche ber�cksichtigt."); + "Nicht verffentlichte Tags sind im Shop nicht sichtbar, werden aber bei der Produktsuche bercksichtigt."); } private string GetAlterTagCountProcedureSql(bool newVersion) diff --git a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs index c9b18aac65..e95c8b59ee 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Tasks; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs index dd167ee0d9..4fc643f087 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; public partial class ProductVisibility : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs index 72b39d7843..7da247baea 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; using System.Linq; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.DataExchange; using SmartStore.Core.Domain.Localization; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs index 24bd074a26..fa5423b6af 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; using System.Linq; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Tasks; diff --git a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs index 99ac87c6de..6af2eaab80 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Data.Entity.Migrations; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs index 6ec22fa5c1..aee06b1d24 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs @@ -3,7 +3,7 @@ namespace SmartStore.Data.Migrations using System; using System.Data.Entity.Migrations; using System.Linq; - using System.Web.Hosting; + using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Media; @@ -71,13 +71,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Validation.MaximumLengthValidator") .Value("de", "'{PropertyName}' darf maximal {MaxLength} Zeichen lang sein. Sie haben {TotalLength} Zeichen eingegeben."); - builder.AddOrUpdate("Admin.Configuration.Measures.Weights.AddWeight", "Add weight", "Gewicht hinzuf�gen"); + builder.AddOrUpdate("Admin.Configuration.Measures.Weights.AddWeight", "Add weight", "Gewicht hinzufgen"); builder.AddOrUpdate("Admin.Configuration.Measures.Weights.EditWeight", "Edit weight", "Gewicht bearbeiten"); - builder.AddOrUpdate("Admin.Configuration.Measures.Dimensions.AddDimension", "Add dimension", "Abmessung hinzuf�gen"); + builder.AddOrUpdate("Admin.Configuration.Measures.Dimensions.AddDimension", "Add dimension", "Abmessung hinzufgen"); builder.AddOrUpdate("Admin.Configuration.Measures.Dimensions.EditDimension", "Edit dimension", "Abmessung bearbeiten"); - builder.AddOrUpdate("Admin.Configuration.QuantityUnit.AddQuantityUnit", "Add quantity unit", "Verpackungseinheit hinzuf�gen"); + builder.AddOrUpdate("Admin.Configuration.QuantityUnit.AddQuantityUnit", "Add quantity unit", "Verpackungseinheit hinzufgen"); builder.AddOrUpdate("Admin.Configuration.QuantityUnit.EditQuantityUnit", "Edit quantity unit", "Verpackungseinheit bearbeiten"); builder.AddOrUpdate("Admin.Configuration.Settings.Catalog.ApplyPercentageDiscountOnTierPrice", @@ -96,14 +96,14 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Limited to customer roles", "Auf Kundengruppen begrenzt", "Specifies whether the object is only available to certain customer groups.", - "Legt fest, ob das Objekt nur f�r bestimmte Kundengruppen verf�gbar ist."); + "Legt fest, ob das Objekt nur fr bestimmte Kundengruppen verfgbar ist."); builder.AddOrUpdate("Admin.Permissions.AllowInherited", "Allow (inherited)", "Erlaubt (geerbt)"); builder.AddOrUpdate("Admin.Permissions.DenyInherited", "Deny (inherited)", "Verweigert (geerbt)"); builder.AddOrUpdate("Admin.AccessDenied.DetailedDescription", "
You do not have permission to perform the selected operation.
Access right: {0}
System name: {1}
", - "
Sie haben keine Berechtigung, diesen Vorgang durchzuf�hren.
Zugriffsrecht: {0}
Systemname: {1}
"); + "
Sie haben keine Berechtigung, diesen Vorgang durchzufhren.
Zugriffsrecht: {0}
Systemname: {1}
"); builder.Delete( "Admin.Configuration.Measures.Weights.Fields.MarkAsPrimaryWeight", @@ -119,7 +119,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.ContentManagement.Blog.BlogPosts.Fields.Tags.Hint", "Tags are keywords that this blog post can also be identified by. Enter a comma separated list of the tags to be associated with this blog post.", - "Dieser Blog-Eintrag kann durch die Verwendung von Tags (Stichw�rter) gekennzeichnet und kategorisiert werden. Mehrere Tags k�nnen als kommagetrennte Liste eingegeben werden."); + "Dieser Blog-Eintrag kann durch die Verwendung von Tags (Stichwrter) gekennzeichnet und kategorisiert werden. Mehrere Tags knnen als kommagetrennte Liste eingegeben werden."); // Granular permission. builder.AddOrUpdate("Common.Read", "Read", "Lesen"); @@ -133,8 +133,8 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Common.Trash", "Trash", "Papierkorb"); builder.AddOrUpdate("Common.Cut", "Cut", "Ausschneiden"); builder.AddOrUpdate("Common.Copy", "Copy", "Kopieren"); - builder.AddOrUpdate("Common.Paste", "Paste", "Einf�gen"); - builder.AddOrUpdate("Common.SelectAll", "Select all", "Alles ausw�hlen"); + builder.AddOrUpdate("Common.Paste", "Paste", "Einfgen"); + builder.AddOrUpdate("Common.SelectAll", "Select all", "Alles auswhlen"); builder.AddOrUpdate("Common.Rename", "Rename", "Umbenennen"); builder.AddOrUpdate("Common.CtrlKey", "Ctrl", "Strg"); @@ -146,11 +146,11 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Customers.PermissionViewNote", "The view shows the permissions that apply to this customer based on the customer roles assigned to him. To change permissions, switch to the relevant customer role.", - "Die Ansicht zeigt die Rechte, die f�r diesen Kunden auf Basis der ihm zugeordneten Kundengruppen gelten. Um Rechte zu �ndern, wechseln Sie bitte zur betreffenden Kundengruppe."); + "Die Ansicht zeigt die Rechte, die fr diesen Kunden auf Basis der ihm zugeordneten Kundengruppen gelten. Um Rechte zu ndern, wechseln Sie bitte zur betreffenden Kundengruppe."); builder.AddOrUpdate("Admin.Permissions.AddedPermissions", "Added permissions: {0}", - "Hinzugef�gte Zugriffsrechte: {0}"); + "Hinzugefgte Zugriffsrechte: {0}"); builder.AddOrUpdate("Admin.Permissions.RemovedPermissions", "Permissions have been removed: {0}", @@ -167,7 +167,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Permissions.DisplayName.EditOptionSet", "Edit options sets", "Options-Sets bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditCategory", "Edit categories", "Warengruppen bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditManufacturer", "Edit manufacturers", "Hersteller bearbeiten"); - builder.AddOrUpdate("Permissions.DisplayName.EditAssociatedProduct", "Edit associated products", "Verkn�pfte Produkte bearbeiten"); + builder.AddOrUpdate("Permissions.DisplayName.EditAssociatedProduct", "Edit associated products", "Verknpfte Produkte bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditBundle", "Edit bundles", "Bundles bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditPromotion", "Edit promotion", "Promotion bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditPicture", "Edit pictures", "Bilder bearbeiten"); @@ -183,13 +183,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Permissions.DisplayName.EditProduct", "Edit products", "Produkte bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditComment", "Edit comments", "Kommentare bearbeiten"); builder.AddOrUpdate("Permissions.DisplayName.EditResource", "Edit resources", "Ressourcen bearbeiten"); - builder.AddOrUpdate("Permissions.DisplayName.ReadStats", "Display dashboard", "�bersicht anzeigen"); + builder.AddOrUpdate("Permissions.DisplayName.ReadStats", "Display dashboard", "bersicht anzeigen"); - builder.AddOrUpdate("Admin.ContentManagement.Blog.Heading.Publish", "Publishing", "Ver�ffentlichung"); + builder.AddOrUpdate("Admin.ContentManagement.Blog.Heading.Publish", "Publishing", "Verffentlichung"); builder.AddOrUpdate("Admin.ContentManagement.Blog.Heading.Display", "Display", "Darstellung"); - builder.AddOrUpdate("Admin.ContentManagement.News.Heading.Publish", "Publishing", "Ver�ffentlichung"); + builder.AddOrUpdate("Admin.ContentManagement.News.Heading.Publish", "Publishing", "Verffentlichung"); - builder.AddOrUpdate("Admin.Validation.Url", "Please enter a valid URL.", "Bitte geben Sie eine g�ltige URL ein."); + builder.AddOrUpdate("Admin.Validation.Url", "Please enter a valid URL.", "Bitte geben Sie eine gltige URL ein."); builder.AddOrUpdate("Common.WrongInvisibleCaptcha", "The reCAPTCHA failed. Please try it again.", @@ -203,15 +203,15 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Visibility", "Sichtbarkeit", "Limits the visibility of the product. In the case of \"Not visible\", the product only appears as an associated product on the parent product detail page, but without a link to an individual page.", - "Schr�nkt die Sichtbarkeit des Produktes ein. Bei \"Nicht sichtbar\" erscheint das Produkt nur noch als verkn�pftes Produkt auf der �bergeordneten Produktdetailseite, jedoch ohne Verlinkung auf eine eigenst�ndige Seite."); + "Schrnkt die Sichtbarkeit des Produktes ein. Bei \"Nicht sichtbar\" erscheint das Produkt nur noch als verknpftes Produkt auf der bergeordneten Produktdetailseite, jedoch ohne Verlinkung auf eine eigenstndige Seite."); builder.AddOrUpdate("Admin.DataExchange.Export.Filter.Visibility", "Visibility", "Sichtbarkeit", "Filter by visibility. \"In search results\" includes fully visible products.", - "Nach Sichtbarkeit filter. \"In Suchergebnissen\" schlie�t �berall sichtbare Produkte mit ein."); + "Nach Sichtbarkeit filter. \"In Suchergebnissen\" schliet berall sichtbare Produkte mit ein."); - builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductVisibility.Full", "Fully visible", "�berall sichtbar"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductVisibility.Full", "Fully visible", "berall sichtbar"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductVisibility.SearchResults", "In search results", "In Suchergebnissen"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductVisibility.ProductPage", "On product detail pages", "Auf Produktdetailseiten"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductVisibility.Hidden", "Not visible", "Nicht sichtbar"); @@ -227,16 +227,16 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Rules.SystemName", "System name", "Systemname"); builder.AddOrUpdate("Admin.Rules.Title", "Title", "Titel"); builder.AddOrUpdate("Admin.Rules.TestConditions", "{0} Test {1} Rules", "Bedingungen {0} Testen {1}"); - builder.AddOrUpdate("Admin.Rules.AddGroup", "Add group", "Gruppe hinzuf�gen"); - builder.AddOrUpdate("Admin.Rules.DeleteGroup", "Delete group", "Gruppe l�schen"); - builder.AddOrUpdate("Admin.Rules.AddCondition", "Add condition", "Bedingung hinzuf�gen"); + builder.AddOrUpdate("Admin.Rules.AddGroup", "Add group", "Gruppe hinzufgen"); + builder.AddOrUpdate("Admin.Rules.DeleteGroup", "Delete group", "Gruppe lschen"); + builder.AddOrUpdate("Admin.Rules.AddCondition", "Add condition", "Bedingung hinzufgen"); builder.AddOrUpdate("Admin.Rules.SaveConditions", "Save all conditions", "Alle Bedingungen speichern"); - builder.AddOrUpdate("Admin.Rules.OpenRule", "Open rule", "Regel �ffnen"); + builder.AddOrUpdate("Admin.Rules.OpenRule", "Open rule", "Regel ffnen"); builder.AddOrUpdate("Admin.Rules.EditRule", "Edit rule", "Regel bearbeiten"); - builder.AddOrUpdate("Admin.Rules.AddRule", "Add rule", "Regel hinzuf�gen"); - builder.AddOrUpdate("Admin.Rules.RuleSet.Added", "The rule has been successfully added.", "Die Regel wurde erfolgreich hinzugef�gt."); - builder.AddOrUpdate("Admin.Rules.RuleSet.Deleted", "The rule has been successfully deleted.", "Die Regel wurde erfolgreich gel�scht."); + builder.AddOrUpdate("Admin.Rules.AddRule", "Add rule", "Regel hinzufgen"); + builder.AddOrUpdate("Admin.Rules.RuleSet.Added", "The rule has been successfully added.", "Die Regel wurde erfolgreich hinzugefgt."); + builder.AddOrUpdate("Admin.Rules.RuleSet.Deleted", "The rule has been successfully deleted.", "Die Regel wurde erfolgreich gelscht."); builder.AddOrUpdate("Admin.Rules.Operator.All", "ALL", "ALLE"); builder.AddOrUpdate("Admin.Rules.Operator.One", "ONE", "EINE"); @@ -246,20 +246,20 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Rules.AllConditions", "If {0} of the following conditions are true.", - "Wenn {0} der folgenden Bedingungen erf�llt sind."); + "Wenn {0} der folgenden Bedingungen erfllt sind."); builder.AddOrUpdate("Admin.Rules.NotFound", "The rule with ID {0} was not found.", "Die Regel mit der ID {0} wurde nicht gefunden."); builder.AddOrUpdate("Admin.Rules.GroupNotFound", "The group with ID {0} was not found.", "Die Gruppe mit der ID {0} wurde nicht gefunden."); builder.AddOrUpdate("Admin.Rules.NumberOfRules", "Number of rules", "Anzahl an Regeln"); - builder.AddOrUpdate("Admin.Rules.OperatorNotSupported", "The rule scope does not support this operator.", "Die Regelart unterst�tzt diesen Operator nicht."); + builder.AddOrUpdate("Admin.Rules.OperatorNotSupported", "The rule scope does not support this operator.", "Die Regelart untersttzt diesen Operator nicht."); builder.AddOrUpdate("Admin.Rules.InvalidDescriptor", "Invalid rule. This rule is no longer supported and should be deleted.", - "Ung�ltige Regel. Diese Regel wird nicht mehr unterst�tzt und sollte gel�scht werden."); + "Ungltige Regel. Diese Regel wird nicht mehr untersttzt und sollte gelscht werden."); builder.AddOrUpdate("Admin.Rules.SaveToCreateConditions", "Conditions can only be created after saving the rule.", - "Bedingungen k�nnen erst nach Speichern der Regel festgelegt werden."); + "Bedingungen knnen erst nach Speichern der Regel festgelegt werden."); builder.AddOrUpdate("Admin.Rules.Execute.MatchCustomers", "{0} customers match the rule conditions.", @@ -269,10 +269,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "{0} Produkte entsprechen den Regelbedingungen."); builder.AddOrUpdate("Admin.Rules.Execute.MatchCart", "The rule conditions are true for the current customer {0}.", - "Die Regelbedingungen sind f�r den aktuellen Kunden {0} wahr."); + "Die Regelbedingungen sind fr den aktuellen Kunden {0} wahr."); builder.AddOrUpdate("Admin.Rules.Execute.DoesNotMatchCart", "The rule conditions are false for the current customer {0}.", - "Die Regelbedingungen sind f�r den aktuellen Kunden {0} falsch."); + "Die Regelbedingungen sind fr den aktuellen Kunden {0} falsch."); // Rule fields builder.AddOrUpdate("Admin.Rules.RuleSet.Fields.Name", "Name", "Name"); @@ -309,10 +309,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Rules.FilterDescriptor.VatNumberStatus", "Vat number status", "Steuernummerstatus"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.TimeZone", "Time zone", "Zeitzone"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.TaxDisplayType", "Tax display type", "Steueranzeigetyp"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.IPCountry", "IP associated with country", "IP geh�rt zu Land"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.Currency", "Currency", "W�hrung"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.MobileDevice", "Mobile device", "Mobiles Endger�t"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.DeviceFamily", "Device family", "Endger�tefamilie"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.IPCountry", "IP associated with country", "IP gehrt zu Land"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.Currency", "Currency", "Whrung"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.MobileDevice", "Mobile device", "Mobiles Endgert"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.DeviceFamily", "Device family", "Endgertefamilie"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.OperatingSystem", "Operating system", "Betriebssystem"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.BrowserName", "Browser name", "Browser Name"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.BrowserMajorVersion", "Browser major version", "Browser Hauptversionsnummer"); @@ -335,22 +335,22 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Rules.FilterDescriptor.OrderTotal", "Order total", "Gesamtbetrag der Bestellung"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.OrderSubtotalInclTax", "Order subtotal incl. tax", "Gesamtbetrag der Bestellung (Brutto)"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.OrderSubtotalExclTax", "Order subtotal excl tax", "Gesamtbetrag der Bestellung (Netto)"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.OrderCount", "Number of orders", "Anzahl der Auftr�ge"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.OrderCount", "Number of orders", "Anzahl der Auftrge"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.SpentAmount", "Amount spent", "Ausgegebener Betrag"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.PaymentMethod", "Selected payment method", "Gew�hlte Zahlart"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.PaymentMethod", "Selected payment method", "Gewhlte Zahlart"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.PaymentStatus", "Payment status", "Zahlungsstatus"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.PaidBy", "Paid by", "Bezahlt mit"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.ShippingRateComputationMethod", "Shipping rate computation method", "Berechnungsmethode f�r Versandkosten"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.ShippingRateComputationMethod", "Shipping rate computation method", "Berechnungsmethode fr Versandkosten"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.ShippingMethod", "Shipping method", "Versandart"); builder.AddOrUpdate("Admin.Rules.FilterDescriptor.ShippingStatus", "Shipping status", "Lieferstatus"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.ReturnRequestCount", "Number of return requests", "Anzahl R�cksendeauftr�ge"); - builder.AddOrUpdate("Admin.Rules.FilterDescriptor.AvailableByDate", "Available by date", "Nach Datum verf�gbar"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.ReturnRequestCount", "Number of return requests", "Anzahl Rcksendeauftrge"); + builder.AddOrUpdate("Admin.Rules.FilterDescriptor.AvailableByDate", "Available by date", "Nach Datum verfgbar"); // Rule operators - builder.AddOrUpdate("Admin.Rules.RuleOperator.ContainsOperator", "Contains", "Enth�lt"); + builder.AddOrUpdate("Admin.Rules.RuleOperator.ContainsOperator", "Contains", "Enthlt"); builder.AddOrUpdate("Admin.Rules.RuleOperator.EndsWithOperator", "Ends with", "Endet auf"); - builder.AddOrUpdate("Admin.Rules.RuleOperator.GreaterThanOperator", "Greater than", "Gr��er als"); - builder.AddOrUpdate("Admin.Rules.RuleOperator.GreaterThanOrEqualOperator", "Greater than or equal to", "Gr��er oder gleich"); + builder.AddOrUpdate("Admin.Rules.RuleOperator.GreaterThanOperator", "Greater than", "Grer als"); + builder.AddOrUpdate("Admin.Rules.RuleOperator.GreaterThanOrEqualOperator", "Greater than or equal to", "Grer oder gleich"); builder.AddOrUpdate("Admin.Rules.RuleOperator.IsEmptyOperator", "Is empty", "Ist leer"); builder.AddOrUpdate("Admin.Rules.RuleOperator.EqualOperator", "Is equal to", "Gleich"); builder.AddOrUpdate("Admin.Rules.RuleOperator.IsNotEmptyOperator", "Is not empty", "Ist nicht leer"); @@ -359,7 +359,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Rules.RuleOperator.IsNullOperator", "Is null", "Ist NULL"); builder.AddOrUpdate("Admin.Rules.RuleOperator.LessThanOperator", "Less than", "Kleiner als"); builder.AddOrUpdate("Admin.Rules.RuleOperator.LessThanOrEqualOperator", "Less than or equal to", "Kleiner oder gleich"); - builder.AddOrUpdate("Admin.Rules.RuleOperator.NotContainsOperator", "Not contains", "Enth�lt nicht"); + builder.AddOrUpdate("Admin.Rules.RuleOperator.NotContainsOperator", "Not contains", "Enthlt nicht"); builder.AddOrUpdate("Admin.Rules.RuleOperator.StartsWithOperator", "Starts with", "Beginnt mit"); builder.AddOrUpdate("Admin.Rules.RuleOperator.InOperator", "In", "Ist eine von"); builder.AddOrUpdate("Admin.Rules.RuleOperator.NotInOperator", "Not in", "Ist KEINE von"); @@ -370,49 +370,49 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "At least one value left is included right", "Mind. ein Wert links ist rechts enthalten", "True for left {1,2,3} and right {5,4,3}. False for left {1,2,3} and right {6,5,4}.", - "Wahr f�r links {1,2,3} und rechts {5,4,3}. Falsch f�r links {1,2,3} und rechts {6,5,4}."); + "Wahr fr links {1,2,3} und rechts {5,4,3}. Falsch fr links {1,2,3} und rechts {6,5,4}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.NotInOperator", "At least one value left is missing right", "Mind. ein Wert links fehlt rechts", "True for left {1,2,3} and right {3,4,5,6}. False for left {1,2,3} and right {5,4,3,2,1}.", - "Wahr f�r links {1,2,3} und rechts {3,4,5,6}. Falsch f�r links {1,2,3} und rechts {5,4,3,2,1}."); + "Wahr fr links {1,2,3} und rechts {3,4,5,6}. Falsch fr links {1,2,3} und rechts {5,4,3,2,1}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.AllInOperator", "Right contains ALL values of left", - "Rechts enth�lt ALLE Werte von links", + "Rechts enthlt ALLE Werte von links", "True for left {3,2,1} and right {0,1,2,3}. False for left {1,2,9} and right {9,8,2}.", - "Wahr f�r links {3,2,1} und rechts {0,1,2,3}. Falsch f�r links {1,2,9} und rechts {9,8,2}."); + "Wahr fr links {3,2,1} und rechts {0,1,2,3}. Falsch fr links {1,2,9} und rechts {9,8,2}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.NotAllInOperator", "Right contains NO value of left", - "Rechts enth�lt KEINEN Wert von links", + "Rechts enthlt KEINEN Wert von links", "True for left {1,2,3} and right {4,5}. False for left {1,2,3} and right {3,4,5}.", - "Wahr f�r links {1,2,3} und rechts {4,5}. Falsch f�r links {1,2,3} und rechts {3,4,5}."); + "Wahr fr links {1,2,3} und rechts {4,5}. Falsch fr links {1,2,3} und rechts {3,4,5}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.ContainsOperator", "Left contains ALL values of right", - "Links enth�lt ALLE Werte von rechts", + "Links enthlt ALLE Werte von rechts", "True for left {3,2,1,0} and right {2,3}. False for left {3,2,1} and right {0,1,2,3}.", - "Wahr f�r links {3,2,1,0} und rechts {2,3}. Falsch f�r links {3,2,1} und rechts {0,1,2,3}."); + "Wahr fr links {3,2,1,0} und rechts {2,3}. Falsch fr links {3,2,1} und rechts {0,1,2,3}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.NotContainsOperator", "Left contains NO value of right", - "Links enth�lt KEINEN Wert von rechts", + "Links enthlt KEINEN Wert von rechts", "True for left {1,2,3} and right {9,8}. False for left {1,2,3} and right {9,8,2}.", - "Wahr f�r links {1,2,3} und rechts {9,8}. Falsch f�r links {1,2,3} und rechts {9,8,2}."); + "Wahr fr links {1,2,3} und rechts {9,8}. Falsch fr links {1,2,3} und rechts {9,8,2}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.EqualOperator", "Left and right contain the same values", "Links und rechts enthalten dieselben Werte", "True for left {1,2,3} and right {3,1,2}. False for left {1,2,3} and right {1,2,3,4}.", - "Wahr f�r links {1,2,3} und rechts {3,1,2}. Falsch f�r links {1,2,3} und rechts {1,2,3,4}."); + "Wahr fr links {1,2,3} und rechts {3,1,2}. Falsch fr links {1,2,3} und rechts {1,2,3,4}."); builder.AddOrUpdate("Admin.Rules.RuleOperator.Sequence.NotEqualOperator", "Left and right differ in at least one value", "Links und rechts unterscheiden sich in mind. einem Wert", "True for left {1,2,3} and right {1,2,3,4}. False for left {1,2,3} and right {3,1,2}.", - "Wahr f�r links {1,2,3} und rechts {1,2,3,4}. Falsch f�r links {1,2,3} und rechts {3,1,2}."); + "Wahr fr links {1,2,3} und rechts {1,2,3,4}. Falsch fr links {1,2,3} und rechts {3,1,2}."); builder.AddOrUpdate("Enums.SmartStore.Rules.RuleScope.Cart", "Cart", "Warenkorb"); builder.AddOrUpdate("Enums.SmartStore.Rules.RuleScope.OrderItem", "Order item", "Bestellposition"); @@ -421,7 +421,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Enums.SmartStore.Rules.RuleScope.Cart.Hint", "Rule to grant discounts to the customer or offer shipping and payment methods.", - "Regel, um dem Kunden Rabatte zu gew�hren oder Versand- und Zahlarten anzubieten."); + "Regel, um dem Kunden Rabatte zu gewhren oder Versand- und Zahlarten anzubieten."); builder.AddOrUpdate("Enums.SmartStore.Rules.RuleScope.Customer.Hint", "Rule to automatically assign customers to customer roles per scheduled task.", @@ -438,7 +438,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "RGB color", "RGB-Farbe", "Specifies a color for the color squares control.", - "Legt eine Farbe f�r das Farbquadrat-Steuerelement fest."); + "Legt eine Farbe fr das Farbquadrat-Steuerelement fest."); builder.AddOrUpdate("Admin.Catalog.Attributes.SpecificationAttributes.Options.Fields.Picture", "Picture", @@ -462,7 +462,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Requirements", "Voraussetzungen", "Specifies requirements for the applying of the discount. The discount is applied when one of the selected rules is fulfilled.", - "Legt Voraussetzungen f�r die Anwendung des Rabatts fest. Der Rabatt wird gew�hrt, wenn eine der ausgew�hlten Regeln erf�llt ist."); + "Legt Voraussetzungen fr die Anwendung des Rabatts fest. Der Rabatt wird gewhrt, wenn eine der ausgewhlten Regeln erfllt ist."); builder.AddOrUpdate("Admin.Rules.RuleSet.AssignedObjects", "Assigned {0}", @@ -474,15 +474,15 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Requirements", "Voraussetzungen", "Specifies requirements for the availability of the shipping method. The shipping method is offered if one of the selected rules is fulfilled.", - "Legt Voraussetzungen f�r die Verf�gbarkeit der Versandart fest. Die Versandart wird angeboten, wenn eine der ausgew�hlten Regeln erf�llt ist."); + "Legt Voraussetzungen fr die Verfgbarkeit der Versandart fest. Die Versandart wird angeboten, wenn eine der ausgewhlten Regeln erfllt ist."); builder.AddOrUpdate("Admin.Configuration.Payment.Methods.Requirements", "Requirements", "Voraussetzungen", "Specifies requirements for the availability of the payment method. The payment method is offered if one of the selected rules is fulfilled.", - "Legt Voraussetzungen f�r die Verf�gbarkeit der Zahlart fest. Die Zahlart wird angeboten, wenn eine der ausgew�hlten Regeln erf�llt ist."); + "Legt Voraussetzungen fr die Verfgbarkeit der Zahlart fest. Die Zahlart wird angeboten, wenn eine der ausgewhlten Regeln erfllt ist."); - builder.AddOrUpdate("Admin.Common.IsPublished", "Published", "Ver�ffentlicht"); + builder.AddOrUpdate("Admin.Common.IsPublished", "Published", "Verffentlicht"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Discounts.DiscountType.AssignedToOrderTotal") .Value("de", "Bezogen auf Gesamtsumme"); @@ -498,11 +498,11 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) .Value("de", "Bezogen auf Zwischensumme"); builder.AddOrUpdate("Admin.Configuration.Settings.Blog.NotifyAboutNewBlogComments.Hint") - .Value("de", "Der Administrator erh�lt eine Benachrichtigungen bei neuen Blogkommentaren."); + .Value("de", "Der Administrator erhlt eine Benachrichtigungen bei neuen Blogkommentaren."); builder.AddOrUpdate("ActivityLog.EditSettings", "The setting {0} has been changed. The new value is {1}.", - "Die Einstellung {0} wurde ge�ndert. Der neue Wert ist {1}."); + "Die Einstellung {0} wurde gendert. Der neue Wert ist {1}."); builder.AddOrUpdate("Admin.Catalog.Products.Fields.Condition", "Product condition", @@ -517,13 +517,13 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Legt fest, ob der Artikelzustand im Shop angezeigt werden soll."); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductCondition.New", "New", "Neu"); - builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductCondition.Refurbished", "Refurbished", "General�berholt"); + builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductCondition.Refurbished", "Refurbished", "Generalberholt"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductCondition.Used", "Used", "Gebraucht"); builder.AddOrUpdate("Enums.SmartStore.Core.Domain.Catalog.ProductCondition.Damaged", "Damaged", "Defekt"); builder.AddOrUpdate("Products.Condition", "Product condition", "Artikelzustand"); - builder.AddOrUpdate("Common.OpenUrl", "Open URL", "URL �ffnen"); - builder.AddOrUpdate("Common.NoPreview", "A preview is not available.", "Eine Vorschau ist nicht verf�gbar."); + builder.AddOrUpdate("Common.OpenUrl", "Open URL", "URL ffnen"); + builder.AddOrUpdate("Common.NoPreview", "A preview is not available.", "Eine Vorschau ist nicht verfgbar."); builder.AddOrUpdate("Admin.Orders.Shipments.TrackingNumber", "Tracking number", @@ -546,26 +546,26 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Customers.CustomerRoles.AutomatedAssignmentRules", "Rules for automated assignment", - "Regeln f�r automatische Zuordnung", + "Regeln fr automatische Zuordnung", "Customers are automatically assigned to this customer group by scheduled task if they fulfill one of the selected rules.", - "Kunden werden automatisch per geplanter Aufgabe dieser Kundengruppe zugeordnet, wenn sie eine der gew�hlten Regeln erf�llen."); + "Kunden werden automatisch per geplanter Aufgabe dieser Kundengruppe zugeordnet, wenn sie eine der gewhlten Regeln erfllen."); builder.AddOrUpdate("Admin.Catalog.Categories.AutomatedAssignmentRules", "Rules for automated assignment", - "Regeln f�r automatische Zuordnung", + "Regeln fr automatische Zuordnung", "Products are automatically assigned to this category by scheduled task if they fulfill one of the selected rules.", - "Produkte werden automatisch per geplanter Aufgabe dieser Warengruppe zugeordnet, wenn sie eine der gew�hlten Regeln erf�llen."); + "Produkte werden automatisch per geplanter Aufgabe dieser Warengruppe zugeordnet, wenn sie eine der gewhlten Regeln erfllen."); - builder.AddOrUpdate("Admin.Rules.AddedByRule", "Added by rule", "Durch Regel hinzugef�gt"); + builder.AddOrUpdate("Admin.Rules.AddedByRule", "Added by rule", "Durch Regel hinzugefgt"); builder.AddOrUpdate("Admin.Rules.ReapplyRules", "Reapply rules", "Regeln neu anwenden"); builder.AddOrUpdate("Admin.CustomerRoleMapping.RoleMappingListDescription", "The list shows customers who are assigned to this customer role. Customers are automatically assigned by scheduled task as long as the group is active and active rules are specified for it. You can make a manual assignment using the customer role selection at the respective customer.", - "Die Liste zeigt Kunden, die dieser Kundengruppe zugeordnet sind. Kunden werden automatisch per geplanter Aufgabe zugeordnet, sofern die Gruppe aktiv ist und f�r sie aktive Regeln festgelegt sind. Eine manuelle Zuordnung k�nnen Sie �ber die Kundengruppenauswahl beim jeweiligen Kunden vornehmen."); + "Die Liste zeigt Kunden, die dieser Kundengruppe zugeordnet sind. Kunden werden automatisch per geplanter Aufgabe zugeordnet, sofern die Gruppe aktiv ist und fr sie aktive Regeln festgelegt sind. Eine manuelle Zuordnung knnen Sie ber die Kundengruppenauswahl beim jeweiligen Kunden vornehmen."); builder.AddOrUpdate("Admin.Catalog.Categories.ProductListDescription", "The list shows products that are assigned to this category. Products are automatically assigned by scheduled task as long as the category is published and active rules are specified for it.", - "Die Liste zeigt Produkte, die dieser Warengruppe zugeordnet sind. Produkte werden automatisch per geplanter Aufgabe zugeordnet, sofern die Warengruppe ver�ffentlicht ist und f�r sie aktive Regeln festgelegt sind."); + "Die Liste zeigt Produkte, die dieser Warengruppe zugeordnet sind. Produkte werden automatisch per geplanter Aufgabe zugeordnet, sofern die Warengruppe verffentlicht ist und fr sie aktive Regeln festgelegt sind."); builder.AddOrUpdate("Admin.System.ScheduleTasks.TaskNotFound", "The scheduled task \"{0}\" was not found.", @@ -575,8 +575,8 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.SalesReport.ByAmount", "By amount", "Nach Betrag"); builder.AddOrUpdate("Admin.SalesReport.Attribute", "Attributes", "Attribute"); builder.AddOrUpdate("Admin.SalesReport.Value", "Values", "Werte"); - builder.AddOrUpdate("Admin.SalesReport.NewOrders", "Total new orders", "Neue Auftr�ge"); - builder.AddOrUpdate("Admin.SalesReport.NoIncompleteOrders", "No incomplete orders", "Keine unvollst�ndigen Auftr�ge"); + builder.AddOrUpdate("Admin.SalesReport.NewOrders", "Total new orders", "Neue Auftrge"); + builder.AddOrUpdate("Admin.SalesReport.NoIncompleteOrders", "No incomplete orders", "Keine unvollstndigen Auftrge"); builder.AddOrUpdate("Admin.Report.StoreStatistics", "Statistics", "Statistiken"); builder.AddOrUpdate("Admin.Report.CustomerRegistrations", "Customer registrations", "Kundenregistrierungen"); builder.AddOrUpdate("Admin.Report.Today", "Today", "Heute"); @@ -586,15 +586,15 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Report.ThisYear", "This year", "Dieses Jahr"); builder.AddOrUpdate("Admin.Report.Overall", "Overall", "Insgesamt"); builder.AddOrUpdate("Admin.Promotions.NewsLetterSubscriptions.Short", "Newsletter abos", "Newsletter Abos"); - builder.AddOrUpdate("Admin.Promotions.SalesReport.Sales", "Sales", "Verk�ufe"); + builder.AddOrUpdate("Admin.Promotions.SalesReport.Sales", "Sales", "Verkufe"); builder.AddOrUpdate("Common.Amount", "Amount", "Betrag"); builder.AddOrUpdate("Admin.Catalog.Products.ProductVariantAttributes.AttributeCombinations.Short", "Combinations", "Kombinationen"); builder.AddOrUpdate("Admin.CurrentWishlists.Short", "Whishlists", "Wunschlisten"); - builder.AddOrUpdate("Admin.CurrentCarts.Short", "Shopping carts", "Warenk�rbe"); + builder.AddOrUpdate("Admin.CurrentCarts.Short", "Shopping carts", "Warenkrbe"); builder.AddOrUpdate("Admin.SalesReport.Sales", "Sales", "Umsatz"); - builder.AddOrUpdate("Admin.SalesReport.Sales.Hint", "Total value of all orders", "Gesamtwert aller Auftr�ge"); + builder.AddOrUpdate("Admin.SalesReport.Sales.Hint", "Total value of all orders", "Gesamtwert aller Auftrge"); builder.AddOrUpdate("Admin.Report.OnlineCustomers", "Customers online within last 15 minutes", "Kunden in den letzten 15 Minuten online"); - builder.AddOrUpdate("Admin.Orders.Overall", "Orders overall", "Auftr�ge insgesamt"); + builder.AddOrUpdate("Admin.Orders.Overall", "Orders overall", "Auftrge insgesamt"); builder.AddOrUpdate("Admin.Report.Registrations", "Registrations", "Registrierungen"); builder.AddOrUpdate("Common.FileUploader.Upload", "To upload files drop them here or click.", "Zum Hochladen Dateien hier ablegen oder klicken."); @@ -611,26 +611,26 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("FileUploader.StatusWindow.Canceled.Files", "uploads canceled", "Uploads abgebrochen"); builder.AddOrUpdate("FileUploader.StatusWindow.Collapse.Title", "Minimize", "Minimieren"); - builder.AddOrUpdate("FileUploader.DuplicateDialog.Title", "Replace or skip", "Ersetzen oder �berspringen"); + builder.AddOrUpdate("FileUploader.DuplicateDialog.Title", "Replace or skip", "Ersetzen oder berspringen"); builder.AddOrUpdate("FileUploader.DuplicateDialog.Intro", "A file with the name already exists in the target.", "Im Ziel ist bereits eine Datei mit dem Namen vorhanden."); builder.AddOrUpdate("FileUploader.DuplicateDialog.DupeFile.Title", "Source file", "Quelldatei"); builder.AddOrUpdate("FileUploader.DuplicateDialog.ExistingFile.Title", "Destination file", "Zieldatei"); - builder.AddOrUpdate("FileUploader.DuplicateDialog.Option.Skip", "Skip this file", "Diese Datei �berspringen"); + builder.AddOrUpdate("FileUploader.DuplicateDialog.Option.Skip", "Skip this file", "Diese Datei berspringen"); builder.AddOrUpdate("FileUploader.DuplicateDialog.Option.Replace", "Replace file in target", "Datei im Ziel ersetzen"); builder.AddOrUpdate("FileUploader.DuplicateDialog.Option.Rename", "Rename file", "Datei umbenennen"); builder.AddOrUpdate("FileUploader.DuplicateDialog.Option.SaveSelection", "Remember selection and apply to remaing conflicts", "Auswahl merken und auf verbleibende Konflikte anwenden"); builder.AddOrUpdate("FileUploader.Dropzone.DictDefaultMessage", "Drop files here to upload", "Dateien zum Hochladen hier ablegen"); - builder.AddOrUpdate("FileUploader.Dropzone.DictFallbackMessage", "Your browser does not support drag'n'drop file uploads.", "Ihr Browser unterst�tzt keine Datei-Uploads per Drag'n'Drop."); - builder.AddOrUpdate("FileUploader.Dropzone.DictFallbackText", "Please use the fallback form below to upload your files like in the olden days.", "Bitte benutzen Sie das untenstehende Formular, um Ihre Dateien wie in l�ngst vergangenen Zeiten hochzuladen."); - builder.AddOrUpdate("FileUploader.Dropzone.DictFileTooBig", "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.", "Die Datei ist zu gro� ({{filesize}}MB). Maximale Dateigr��e: {{maxFilesize}}MB."); - builder.AddOrUpdate("FileUploader.Dropzone.DictInvalidFileType", "You can't upload files of this type.", "Dateien dieses Typs k�nnen nicht hochgeladen werden."); - builder.AddOrUpdate("FileUploader.Dropzone.DictResponseError", "Server responded with {{statusCode}} code.", "Der Server gab die Antwort {{statusCode}} zur�ck."); + builder.AddOrUpdate("FileUploader.Dropzone.DictFallbackMessage", "Your browser does not support drag'n'drop file uploads.", "Ihr Browser untersttzt keine Datei-Uploads per Drag'n'Drop."); + builder.AddOrUpdate("FileUploader.Dropzone.DictFallbackText", "Please use the fallback form below to upload your files like in the olden days.", "Bitte benutzen Sie das untenstehende Formular, um Ihre Dateien wie in lngst vergangenen Zeiten hochzuladen."); + builder.AddOrUpdate("FileUploader.Dropzone.DictFileTooBig", "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.", "Die Datei ist zu gro ({{filesize}}MB). Maximale Dateigre: {{maxFilesize}}MB."); + builder.AddOrUpdate("FileUploader.Dropzone.DictInvalidFileType", "You can't upload files of this type.", "Dateien dieses Typs knnen nicht hochgeladen werden."); + builder.AddOrUpdate("FileUploader.Dropzone.DictResponseError", "Server responded with {{statusCode}} code.", "Der Server gab die Antwort {{statusCode}} zurck."); builder.AddOrUpdate("FileUploader.Dropzone.DictCancelUpload", "Cancel upload", "Upload abbrechen"); builder.AddOrUpdate("FileUploader.Dropzone.DictUploadCanceled", "Upload canceled.", "Upload abgebrochen."); builder.AddOrUpdate("FileUploader.Dropzone.DictCancelUploadConfirmation", "Are you sure you want to cancel this upload?", "Sind Sie sicher, dass Sie den Upload abbrechen wollen?"); builder.AddOrUpdate("FileUploader.Dropzone.DictRemoveFile", "Remove file", "Datei entfernen"); - builder.AddOrUpdate("FileUploader.Dropzone.DictMaxFilesExceeded", "You can not upload any more files.", "Sie k�nnen keine weiteren Dateien hochladen."); + builder.AddOrUpdate("FileUploader.Dropzone.DictMaxFilesExceeded", "You can not upload any more files.", "Sie knnen keine weiteren Dateien hochladen."); builder.AddOrUpdate("Admin.Catalog.Products.ProductPictures.Delete.Success", "The assignment was successfully removed.", "Die Zuordnung wurde erfolgreich entfernt."); @@ -648,71 +648,71 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Configuration.Settings.Media.MaxUploadFileSize", "Maximum file size", - "Maximale Dateigr��e", + "Maximale Dateigre", "Specifies the maximum file size of an upload (in KB). The default is 102,400 (100 MB).", - "Legt die maximale Dateigr��e eines Uploads in KB fest. Der Standardwert ist 102.400 (100 MB)."); + "Legt die maximale Dateigre eines Uploads in KB fest. Der Standardwert ist 102.400 (100 MB)."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapEnabled", "Enable XML Sitemap", "XML-Sitemap aktivieren", "The XML sitemap contains URLs to store pages which can be automatically read and indexed by search engines like Google or Bing.", - "Die XML-Sitemap enth�lt URLs zu Shop-Seiten, welche von Suchmaschinen wie Google oder Bing automatisch gelesen und indiziert werden k�nnen."); + "Die XML-Sitemap enthlt URLs zu Shop-Seiten, welche von Suchmaschinen wie Google oder Bing automatisch gelesen und indiziert werden knnen."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesBlog", "Include blog posts", - "Blog-Eintr�ge einbeziehen", + "Blog-Eintrge einbeziehen", "Adds blog pages to sitemap.", - "F�gt Blog-Seiten zur Sitemap hinzu."); + "Fgt Blog-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesCategories", "Include categories", "Warengruppen einbeziehen", "Adds category pages to sitemap.", - "F�gt Warengruppen-Seiten zur Sitemap hinzu."); + "Fgt Warengruppen-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesForum", "Include forums", "Foren einbeziehen", "Adds forum pages to sitemap.", - "F�gt Forum-Seiten zur Sitemap hinzu."); + "Fgt Forum-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesManufacturers", "Include brands", "Hersteller einbeziehen", "Adds brand pages to sitemap.", - "F�gt Hersteller-Seiten zur Sitemap hinzu."); + "Fgt Hersteller-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesNews", "Include news", "News einbeziehen", "Adds news pages to sitemap.", - "F�gt News-Seiten zur Sitemap hinzu."); + "Fgt News-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesProducts", "Include products", "Produkte einbeziehen", "Adds product pages to sitemap.", - "F�gt Produkt-Seiten zur Sitemap hinzu."); + "Fgt Produkt-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.XmlSitemapIncludesTopics", "Include topics", "Seiten einbeziehen", "Adds topic pages to sitemap.", - "F�gt Inhalts-Seiten zur Sitemap hinzu."); + "Fgt Inhalts-Seiten zur Sitemap hinzu."); builder.AddOrUpdate("Admin.System.XMLSitemap", "XML Sitemap", "XML-Sitemap"); builder.AddOrUpdate("Admin.Configuration.Settings.Media.MakeFilesTransientWhenOrphaned", "Automatically delete orphaned files", - "Verwaiste Dateien automatisch l�schen", + "Verwaiste Dateien automatisch lschen", "Specifies whether orphaned media files should be automatically deleted during the next cleanup operation.", - "Legt fest, ob verwaiste Mediendateien beim n�chsten Aufr�umvorgang automatisch gel�scht werden sollen."); + "Legt fest, ob verwaiste Mediendateien beim nchsten Aufrumvorgang automatisch gelscht werden sollen."); builder.AddOrUpdate("Admin.Configuration.Settings.Media.MediaTypes", "Media types", "Medientypen"); builder.AddOrUpdate("Admin.Configuration.Settings.Media.MediaTypesNotes", "Media types control which files can be uploaded. All other media types are generally rejected. Please enter types separated by spaces and without dots.", - "Medientypen steuern, welche Dateien hochgeladen werden k�nnen. Alle anderen Medientypen werden grunds�tzlich abgelehnt. Die Typen bitte Leerzeichen getrennt und ohne Punkt angeben."); + "Medientypen steuern, welche Dateien hochgeladen werden knnen. Alle anderen Medientypen werden grundstzlich abgelehnt. Die Typen bitte Leerzeichen getrennt und ohne Punkt angeben."); builder.AddOrUpdate("Admin.Configuration.Settings.Media.Type.Image", "Image", "Bild"); builder.AddOrUpdate("Admin.Configuration.Settings.Media.Type.Video", "Video", "Video"); @@ -727,11 +727,11 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) "Rabattzeichen anzeigen", "Legt fest, ob ein Rabattzeichen auf dem Produktbild angezeigt werden soll, wenn Rabatte angewendet wurden."); - builder.AddOrUpdate("Admin.Common.IsPublished", "Published", "Ver�ffentlicht"); + builder.AddOrUpdate("Admin.Common.IsPublished", "Published", "Verffentlicht"); builder.AddOrUpdate("Admin.CheckUpdate.AutoUpdatePossibleInfo", "<p>This update can be installed automatically. For this Smartstore downloads an installation package to your webserver, executes it and restarts the application. Before the installation your shop directory is backed up, except the folders <i>App_Data</i> and <i>Media</i>, as well as the SQL Server database file. </p><p>Click the <b>Update now</b> button to download and install the package. As an alternative to this, you can download the package to your local PC further below and perform the installation at a later time manually.</p>", - "<p>Dieses Update kann automatisch installiert werden. Hierf�r l�dt Smartstore ein Installationspaket auf Ihren Webserver herunter, f�hrt die Installation durch und startet die Anwendung neu. Vor der Installation wird der Verzeichnisinhalt Ihres Shops gesichert, mit Ausnahme der Ordner <i>App_Data</i> und <i>Media</i> sowie der SQL Server Datenbank. </p><p>Klicken Sie die Schaltfl�che <b>Jetzt aktualisieren</b>, um das Paket downzuloaden und zu installieren. Alternativ hierzu k�nnen Sie weiter unten das Paket auf Ihren lokalen PC downloaden und die Installation zu einem sp�teren Zeitpunkt manuell durchf�hren.</p>"); + "<p>Dieses Update kann automatisch installiert werden. Hierfr ldt Smartstore ein Installationspaket auf Ihren Webserver herunter, fhrt die Installation durch und startet die Anwendung neu. Vor der Installation wird der Verzeichnisinhalt Ihres Shops gesichert, mit Ausnahme der Ordner <i>App_Data</i> und <i>Media</i> sowie der SQL Server Datenbank. </p><p>Klicken Sie die Schaltflche <b>Jetzt aktualisieren</b>, um das Paket downzuloaden und zu installieren. Alternativ hierzu knnen Sie weiter unten das Paket auf Ihren lokalen PC downloaden und die Installation zu einem spteren Zeitpunkt manuell durchfhren.</p>"); builder.AddOrUpdate("Admin.AppNews", "Smartstore News", @@ -743,15 +743,15 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Common.About", "About Smartstore", - "�ber Smartstore"); + "ber Smartstore"); builder.AddOrUpdate("Admin.Help.OtherWorkNote", "Smartstore includes works distributed under the licenses listed below. Please refer to the specific resources for more detailed information about the authors, copyright notices and licenses.", - "Smartstore beinhaltet Werke, die unter den unten aufgef�hrten Lizenzen vertrieben werden. Bitte beachten Sie die betreffenden Ressourcen f�r ausf�hrlichere Informationen �ber Autoren, Copyright-Vermerke und Lizenzen."); + "Smartstore beinhaltet Werke, die unter den unten aufgefhrten Lizenzen vertrieben werden. Bitte beachten Sie die betreffenden Ressourcen fr ausfhrlichere Informationen ber Autoren, Copyright-Vermerke und Lizenzen."); builder.AddOrUpdate("Admin.Marketplace.ComingSoon", "In the Smartstore Marketplace we offer modules, themes & language packages, which will make your shop better and more successful. Once we are ready to go, you'll be informed about the latest extensions here. Stay tuned...", - "Im Smartstore Marketplace werden Module, Themes & Sprachpakete angeboten, die Ihren Onlineshop besser, flexibler und erfolgreicher machen sollen. Sobald wir die Arbeiten am Marketplace abgeschlossen haben, werden Sie hier �ber die neuesten Erweiterungen informiert."); + "Im Smartstore Marketplace werden Module, Themes & Sprachpakete angeboten, die Ihren Onlineshop besser, flexibler und erfolgreicher machen sollen. Sobald wir die Arbeiten am Marketplace abgeschlossen haben, werden Sie hier ber die neuesten Erweiterungen informiert."); builder.AddOrUpdate("Admin.Packaging.IsIncompatible", "The package is not compatible the current app version {0}. Please update Smartstore or install another version of this package.", @@ -775,8 +775,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.System.Warnings.IncompatiblePlugin", "'{0}' plugin is incompatible with your Smartstore version. Delete it or update to the latest version.", - "'{0}' Plugin ist nicht kompatibel mit Ihrer Smartstore-Version. L�schen Sie es oder installieren Sie die richtige Version."); - + "'{0}' Plugin ist nicht kompatibel mit Ihrer Smartstore-Version. Lschen Sie es oder installieren Sie die richtige Version."); builder.AddOrUpdate("Admin.Media.Exception.FileNotFound", "Media file with Id '{0}' does not exist.", @@ -796,31 +795,31 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Media.Exception.NotSameAlbum", "The file operation requires that the destination path belongs to the source album. Source: {0}, Destination: {1}.", - "Die Dateioperation erfordert, dass der Zielpfad zum Ursprungsalbum geh�rt. Quelle: {0}, Ziel: {1}."); + "Die Dateioperation erfordert, dass der Zielpfad zum Ursprungsalbum gehrt. Quelle: {0}, Ziel: {1}."); builder.AddOrUpdate("Admin.Media.Exception.DeniedMediaType", "The media type of '{0}' is not allowed. If you want the media type '{1}' supported, enter the file name extension to the media configuration under 'Configuration > Settings > Media > Media types'.", - "Der Medientyp von '{0}' ist unzul�ssig. Wenn Sie wollen, dass der Medientyp '{1}' unterst�tzt wird, tragen Sie die Dateiendung in die Medienkonfiguration unter 'Konfiguration > Einstellungen > Medien > Medientypen' ein."); + "Der Medientyp von '{0}' ist unzulssig. Wenn Sie wollen, dass der Medientyp '{1}' untersttzt wird, tragen Sie die Dateiendung in die Medienkonfiguration unter 'Konfiguration > Einstellungen > Medien > Medientypen' ein."); builder.AddOrUpdate("Admin.Media.Exception.DeniedMediaType.Hint", " Accepted: {0}, current: {1}.", - " Akzeptiert: {0}, ausgew�hlt: {1}."); + " Akzeptiert: {0}, ausgewhlt: {1}."); builder.AddOrUpdate("Admin.Media.Exception.ExtractThumbnail", "Thumbnail extraction for file '{0}' failed. Reason: {1}.", - "Thumbnail-Erstellung f�r die Datei '{0}' ist fehlgeschlagen. Grund: {1}."); + "Thumbnail-Erstellung fr die Datei '{0}' ist fehlgeschlagen. Grund: {1}."); builder.AddOrUpdate("Admin.Media.Exception.MaxFileSizeExceeded", "The file '{0}' with a size of {1} exceeds the maximum allowed file size of {2}.", - "Die Datei '{0}' mit einer Gr��e von {1} �berschreitet die maximal zul�ssige Dateigr��e von {2}."); + "Die Datei '{0}' mit einer Gre von {1} berschreitet die maximal zulssige Dateigre von {2}."); builder.AddOrUpdate("Admin.Media.Exception.TopLevelAlbum", "Creating top-level (album) folders is not supported. Folder: {0}.", - "Das Erstellen von Ordnern auf oberster Ebene (Album) wird nicht unterst�tzt. Ordner: {0}."); + "Das Erstellen von Ordnern auf oberster Ebene (Album) wird nicht untersttzt. Ordner: {0}."); builder.AddOrUpdate("Admin.Media.Exception.AlterRootAlbum", "Moving or renaming root album folders is not supported. Folder: {0}.", - "Das Verschieben oder Umbenennen von Album-Stammordnern wird nicht unterst�tzt. Ordner: {0}."); + "Das Verschieben oder Umbenennen von Album-Stammordnern wird nicht untersttzt. Ordner: {0}."); builder.AddOrUpdate("Admin.Media.Exception.DescendantFolder", "Destination folder '{0}' is not allowed to be a descendant of source folder '{1}'.", @@ -828,31 +827,31 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Media.Exception.CopyRootAlbum", "Copying root album folders is not supported. Folder: {0}.", - "Das Kopieren von Album-Stammordnern wird nicht unterst�tzt. Ordner: {0}."); + "Das Kopieren von Album-Stammordnern wird nicht untersttzt. Ordner: {0}."); builder.AddOrUpdate("Admin.Media.Exception.InUse", "Cannot delete file '{0}' because it is being used by another process.", - "Datei '{0}' kann nicht gel�scht werden, da sie von einem anderen Prozess verwendet wird."); + "Datei '{0}' kann nicht gelscht werden, da sie von einem anderen Prozess verwendet wird."); builder.AddOrUpdate("Admin.Media.Exception.PathSpecification", "Invalid path specification '{0}' for '{1}' operation.", - "Ung�ltige Pfadangabe '{0}' f�r den Befehl '{1}'."); + "Ungltige Pfadangabe '{0}' fr den Befehl '{1}'."); builder.AddOrUpdate("Admin.Media.Exception.InvalidPath", "Invalid path '{0}'.", - "Ung�ltiger Pfad '{0}'."); + "Ungltiger Pfad '{0}'."); builder.AddOrUpdate("Admin.Media.Exception.InvalidPathExample", "Invalid path '{0}'. Valid path expression is: {{albumName}}[/subfolders]/{{fileName}}.{{extension}}", - "Ung�ltiger Pfad '{0}'. Ein g�ltiger Pfadausdruck lautet: {{albumName}}[/subfolders]/{{fileName}}.{{extension}}"); + "Ungltiger Pfad '{0}'. Ein gltiger Pfadausdruck lautet: {{albumName}}[/subfolders]/{{fileName}}.{{extension}}"); builder.AddOrUpdate("Admin.Media.Exception.FileExtension", "Cannot process files without file extension. Path: {0}", - "Dateien ohne Dateiendung k�nnen nicht verarbeitet werden. Pfad: {0}"); + "Dateien ohne Dateiendung knnen nicht verarbeitet werden. Pfad: {0}"); builder.AddOrUpdate("Admin.Media.Exception.Overwrite", "Overwrite operation is not possible if source and destination folders are identical.", - "Ein �berschreibvorgang ist nicht m�glich, wenn Quell- und Zielordner identisch sind."); + "Ein berschreibvorgang ist nicht mglich, wenn Quell- und Zielordner identisch sind."); builder.AddOrUpdate("Admin.Media.Exception.FolderAssignment", "Cannot operate on files without folder assignment.", @@ -860,7 +859,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Media.Exception.MimeType", "The file operation '{0}' does not allow MIME type switching. Source MIME: {1}, target MIME: {2}.", - "Die Dateioperation '{0}' erlaubt keine �nderung des MIME-Typs. Quell-MIME: {1}, Ziel-MIME: {2}."); + "Die Dateioperation '{0}' erlaubt keine nderung des MIME-Typs. Quell-MIME: {1}, Ziel-MIME: {2}."); builder.AddOrUpdate("Admin.Media.Exception.TrackUnassignedFile", "Cannot track a media file that is not assigned to any album.", @@ -872,7 +871,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Media.Exception.AlbumNoTrack", "The album '{0}' does not support track detection.", - "Das Album '{0}' unterst�tzt die Erkennung von Verweisen nicht."); + "Das Album '{0}' untersttzt die Erkennung von Verweisen nicht."); builder.AddOrUpdate("Admin.Media.Exception.NullInputStream", "Input stream was null", @@ -884,7 +883,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder) builder.AddOrUpdate("Admin.Media.Exception.DeleteReferenzedFile", "The file '{0}' is referenced by at least one entity. Permanently deleting referenced media files is not supported", - "Die Datei '{0}' wird von mind. einer Entit�t referenziert. Endg�ltiges L�schen referenzierter Mediendateien wird nicht unterst�tzt."); + "Die Datei '{0}' wird von mind. einer Entitt referenziert. Endgltiges Lschen referenzierter Mediendateien wird nicht untersttzt."); builder.AddOrUpdate("Common.Resume", "Resume", "Fortsetzen"); diff --git a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs index 34543f8e68..c088101f99 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs @@ -289,7 +289,6 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
  • Strict: Cookies werden nur an Anfragen derselben Website gesendet.
    • "); - builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.Privacy.ModalCookieConsent", "Modal Cookie Manager", "Cookie-Manager modal anzeigen", diff --git a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs index 9dae67f2b9..90250e1290 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs @@ -15,7 +15,6 @@ public override void Down() { } - public bool RollbackOnFailure => false; public void Seed(SmartObjectContext context) diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs index 8503451f1f..761be47b54 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.Entity.Validation; using System.Linq; using System.Text; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.cs index 26d5a65685..f92384a3d0 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; @@ -94,7 +94,6 @@ private IEnumerable ToParameters(params object[] parameters) } } - var isLegacyDb = !this.IsSqlServer2012OrHigher(); if (isLegacyDb && hasOutputParams) { diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/ActivityLogTypeMigrator.cs b/src/Libraries/SmartStore.Data/Setup/Builder/ActivityLogTypeMigrator.cs index c6419d7f3b..262bb43864 100644 --- a/src/Libraries/SmartStore.Data/Setup/Builder/ActivityLogTypeMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/Builder/ActivityLogTypeMigrator.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Localization; diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesBuilder.cs b/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesBuilder.cs index 6459b02090..cebc17bb3d 100644 --- a/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesBuilder.cs +++ b/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesBuilder.cs @@ -157,7 +157,6 @@ public IResourceAddBuilder Value(string lang, string value) return this; } - public IResourceAddBuilder Hint(string value) { return Hint(null, value); diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs b/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs index eadb6db49d..5e1857deac 100644 --- a/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/Builder/LocaleResourcesMigrator.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Localization; diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs b/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs index 16eccfdfd4..2cd7cd0eb4 100644 --- a/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/Builder/SettingsMigrator.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Configuration; diff --git a/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs b/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs index 61c6c92d0d..98b8336509 100644 --- a/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs +++ b/src/Libraries/SmartStore.Data/Setup/DbMigrationContext.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Collections; diff --git a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs index 633c5ff6b1..aba6a2f56c 100644 --- a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Migrations; using System.Data.Entity.Migrations.Infrastructure; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/Setup/IDataSeeder.cs b/src/Libraries/SmartStore.Data/Setup/IDataSeeder.cs index 72f5a511a0..2a2fa6c93d 100644 --- a/src/Libraries/SmartStore.Data/Setup/IDataSeeder.cs +++ b/src/Libraries/SmartStore.Data/Setup/IDataSeeder.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; namespace SmartStore.Data.Setup { diff --git a/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs index 1e48290630..df397b6766 100644 --- a/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Migrations; using SmartStore.Data.Migrations; diff --git a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs index a4d10d520a..33b1096c41 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.Entity.Migrations; using System.Linq; using SmartStore.Collections; diff --git a/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs b/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs index 4ed6df0496..f7b6c5beda 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs @@ -101,7 +101,6 @@ private static TType CreateTypeInstance(string typeName) where TType : cl return newType as TType; } - public static void ExecutePendingResourceMigrations(string resPath, SmartObjectContext dbContext) { Guard.NotNull(dbContext, nameof(dbContext)); diff --git a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Products.cs b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Products.cs index 1886ae9f64..8047ab8a6e 100644 --- a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Products.cs +++ b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Products.cs @@ -3734,7 +3734,6 @@ public IList ProductBundleItems() DisplayOrder = 3 }; - var bundlePs4 = products["Sony-PS410099"]; var bundleItemPs41 = new ProductBundleItem diff --git a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.SpecificationAttributes.cs b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.SpecificationAttributes.cs index e8deecb501..e8a889fefe 100644 --- a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.SpecificationAttributes.cs +++ b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.SpecificationAttributes.cs @@ -934,7 +934,6 @@ public IList SpecificationAttributes() DisplayOrder = 6, }); - #endregion sa23 Size #region sa24 diameter diff --git a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Variants.cs b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Variants.cs index 840dd8d046..2d9fe254bb 100644 --- a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Variants.cs +++ b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.Variants.cs @@ -303,7 +303,6 @@ public IList ProductVariantAttributes() entities.Add(attributeLensType); - var attributeFramecolor = new ProductVariantAttribute() { Product = productCustomFlak, @@ -751,7 +750,6 @@ public IList ProductVariantAttributes() entities.Add(attributeIphone7PlusMemoryCapacity); - var attributeIphone7PlusColor = new ProductVariantAttribute() { Product = productIphone7Plus, @@ -2460,7 +2458,6 @@ public IList ProductVariantAttributeCombinat var Iphone7PlusCapacity = _ctx.Set().First(x => x.ProductId == productIphone7Plus.Id && x.ProductAttributeId == attrMemoryCapacity.Id); var Iphone7PlusCapacityValues = _ctx.Set().Where(x => x.ProductVariantAttributeId == Iphone7PlusCapacity.Id).ToList(); - entities.Add(new ProductVariantAttributeCombination() { Product = productIphone7Plus, @@ -2530,7 +2527,6 @@ public IList ProductVariantAttributeCombinat AssignedMediaFileIds = picturesIphone7Plus.First(x => x.Name.Contains("-silver")).Id.ToString() }); - entities.Add(new ProductVariantAttributeCombination() { Product = productIphone7Plus, diff --git a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs index 8f1ac6d219..ee9d37f422 100644 --- a/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs +++ b/src/Libraries/SmartStore.Data/Setup/SeedData/InvariantSeedData.cs @@ -873,7 +873,6 @@ public IList Forums() DisplayOrder = 20 }; - var entities = new List { newProductsForum, packagingShippingForum @@ -955,7 +954,6 @@ public IList Discounts() EndDateUtc = new DateTime(2020, 5, 15) }; - var entities = new List { couponCodeDiscount, orderTotalDiscount, weekendDiscount, @@ -1131,7 +1129,6 @@ public IList Polls() DisplayOrder = 4, }); - var poll2 = new Poll { Language = defaultLanguage, @@ -1165,7 +1162,6 @@ public IList Polls() DisplayOrder = 4, }); - var entities = new List { poll1, poll2 @@ -1266,7 +1262,6 @@ public IList RuleSets() Value = "90" }); - // Offer free shipping method for major customers. var freeShipping = _ctx.Set().FirstOrDefault(x => x.DisplayOrder == 2); if (freeShipping != null) @@ -1282,7 +1277,6 @@ public IList RuleSets() inactiveNewCustomersRole.RuleSets.Add(inactiveNewCustomers); } - var entities = new List { weekends, majorCustomers, saleProducts, inactiveNewCustomers diff --git a/src/Libraries/SmartStore.Data/Setup/SeedData/SeedEntityExtensions.cs b/src/Libraries/SmartStore.Data/Setup/SeedData/SeedEntityExtensions.cs index f1ae049a4a..5e6c887ddd 100644 --- a/src/Libraries/SmartStore.Data/Setup/SeedData/SeedEntityExtensions.cs +++ b/src/Libraries/SmartStore.Data/Setup/SeedData/SeedEntityExtensions.cs @@ -51,7 +51,6 @@ public SeedSettingsAlterer(IList settings) } } - public class SeedEntityAlterer where T : BaseEntity { private readonly Dictionary _entityMap; // for faster access! diff --git a/src/Libraries/SmartStore.Data/Setup/SeedDbMigrationEvent.cs b/src/Libraries/SmartStore.Data/Setup/SeedDbMigrationEvent.cs index 720dddb90d..2acbb9b356 100644 --- a/src/Libraries/SmartStore.Data/Setup/SeedDbMigrationEvent.cs +++ b/src/Libraries/SmartStore.Data/Setup/SeedDbMigrationEvent.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; namespace SmartStore.Data.Setup { diff --git a/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs b/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs index e58a59a192..da9de49e26 100644 --- a/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs +++ b/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs @@ -1,8 +1,8 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Core.Common; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.Entity.Infrastructure.DependencyResolution; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; using SmartStore.Data.Caching; diff --git a/src/Libraries/SmartStore.Data/SmartObjectContext.cs b/src/Libraries/SmartStore.Data/SmartObjectContext.cs index d74769d6ed..f002fa8943 100644 --- a/src/Libraries/SmartStore.Data/SmartObjectContext.cs +++ b/src/Libraries/SmartStore.Data/SmartObjectContext.cs @@ -1,7 +1,7 @@ using System; using System.Data; -using System.Data.Entity; -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using System.Linq; using System.Reflection; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index fb594ed6a4..a346f9d972 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -1,1016 +1,30 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144} - Library - Properties - SmartStore.Data + net8.0 SmartStore.Data - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 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 + SmartStore.Data latest + disable + disable + false + - - ..\..\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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - {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 - - - + + - - - - - - - - - - - - - - - - - - - - - - - \ 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..8bbde2af3d 100644 --- a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs +++ b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Globalization; using System.IO; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/Utilities/FastPager.cs b/src/Libraries/SmartStore.Data/Utilities/FastPager.cs index 568157d7c4..40a151ec39 100644 --- a/src/Libraries/SmartStore.Data/Utilities/FastPager.cs +++ b/src/Libraries/SmartStore.Data/Utilities/FastPager.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; diff --git a/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs b/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs index 9e346c08ab..400c3de31f 100644 --- a/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs +++ b/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs @@ -1,7 +1,7 @@ using System; using System.Data; using System.Data.Common; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.IO; namespace SmartStore.Data.Utilities diff --git a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs index da90c9f326..5b219e3616 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs @@ -1,7 +1,7 @@ //Contributor: Nicholas Mayne using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Services.Authentication.External { diff --git a/src/Libraries/SmartStore.Services/Authentication/External/IClaimsTranslator.cs b/src/Libraries/SmartStore.Services/Authentication/External/IClaimsTranslator.cs index 220ea46b20..82e8556a8a 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IClaimsTranslator.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IClaimsTranslator.cs @@ -1,6 +1,5 @@ //Contributor: Nicholas Mayne - namespace SmartStore.Services.Authentication.External { public partial interface IClaimsTranslator 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/External/IExternalAuthorizer.cs b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthorizer.cs index b72d98fced..936fd9064f 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthorizer.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthorizer.cs @@ -1,6 +1,5 @@ //Contributor: Nicholas Mayne - namespace SmartStore.Services.Authentication.External { public partial interface IExternalAuthorizer diff --git a/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs b/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs index afc3348198..0f4b0409ef 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IExternalProviderAuthorizer.cs @@ -1,6 +1,5 @@ //Contributor: Nicholas Mayne - namespace SmartStore.Services.Authentication.External { public partial interface IExternalProviderAuthorizer diff --git a/src/Libraries/SmartStore.Services/Authentication/External/IOpenAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/External/IOpenAuthenticationService.cs index 929adbb89a..9195b9f842 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IOpenAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IOpenAuthenticationService.cs @@ -29,7 +29,6 @@ public partial interface IOpenAuthenticationService /// External authentication methods IEnumerable> LoadAllExternalAuthenticationMethods(int storeId = 0); - bool AccountExists(OpenAuthenticationParameters parameters); void AssociateExternalAccountWithUser(Customer customer, OpenAuthenticationParameters parameters); diff --git a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs index 1cbca5a9f4..ed786a76df 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationService.cs @@ -70,9 +70,6 @@ public virtual Provider LoadExternalAuthenticatio return _providerManager.GetProvider(systemName, storeId); } - - - public virtual void AssociateExternalAccountWithUser(Customer customer, OpenAuthenticationParameters parameters) { if (customer == null) diff --git a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationStatus.cs b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationStatus.cs index 1532b59ac9..ce3577fdd3 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationStatus.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/OpenAuthenticationStatus.cs @@ -1,6 +1,5 @@ //Contributor: Nicholas Mayne - namespace SmartStore.Services.Authentication.External { public enum OpenAuthenticationStatus diff --git a/src/Libraries/SmartStore.Services/Authentication/External/RegistrationDetails.cs b/src/Libraries/SmartStore.Services/Authentication/External/RegistrationDetails.cs index b25ece6973..fde8ea1bbe 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/RegistrationDetails.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/RegistrationDetails.cs @@ -1,6 +1,5 @@ //Contributor: Nicholas Mayne - namespace SmartStore.Services.Authentication.External { public struct RegistrationDetails diff --git a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs index 626d002326..24ab669d32 100644 --- a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs +++ b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Security; +using Microsoft.AspNetCore.Identity; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Services.Customers; @@ -37,7 +37,6 @@ public virtual void SignIn(Customer customer, bool createPersistentCookie) var now = DateTime.UtcNow.ToLocalTime(); var name = _customerSettings.CustomerLoginType != CustomerLoginType.Email ? customer.Username : customer.Email; - var ticket = new FormsAuthenticationTicket( 1 /*version*/, name, 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..44b1d72956 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; @@ -128,7 +128,6 @@ public virtual void InheritAclIntoChildren( _cache.RemoveByPattern(AclService.ACL_SEGMENT_PATTERN); - void ProcessCategory(DbContextScope scope, Category c) { // Process sub-categories. @@ -750,7 +749,7 @@ public virtual string GetCategoryPath( TreeNode treeNode, int? languageId = null, string aliasPattern = null, - string separator = " � ") + string separator = " ") { Guard.NotNull(treeNode, nameof(treeNode)); diff --git a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs index 7c7f4df528..ff832607f4 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Globalization; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Localization; diff --git a/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs b/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs index c7659168e7..84043e05e9 100644 --- a/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/ICategoryService.cs @@ -195,7 +195,6 @@ IPagedList GetProductCategoriesByCategoryId( /// Trail IEnumerable GetCategoryTrail(ICategoryNode node); - /// /// Builds a category breadcrumb (path) for a particular category node /// @@ -208,7 +207,7 @@ string GetCategoryPath( TreeNode treeNode, int? languageId = null, string aliasPattern = null, - string separator = " � "); + string separator = " "); /// /// Gets the tree representation of categories @@ -249,7 +248,7 @@ public static string GetCategoryPath(this ICategoryService categoryService, Product product, int? languageId = null, int? storeId = null, - string separator = " � ") + string separator = " ") { Guard.NotNull(product, nameof(product)); diff --git a/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs index 90daa5573a..bbeb71224b 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IPriceCalculationService.cs @@ -201,7 +201,6 @@ decimal GetDiscountAmount(Product product, PriceCalculationContext context = null, decimal? finalPrice = null); - /// /// Gets the shopping cart item sub total /// @@ -218,9 +217,6 @@ decimal GetDiscountAmount(Product product, /// Shopping cart unit price (one item) decimal GetUnitPrice(OrganizedShoppingCartItem shoppingCartItem, bool includeDiscounts); - - - /// /// Gets discount amount /// @@ -236,7 +232,6 @@ decimal GetDiscountAmount(Product product, /// Discount amount decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartItem, out Discount appliedDiscount); - /// /// Gets the price adjustment of a variant attribute value /// diff --git a/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs index fd814f7798..d1e1060563 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IPriceFormatter.cs @@ -90,7 +90,6 @@ public partial interface IPriceFormatter /// Price string FormatPrice(decimal price, bool showCurrency, Currency targetCurrency, Language language, bool priceIncludesTax, bool showTax); - /// /// Formats the shipping price /// @@ -145,8 +144,6 @@ public partial interface IPriceFormatter /// Price string FormatShippingPrice(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax); - - /// /// Formats the payment method additional fee /// @@ -201,8 +198,6 @@ public partial interface IPriceFormatter /// Price string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, string currencyCode, Language language, bool priceIncludesTax); - - /// /// Formats a tax rate /// diff --git a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs index ce76d9bf37..f8517bd614 100644 --- a/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs +++ b/src/Libraries/SmartStore.Services/Catalog/IProductAttributeParser.cs @@ -141,7 +141,6 @@ void GetGiftCardAttribute(string attributesXml, out string recipientName, #endregion } - [Serializable] public class CombinationAvailabilityInfo { 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/ProductVariantQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs index ebb79e92b8..29f1efc0c7 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryModelBinder.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Autofac.Integration.Mvc; namespace SmartStore.Services.Catalog.Modelling diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs index e0454c592a..7cc9c75351 100644 --- a/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/PriceCalculationService.cs @@ -752,7 +752,6 @@ public virtual decimal GetPreselectedPrice(Product product, Customer customer, C return result; } - /// /// Gets the product cost /// @@ -888,7 +887,6 @@ public virtual decimal GetDiscountAmount( return appliedDiscountAmount; } - /// /// Gets the shopping cart item sub total /// @@ -959,8 +957,6 @@ public virtual decimal GetUnitPrice(OrganizedShoppingCartItem shoppingCartItem, return finalPrice; } - - /// /// Gets discount amount /// @@ -1004,7 +1000,6 @@ public virtual decimal GetDiscountAmount(OrganizedShoppingCartItem shoppingCartI return totalDiscountAmount; } - /// /// Gets the price adjustment of a variant attribute value /// diff --git a/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs b/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs index 2a15907376..f8494997d4 100644 --- a/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs +++ b/src/Libraries/SmartStore.Services/Catalog/PriceFormatter.cs @@ -96,8 +96,6 @@ public string FormatPrice(decimal price, bool showCurrency, Currency targetCurre return formatted; } - - public string FormatShippingPrice(decimal price, bool showCurrency) { var targetCurrency = _workContext.WorkingCurrency; @@ -130,8 +128,6 @@ public string FormatShippingPrice(decimal price, bool showCurrency, string curre return FormatShippingPrice(price, showCurrency, currency, language, priceIncludesTax); } - - public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency) { var targetCurrency = _workContext.WorkingCurrency; @@ -164,8 +160,6 @@ public string FormatPaymentMethodAdditionalFee(decimal price, bool showCurrency, return FormatPaymentMethodAdditionalFee(price, showCurrency, currency, language, priceIncludesTax); } - - public string FormatTaxRate(decimal taxRate) { return taxRate.ToString("G29"); 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/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/Catalog/Rules/SearchFilterDescriptor.cs b/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterDescriptor.cs index e24d074935..a92759c025 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterDescriptor.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterDescriptor.cs @@ -10,7 +10,6 @@ public class SearchFilterContext public SearchFilterExpression Expression { get; set; } } - public abstract class SearchFilterDescriptor : RuleDescriptor { public SearchFilterDescriptor() diff --git a/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterExpressionGroup.cs b/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterExpressionGroup.cs index 9aef7548ce..bce7cc6dcb 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterExpressionGroup.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Rules/SearchFilterExpressionGroup.cs @@ -10,7 +10,6 @@ public class SearchFilterExpression : RuleExpression public new SearchFilterDescriptor Descriptor { get; set; } } - public class SearchFilterExpressionGroup : SearchFilterExpression, IRuleExpressionGroup { private readonly List _expressions = new List(); diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs index 7344a6b0c6..8b5211a7ee 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs @@ -4,10 +4,10 @@ using System.IO; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Async; using System.Web.Mvc.Html; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core.Logging; diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs index 0e15cb8771..fe0717b547 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBindableBlockHandler.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.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..f689a09c47 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/IBlockHandler.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Services.Cms.Blocks { diff --git a/src/Libraries/SmartStore.Services/Cms/Blocks/StoryAssetAttribute.cs b/src/Libraries/SmartStore.Services/Cms/Blocks/StoryAssetAttribute.cs index 0cc92ccdc7..62887b12ec 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/StoryAssetAttribute.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/StoryAssetAttribute.cs @@ -19,7 +19,6 @@ public StoryAssetAttribute(StoryAssetKind kind) public StoryAssetKind Kind { get; private set; } } - public enum StoryAssetKind { /// 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/IWidgetService.cs b/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs index d23e345b7b..c69b707a71 100644 --- a/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs +++ b/src/Libraries/SmartStore.Services/Cms/IWidgetService.cs @@ -15,7 +15,6 @@ public partial interface IWidgetService /// Widgets IEnumerable> LoadActiveWidgets(int storeId = 0); - /// /// Load active widgets /// diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs index ae89d1d75b..2bed6cb849 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using System.Runtime.CompilerServices; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Blogs; diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs index ac97fd982d..1cdd1f3eb5 100644 --- a/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs +++ b/src/Libraries/SmartStore.Services/Cms/LinkResolverResult.cs @@ -96,7 +96,6 @@ object ICloneable.Clone() } } - public static class LinkResolverExtensions { public static (string Icon, string ResKey) GetLinkTypeInfo(this LinkType type) 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/AddressService.cs b/src/Libraries/SmartStore.Services/Common/AddressService.cs index 3953689090..bc00ec4db1 100644 --- a/src/Libraries/SmartStore.Services/Common/AddressService.cs +++ b/src/Libraries/SmartStore.Services/Common/AddressService.cs @@ -159,7 +159,6 @@ public virtual bool IsAddressValid(Address address) String.IsNullOrWhiteSpace(address.ZipPostalCode)) return false; - if (_addressSettings.CountryEnabled) { if (address.CountryId == null || address.CountryId.Value == 0) diff --git a/src/Libraries/SmartStore.Services/Common/IUserAgent.cs b/src/Libraries/SmartStore.Services/Common/IUserAgent.cs index 5a3c5db1cb..7981a7b635 100644 --- a/src/Libraries/SmartStore.Services/Common/IUserAgent.cs +++ b/src/Libraries/SmartStore.Services/Common/IUserAgent.cs @@ -168,5 +168,4 @@ public static string Format(params string[] parts) } } - } diff --git a/src/Libraries/SmartStore.Services/Configuration/SettingService.cs b/src/Libraries/SmartStore.Services/Configuration/SettingService.cs index df20288ba2..790d313046 100644 --- a/src/Libraries/SmartStore.Services/Configuration/SettingService.cs +++ b/src/Libraries/SmartStore.Services/Configuration/SettingService.cs @@ -140,7 +140,6 @@ private void DeleteSettingsJson() } } - public virtual Setting GetSettingById(int settingId) { if (settingId == 0) diff --git a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs index 486f1a42b1..3c3b2a5527 100644 --- a/src/Libraries/SmartStore.Services/Customers/CookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/CookieManager.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Services.Customers { diff --git a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs index 4cfc490e35..38e6a7dcd7 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerRegistrationService.cs @@ -262,7 +262,6 @@ public virtual PasswordChangeResult ChangePassword(ChangePasswordRequest request else requestIsValid = true; - //at this point request is valid if (requestIsValid) { 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..7a2398289a 100644 --- a/src/Libraries/SmartStore.Services/Customers/CustomerService.cs +++ b/src/Libraries/SmartStore.Services/Customers/CustomerService.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Diagnostics; using System.Linq; using System.Text; @@ -613,7 +613,6 @@ FROM [dbo].[Customer] AS [c] genericAttributesSql = genericAttributesSql.FormatInvariant(paramClauses.ToString()); guestCustomersSql = guestCustomersSql.FormatInvariant(paramClauses.ToString()); - // Delete generic attributes. while (true) { diff --git a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs index 7a246b92a4..ba04325d00 100644 --- a/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs +++ b/src/Libraries/SmartStore.Services/Customers/ICookieManager.cs @@ -1,7 +1,7 @@ using SmartStore.Core.Plugins; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.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..eeda2853ae 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Excel/ExcelDataReader.cs @@ -167,7 +167,6 @@ void IDataReader.Close() Dispose(); } - public int FieldCount { get diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs index 80d2c7b437..0481b5b453 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExportResult.cs @@ -60,7 +60,6 @@ public class ExportFileInfo } } - public class DataExportPreviewResult { public DataExportPreviewResult() diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs index 076b161bf9..2ca90a7de9 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DataExporter.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.IO; using System.IO.Compression; using System.Linq; diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs index 16bfa4d000..5528a3cfe9 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/Deployment/IFilePublisher.cs @@ -11,7 +11,6 @@ public interface IFilePublisher void Publish(ExportDeploymentContext context, ExportDeployment deployment); } - public class ExportDeploymentContext { public Localizer T { get; set; } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs index 946769b317..6db3f81eaf 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.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.Reflection; @@ -1284,7 +1284,6 @@ private dynamic ToDynamic(DataExporterContext ctx, ShoppingCartItem shoppingCart return result; } - private List Convert(DataExporterContext ctx, Product product) { var result = new List(); @@ -1577,7 +1576,6 @@ private List Convert(DataExporterContext ctx, ShoppingCartItem shopping } } - internal class DynamicProductContext { public string SeName { get; set; } diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs index d5c2c24001..b9e8c880be 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportProfileService.cs @@ -161,7 +161,6 @@ public virtual ExportProfile InsertExportProfile( _exportProfileRepository.Insert(profile); - task.Alias = profile.Id.ToString(); _scheduleTaskService.UpdateTask(task); @@ -320,7 +319,6 @@ public virtual IList GetExportProfilesBySystemName(string provide return profiles; } - public virtual IEnumerable> LoadAllExportProviders(int storeId = 0, bool showHidden = true) { var allProviders = _providerManager.GetAllProviders(storeId) diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs index 1ba4e09442..aa2d83105d 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/ExportXmlHelper.cs @@ -1042,7 +1042,6 @@ public void WriteShoppingCartItem(dynamic shoppingCartItem, string node) } } - /// /// Allows to exclude XML nodes from export /// diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs index 428048be79..8263ab375a 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IDataExporter.cs @@ -33,7 +33,6 @@ ProductExportContext CreateProductExportContext( bool includeHidden = true); } - public class DataExportRequest { private readonly static ProgressValueSetter _voidProgressValueSetter = DataExportRequest.SetProgress; @@ -67,7 +66,6 @@ public DataExportRequest(ExportProfile profile, Provider provid public IQueryable ProductQuery { get; set; } - private static void SetProgress(int val, int max, string msg) { // do nothing diff --git a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs index f5c0ab977c..2e870dbcf6 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Export/IExportProfileService.cs @@ -83,7 +83,6 @@ ExportProfile InsertExportProfile( /// List of export profiles IList GetExportProfilesBySystemName(string providerSystemName); - /// /// Load all export providers /// diff --git a/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs b/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs index 8828902596..b12cc816fd 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/ISyncMappingService.cs @@ -79,7 +79,6 @@ public partial interface ISyncMappingService void UpdateSyncMapping(SyncMapping mapping); } - public static class ISyncMappingServiceExtensions { diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs index b2a0b9302a..d67de994f5 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ColumnMapping/ColumnMap.cs @@ -104,7 +104,6 @@ public ColumnMappingItem GetMapping(string sourceName) } } - [JsonObject(MemberSerialization.OptIn)] public class ColumnMappingItem { diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs index 628dc0894c..621b60dfa4 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/DataTable/LightweightDataTable.cs @@ -315,7 +315,6 @@ public override IEnumerable GetDynamicMemberNames() return _table.Columns.Select(x => x.Name); } - public override bool TryGetMember(GetMemberBinder binder, out object result) { result = null; diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs index dfd6d6cd5c..6f68ca3c54 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/IDataImporter.cs @@ -11,7 +11,6 @@ public interface IDataImporter void Import(DataImportRequest request, CancellationToken cancellationToken); } - public class DataImportRequest { private readonly static ProgressValueSetter _voidProgressValueSetter = DataImportRequest.SetProgress; @@ -37,7 +36,6 @@ public DataImportRequest(ImportProfile profile) public IDictionary CustomData { get; private set; } - private static void SetProgress(int val, int max, string msg) { // do nothing diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs index ab3fb9563b..e27a2ac002 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Diagnostics; using System.IO; using System.Linq; @@ -365,7 +365,6 @@ public virtual Dictionary GetImportableEntityProperties(ImportEn .Select(x => x.Name) .ToList(); - foreach (ImportEntityType type in Enum.GetValues(typeof(ImportEntityType))) { EntitySet entitySet = null; diff --git a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs index 8f45413f35..c7ffd3d288 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportResult.cs @@ -178,7 +178,6 @@ public SerializableImportResult Clone() } } - [Serializable] public partial class SerializableImportResult { diff --git a/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs b/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs index bd3add028f..8791784711 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/SyncMappingService.cs @@ -130,7 +130,6 @@ public void DeleteSyncMappings(string contextName, string entityName = null) } } - public void UpdateSyncMapping(SyncMapping mapping) { Guard.NotNull(mapping, nameof(mapping)); diff --git a/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs b/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs index 68c2bbbf3e..7c39de2394 100644 --- a/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs +++ b/src/Libraries/SmartStore.Services/Directory/ICurrencyService.cs @@ -57,8 +57,6 @@ public partial interface ICurrencyService /// Currency void UpdateCurrency(Currency currency); - - /// /// Converts currency /// @@ -113,8 +111,6 @@ public partial interface ICurrencyService /// Converted value decimal ConvertFromPrimaryStoreCurrency(decimal amount, Currency targetCurrency, Store store = null); - - /// /// Load active exchange rate provider /// diff --git a/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs b/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs index 1a56905e7b..49b5a99299 100644 --- a/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs +++ b/src/Libraries/SmartStore.Services/Directory/IMeasureService.cs @@ -75,7 +75,6 @@ decimal ConvertToPrimaryMeasureDimension(decimal quantity, decimal ConvertFromPrimaryMeasureDimension(decimal quantity, MeasureDimension targetMeasureDimension); - /// /// Deletes measure weight /// diff --git a/src/Libraries/SmartStore.Services/Forums/ForumService.cs b/src/Libraries/SmartStore.Services/Forums/ForumService.cs index 6430f209ce..0c4d5398aa 100644 --- a/src/Libraries/SmartStore.Services/Forums/ForumService.cs +++ b/src/Libraries/SmartStore.Services/Forums/ForumService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; @@ -13,7 +13,7 @@ using SmartStore.Services.Seo; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Domain.Localization; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs index 00ac0273ee..39e513df9a 100644 --- a/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs +++ b/src/Libraries/SmartStore.Services/Localization/ILocalizationService.cs @@ -78,7 +78,6 @@ public partial interface ILocalizationService /// Locale string resource void UpdateLocaleStringResource(LocaleStringResource localeStringResource); - /// /// Gets a resource string based on the specified ResourceKey property. /// diff --git a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs index c07ffe0766..b1ff22a6fd 100644 --- a/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs +++ b/src/Libraries/SmartStore.Services/Localization/ILocalizedEntityService.cs @@ -102,7 +102,6 @@ void SaveLocalizedValue( string value, int languageId) where T : BaseEntity, ILocalizedEntity; - /// /// Save localized value /// diff --git a/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs b/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs index 447d5e1fc1..02f869db96 100644 --- a/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs +++ b/src/Libraries/SmartStore.Services/Logging/CustomerActivityService.cs @@ -159,7 +159,6 @@ public virtual ActivityLog InsertActivity(string systemKeyword, string comment, return InsertActivity(systemKeyword, comment, _workContext.CurrentCustomer, commentParams); } - /// /// Inserts an activity log item /// @@ -272,7 +271,6 @@ public virtual ActivityLog GetActivityById(int activityLogId) if (activityLogId == 0) return null; - var query = from al in _activityLogRepository.Table where al.Id == activityLogId select al; 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/Handlers/MediaHandlerContext.cs b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs index 0ac54584ec..53e9354ce3 100644 --- a/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs +++ b/src/Libraries/SmartStore.Services/Media/Handlers/MediaHandlerContext.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Media; using SmartStore.Core.IO; diff --git a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs index 1c754697e7..9235c3c1c6 100644 --- a/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Imaging/ProcessImageQuery.cs @@ -169,7 +169,6 @@ private void Set(string name, T val) Add(name, val.Convert(), true); } - public bool NeedsProcessing(bool ignoreQualityFlag = false) { if (this.Count == 0) diff --git a/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs b/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs index e460dd94ef..440cfd95b6 100644 --- a/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs +++ b/src/Libraries/SmartStore.Services/Media/Legacy/PictureService.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Drawing; using System.IO; using System.Linq; @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Caching; diff --git a/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs b/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs index 26599c17d8..3ce6ee5c7c 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaFileSystem.cs @@ -49,7 +49,6 @@ public static string GetMediaPublicPath() _mediaPublicPath = path.TrimStart('~', '/').Replace('\\', '/').ToLower().EnsureEndsWith("/"); } - return _mediaPublicPath; } } 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..9fd075affb 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs @@ -1,6 +1,6 @@ using System.Globalization; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core; using SmartStore.Core.Domain.Media; using SmartStore.Services.Configuration; diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs index 3fceaf4ddd..fe6e22c3da 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearchQuery.cs @@ -68,7 +68,6 @@ public partial class MediaSearchQuery : MediaFilesFilter [JsonProperty("deep")] public bool DeepSearch { get; set; } - [DataMember] [JsonProperty("page")] public int PageIndex { get; set; } diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs index ba0c18c8e4..698493b65d 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; @@ -257,7 +257,6 @@ public virtual IQueryable ApplyLoadFlags(IQueryable query, return query; } - private IQueryable ApplySearchTerm(IQueryable query, string term, bool includeAlt, bool exactMatch) { var hasAnyCharToken = term.IndexOf('*') > -1; 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..9be40b17fb 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs @@ -1,7 +1,6 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; -using System.Web.UI; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Media; @@ -103,7 +102,6 @@ public virtual bool Move(Provider sourceProvider, Provide } } - if (success) { _services.Settings.SetSetting("Media.Storage.Provider", targetProvider.Metadata.SystemName); diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs index fae7b431e9..b80908e7f9 100644 --- a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs +++ b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Core.Data; using SmartStore.Core.Domain.Media; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs index 0c1c48f8ab..561af5effe 100644 --- a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs +++ b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Threading.Tasks; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs index d3875f252d..5429f03ce0 100644 --- a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs +++ b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Messages; diff --git a/src/Libraries/SmartStore.Services/Messages/IModelPart.cs b/src/Libraries/SmartStore.Services/Messages/IModelPart.cs index dd93f45a7f..0e043a974c 100644 --- a/src/Libraries/SmartStore.Services/Messages/IModelPart.cs +++ b/src/Libraries/SmartStore.Services/Messages/IModelPart.cs @@ -17,7 +17,6 @@ public interface INamedModelPart : IDictionary string ModelPartName { get; } } - #region Impl public class ModelPart : HybridExpando, IModelPart diff --git a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs index 7c2ab26c7b..c528b7eb48 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; @@ -294,7 +294,6 @@ protected virtual void CreateAttachments(QueuedEmail queuedEmail, MessageContext } } - private void ValidateMessageContext(MessageContext ctx, ref object[] modelParts) { var t = ctx.MessageTemplate; diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs index 469a57cd4b..62fce9d033 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.OrderParts.cs @@ -204,7 +204,6 @@ protected virtual object CreateOrderTotalsPart(Order order, MessageContext messa }; }).ToArray(); - // Gift Cards m.GiftCardUsage = order.GiftCardUsageHistory.Count == 0 ? (object[])null : order.GiftCardUsageHistory.Select(x => { diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs index 26d3ef994d..9f1f43e59e 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.Utils.cs @@ -145,7 +145,6 @@ private Money FormatPrice(decimal price, Currency currency, MessageContext messa return new Money(price, currency); } - private MediaFileInfo GetMediaFileFor(Product product, string attributesXml) { var attrParser = _services.Resolve(); 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..1fcec95031 100644 --- a/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs +++ b/src/Libraries/SmartStore.Services/Messages/QueuedEmailService.cs @@ -42,7 +42,6 @@ public QueuedEmailService( public Localizer T { get; set; } = NullLocalizer.Instance; public ILogger Logger { get; set; } = NullLogger.Instance; - public virtual void InsertQueuedEmail(QueuedEmail queuedEmail) { Guard.NotNull(queuedEmail, nameof(queuedEmail)); 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/IOrderReportService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs index 4894bf6549..2f591627c8 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderReportService.cs @@ -121,7 +121,6 @@ IPagedList BestSellersReport( /// Order profit. decimal GetProfit(IQueryable orderQuery); - /// /// Get paged list of incomplete orders /// diff --git a/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs b/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs index 627723b438..2cbc00dd92 100644 --- a/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Orders/IOrderTotalCalculationService.cs @@ -60,10 +60,6 @@ void GetShoppingCartSubTotal(IList cart, decimal GetOrderSubtotalDiscount(Customer customer, decimal orderSubTotal, out Discount appliedDiscount); - - - - /// /// Adjust shipping rate (free shipping, additional charges, discounts) /// @@ -123,11 +119,6 @@ decimal AdjustShippingRate(decimal shippingRate, IListShipping discount decimal GetShippingDiscount(Customer customer, decimal shippingTotal, out Discount appliedDiscount); - - - - - /// /// Gets tax /// @@ -146,9 +137,6 @@ decimal AdjustShippingRate(decimal shippingRate, IList cart, out SortedDictionary taxRates, bool usePaymentMethodAdditionalFee = true); - - - /// /// Gets the shopping cart total /// @@ -163,7 +151,6 @@ ShoppingCartTotal GetShoppingCartTotal( bool usePaymentMethodAdditionalFee = true, bool ignoreCreditBalance = false); - /// /// Gets an order discount (applied to order total) /// @@ -173,10 +160,6 @@ ShoppingCartTotal GetShoppingCartTotal( /// Order discount decimal GetOrderTotalDiscount(Customer customer, decimal orderTotal, out Discount appliedDiscount); - - - - /// /// Converts reward points to amount primary store currency /// diff --git a/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs b/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs index 2c032bd403..2b78c56064 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderExtensions.cs @@ -100,7 +100,6 @@ public static decimal GetOrderTotalInCustomerCurrency( return orderTotal; } - /// /// Gets a value indicating whether an order has items to dispatch /// @@ -166,7 +165,6 @@ public static bool CanAddItemsToShipment(this Order order) return false; } - /// /// Gets the total number of items which can be added to new shipments /// diff --git a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs index bc58b098d2..8ca40035e9 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderProcessingService.cs @@ -843,7 +843,6 @@ public virtual PlaceOrderResult PlaceOrder( orderSubTotalExclTax = initialOrder.OrderSubtotalExclTax; } - // Shipping info. var shoppingCartRequiresShipping = false; if (!processPaymentRequest.IsRecurringPayment) @@ -1614,7 +1613,6 @@ public virtual void DeleteOrder(Order order) _orderService.DeleteOrder(order); } - /// /// Process next recurring psayment /// @@ -1769,8 +1767,6 @@ public virtual bool CanCancelRecurringPayment(Customer customerToValidate, Recur return true; } - - /// /// Send a shipment /// @@ -1858,8 +1854,6 @@ public virtual void Deliver(Shipment shipment, bool notifyCustomer) CheckOrderStatus(order); } - - /// /// Gets a value indicating whether cancel is allowed /// @@ -1991,7 +1985,6 @@ public virtual void AutoUpdateOrderDetails(AutoUpdateOrderItemContext context) } } - /// /// Gets a value indicating whether order can be marked as authorized /// @@ -2029,7 +2022,6 @@ public virtual void MarkAsAuthorized(Order order) CheckOrderStatus(order); } - /// /// Gets a value indicating whether the order can be marked as completed /// @@ -2067,7 +2059,6 @@ public virtual void CompleteOrder(Order order) CheckOrderStatus(order); } - /// /// Gets a value indicating whether capture from admin panel is allowed /// @@ -2198,8 +2189,6 @@ public virtual void MarkOrderAsPaid(Order order) } } - - /// /// Gets a value indicating whether refund from admin panel is allowed /// @@ -2489,8 +2478,6 @@ public virtual void PartiallyRefundOffline(Order order, decimal amountToRefund) CheckOrderStatus(order); } - - /// /// Gets a value indicating whether void from admin panel is allowed /// @@ -2609,8 +2596,6 @@ public virtual void VoidOffline(Order order) CheckOrderStatus(order); } - - /// /// Place order items in current user shopping cart. /// 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/Orders/OrderService.cs b/src/Libraries/SmartStore.Services/Orders/OrderService.cs index 92ec02f77f..b3e314975c 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderService.cs @@ -338,7 +338,6 @@ public virtual IList GetAllOrderItems(int? orderId, if (ss.HasValue) shippingStatusId = (int)ss.Value; - var query = from orderItem in _orderItemRepository.Table join o in _orderRepository.Table on orderItem.OrderId equals o.Id join p in _productRepository.Table on orderItem.ProductId equals p.Id diff --git a/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs b/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs index 9a0aa20a08..2ae44fa408 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderTotalCalculationService.cs @@ -572,7 +572,6 @@ public virtual decimal GetOrderSubtotalDiscount(Customer customer, decimal order return discountAmount; } - /// /// Gets shopping cart additional shipping charge /// @@ -909,10 +908,6 @@ public virtual decimal GetShippingDiscount(Customer customer, decimal shippingTo return shippingDiscountAmount; } - - - - /// /// Gets tax /// @@ -1106,10 +1101,6 @@ public virtual decimal GetTaxTotal(IList cart, out So return taxTotal; } - - - - public virtual ShoppingCartTotal GetShoppingCartTotal( IList cart, bool ignoreRewardPoints = false, @@ -1357,10 +1348,6 @@ public virtual decimal GetOrderTotalDiscount(Customer customer, decimal orderTot return discountAmount; } - - - - /// /// Converts reward points to amount primary store currency /// @@ -1403,7 +1390,6 @@ public virtual int ConvertAmountToRewardPoints(decimal amount) #endregion } - internal class CartTaxingInfo { internal CartTaxingInfo() diff --git a/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs b/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs index 780352bef5..e04f1891dc 100644 --- a/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs +++ b/src/Libraries/SmartStore.Services/Orders/PlaceOrderResult.cs @@ -22,7 +22,6 @@ public void AddError(string error) this.Errors.Add(error); } - /// /// Gets or sets the placed order /// diff --git a/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs b/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs index 66041200a3..e6a58e525e 100644 --- a/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs +++ b/src/Libraries/SmartStore.Services/Orders/ShoppingCartService.cs @@ -1018,7 +1018,6 @@ public virtual OrganizedShoppingCartItem FindShoppingCartItemInTheCart( out giftCardSenderEmail2, out giftCardMessage2); - if (giftCardRecipientName1.ToLowerInvariant() != giftCardRecipientName2.ToLowerInvariant() || giftCardSenderName1.ToLowerInvariant() != giftCardSenderName2.ToLowerInvariant()) { 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/IPaymentMethodFilter.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs index b04726c2b8..f81b712ed8 100644 --- a/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs +++ b/src/Libraries/SmartStore.Services/Payments/IPaymentMethodFilter.cs @@ -18,7 +18,6 @@ public partial interface IPaymentMethodFilter bool IsExcluded(PaymentFilterRequest request); } - public partial class PaymentFilterRequest { /// diff --git a/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs index e699eb5323..530d76cebf 100644 --- a/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs +++ b/src/Libraries/SmartStore.Services/Payments/IPaymentService.cs @@ -87,7 +87,6 @@ IEnumerable> LoadActivePaymentMethods( /// Payment method void DeletePaymentMethod(PaymentMethod paymentMethod); - /// /// Pre process a payment /// @@ -115,7 +114,6 @@ IEnumerable> LoadActivePaymentMethods( /// Result bool CanRePostProcessPayment(Order order); - /// /// Gets an additional handling fee of a payment method /// @@ -124,8 +122,6 @@ IEnumerable> LoadActivePaymentMethods( /// Additional handling fee decimal GetAdditionalHandlingFee(IList cart, string paymentMethodSystemName); - - /// /// Gets a value indicating whether capture is supported by payment method /// @@ -140,8 +136,6 @@ IEnumerable> LoadActivePaymentMethods( /// Capture payment result CapturePaymentResult Capture(CapturePaymentRequest capturePaymentRequest); - - /// /// Gets a value indicating whether partial refund is supported by payment method /// @@ -163,8 +157,6 @@ IEnumerable> LoadActivePaymentMethods( /// Result RefundPaymentResult Refund(RefundPaymentRequest refundPaymentRequest); - - /// /// Gets a value indicating whether void is supported by payment method /// @@ -179,8 +171,6 @@ IEnumerable> LoadActivePaymentMethods( /// Result VoidPaymentResult Void(VoidPaymentRequest voidPaymentRequest); - - /// /// Gets a recurring payment type of payment method /// @@ -202,8 +192,6 @@ IEnumerable> LoadActivePaymentMethods( /// Result CancelRecurringPaymentResult CancelRecurringPayment(CancelRecurringPaymentRequest cancelPaymentRequest); - - /// /// Gets a payment method type /// 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/Payments/PaymentService.cs b/src/Libraries/SmartStore.Services/Payments/PaymentService.cs index c6d32257e2..a3161e9115 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentService.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentService.cs @@ -291,7 +291,6 @@ public virtual void DeletePaymentMethod(PaymentMethod paymentMethod) } } - /// /// Pre process a payment /// @@ -396,8 +395,6 @@ public virtual bool CanRePostProcessPayment(Order order) return paymentMethod.Value.CanRePostProcessPayment(order); } - - /// /// Gets an additional handling fee of a payment method /// @@ -414,8 +411,6 @@ public virtual decimal GetAdditionalHandlingFee(IList return paymentMethodAdditionalFee; } - - /// /// Gets a value indicating whether capture is supported by payment method /// @@ -456,8 +451,6 @@ public virtual CapturePaymentResult Capture(CapturePaymentRequest capturePayment } } - - /// /// Gets a value indicating whether partial refund is supported by payment method /// @@ -511,8 +504,6 @@ public virtual RefundPaymentResult Refund(RefundPaymentRequest refundPaymentRequ } } - - /// /// Gets a value indicating whether void is supported by payment method /// @@ -553,8 +544,6 @@ public virtual VoidPaymentResult Void(VoidPaymentRequest voidPaymentRequest) } } - - /// /// Gets a recurring payment type of payment method /// @@ -637,8 +626,6 @@ public virtual CancelRecurringPaymentResult CancelRecurringPayment(CancelRecurri } } - - /// /// Gets a payment method type /// diff --git a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs index e03d989008..30772f2cdd 100644 --- a/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs +++ b/src/Libraries/SmartStore.Services/Payments/ProcessPaymentRequest.cs @@ -157,7 +157,6 @@ public ProcessPaymentRequest() #endregion } - [Serializable] public partial class CustomPaymentRequestValue { diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs b/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs index 6065e91a84..f752b60df3 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Content/PdfUrlContent.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; -using System.Web.Security; +using Microsoft.AspNetCore.Identity; using SmartStore.Core; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs b/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs index f9c2d82d80..b6d566103e 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Options/PdfPageOptions.cs @@ -38,8 +38,6 @@ public PdfPageOptions() /// public string CustomFlags { get; set; } - - public virtual void Process(string flag, StringBuilder builder) { if (UserStylesheetUrl.HasValue()) diff --git a/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs b/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs index 3b116de25b..bd04c16570 100644 --- a/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs +++ b/src/Libraries/SmartStore.Services/Pdf/Options/PdfTocOptions.cs @@ -41,7 +41,6 @@ public PdfTocOptions() /// public float? TocTextSizeShrink { get; set; } - public override void Process(string flag, StringBuilder builder) { builder.Append(" toc"); diff --git a/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs b/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs index c099e3ddb4..caec62f318 100644 --- a/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs +++ b/src/Libraries/SmartStore.Services/Pdf/PdfConvertSettings.cs @@ -61,8 +61,6 @@ public PdfConvertSettings() /// public string CustomFlags { get; set; } - - /// /// Cover content /// diff --git a/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs b/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs index 3b2c9e288d..36dbd9ae1f 100644 --- a/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs +++ b/src/Libraries/SmartStore.Services/Pdf/WkHtmlToPdfConverter.cs @@ -16,7 +16,6 @@ public WkHtmlToPdfConverter() public ILogger Logger { get; set; } - public byte[] Convert(PdfConvertSettings settings) { Guard.NotNull(settings, nameof(settings)); 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..00c68b31f9 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryFactory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Search; diff --git a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs index 817f082d51..56b868585d 100644 --- a/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs +++ b/src/Libraries/SmartStore.Services/Search/Catalog/Modelling/CatalogSearchQueryModelBinder.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Autofac.Integration.Mvc; namespace SmartStore.Services.Search.Modelling diff --git a/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs b/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs index 32e074e7ba..3fcb00054e 100644 --- a/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs +++ b/src/Libraries/SmartStore.Services/Search/Extensions/UrlHelperExtensions.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Infrastructure; using SmartStore.Core.Search.Facets; 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..83425eb369 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryFactory.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryFactory.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Forums; diff --git a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs index cc3e935fe7..e1b2355437 100644 --- a/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs +++ b/src/Libraries/SmartStore.Services/Search/Forum/Modelling/ForumSearchQueryModelBinder.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Autofac.Integration.Mvc; namespace SmartStore.Services.Search.Modelling 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/PermissionService.cs b/src/Libraries/SmartStore.Services/Security/PermissionService.cs index 55f515ea91..b7b7bb0c50 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; @@ -215,7 +215,6 @@ public virtual void DeletePermission(PermissionRecord permission) } } - public virtual PermissionRoleMapping GetPermissionRoleMappingById(int mappingId) { if (mappingId == 0) @@ -254,7 +253,6 @@ public virtual void DeletePermissionRoleMapping(PermissionRoleMapping mapping) } } - public virtual void InstallPermissions(IPermissionProvider[] permissionProviders, bool removeUnusedPermissions = false) { if (!(permissionProviders?.Any() ?? false)) @@ -495,7 +493,6 @@ public virtual bool AuthorizeByAlias(string permissionSystemName) return false; } - public virtual bool FindAuthorization(string permissionSystemName) { return FindAuthorization(permissionSystemName, _workContext.CurrentCustomer); @@ -556,7 +553,6 @@ bool FindAllowByChild(TreeNode n) } } - public virtual TreeNode GetPermissionTree(CustomerRole role, bool addDisplayNames = false) { Guard.NotNull(role, nameof(role)); 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/SeoExtensions.cs b/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs index e47abff4c5..956cafc39b 100644 --- a/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs +++ b/src/Libraries/SmartStore.Services/Seo/SeoExtensions.cs @@ -238,7 +238,6 @@ public static string ValidateSeName(this T entity, return seName; } - /// /// Get SEO friendly name /// 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/IShipmentService.cs b/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs index db53312558..e7a8853af2 100644 --- a/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/IShipmentService.cs @@ -62,8 +62,6 @@ IPagedList GetAllShipments(string trackingNumber, DateTime? createdFro /// Shipment void UpdateShipment(Shipment shipment); - - /// /// Deletes a shipment item /// 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/Shipping/IShippingService.cs b/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs index 22a56abbda..ba24a6a515 100644 --- a/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/IShippingService.cs @@ -32,7 +32,6 @@ public partial interface IShippingService /// Shipping rate computation methods IEnumerable> LoadAllShippingRateComputationMethods(int storeId = 0); - /// /// Deletes a shipping method /// @@ -46,7 +45,6 @@ public partial interface IShippingService /// Shipping method ShippingMethod GetShippingMethodById(int shippingMethodId); - /// /// Gets all shipping methods /// @@ -67,7 +65,6 @@ public partial interface IShippingService /// Shipping method void UpdateShippingMethod(ShippingMethod shippingMethod); - /// /// Gets shopping cart item weight (of one item) /// @@ -90,7 +87,6 @@ public partial interface IShippingService /// Shopping cart weight decimal GetShoppingCartTotalWeight(IList cart, bool includeFreeShippingProducts = true); - /// /// Create shipment package from shopping cart /// diff --git a/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs b/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs index 18fff61b17..b7c1686ac6 100644 --- a/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/ShipmentService.cs @@ -177,8 +177,6 @@ public virtual void UpdateShipment(Shipment shipment) _eventPublisher.PublishOrderUpdated(shipment.Order); } - - /// /// Deletes a shipment item /// diff --git a/src/Libraries/SmartStore.Services/Shipping/ShippingService.cs b/src/Libraries/SmartStore.Services/Shipping/ShippingService.cs index 0b7914f83a..7f5526fdb1 100644 --- a/src/Libraries/SmartStore.Services/Shipping/ShippingService.cs +++ b/src/Libraries/SmartStore.Services/Shipping/ShippingService.cs @@ -130,7 +130,6 @@ public virtual IEnumerable> LoadAllShip #region Shipping methods - /// /// Deletes a shipping method /// diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 377945466a..b62b05ecae 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -1,845 +1,31 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {210541AD-F659-47DA-8763-16F36C5CD2F4} - Library - Properties - SmartStore.Services + net8.0 SmartStore.Services - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 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 + SmartStore.Services latest + disable + disable + false + - - ..\..\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/ScheduleTaskService.cs b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs index c9990757c2..415915ff71 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs @@ -4,7 +4,7 @@ using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; diff --git a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs index f286db5350..e5a647baca 100644 --- a/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs +++ b/src/Libraries/SmartStore.Services/Tasks/TaskScheduler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Logging; using SmartStore.Collections; using SmartStore.Core.Caching; diff --git a/src/Libraries/SmartStore.Services/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/Tax/ITaxService.cs b/src/Libraries/SmartStore.Services/Tax/ITaxService.cs index f38335ce69..42ec6ed010 100644 --- a/src/Libraries/SmartStore.Services/Tax/ITaxService.cs +++ b/src/Libraries/SmartStore.Services/Tax/ITaxService.cs @@ -34,9 +34,6 @@ public partial interface ITaxService /// Tax providers IEnumerable> LoadAllTaxProviders(); - - - /// /// Gets tax rate /// @@ -62,9 +59,6 @@ public partial interface ITaxService /// Tax rate decimal GetTaxRate(Product product, int taxCategoryId, Customer customer); - - - /// /// Gets price /// @@ -127,9 +121,6 @@ decimal GetProductPrice(Product product, bool priceIncludesTax, out decimal taxRate); - - - /// /// Gets the shipping price /// @@ -168,9 +159,6 @@ decimal GetProductPrice(Product product, /// Shipping price decimal GetShippingPrice(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate); - - - /// /// Gets payment method additional handling fee /// @@ -209,9 +197,6 @@ decimal GetProductPrice(Product product, /// Payment fee decimal GetPaymentMethodAdditionalFee(decimal price, bool includingTax, Customer customer, int taxCategoryId, out decimal taxRate); - - - /// /// Gets checkout attribute value price /// @@ -248,11 +233,6 @@ decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav, decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav, bool includingTax, Customer customer, out decimal taxRate); - - - - - /// /// Gets VAT Number status /// @@ -300,8 +280,6 @@ VatNumberStatus GetVatNumberStatus(string twoLetterIsoCode, string vatNumber, VatNumberStatus DoVatCheck(string twoLetterIsoCode, string vatNumber, out string name, out string address, out Exception exception); - - /// /// Gets a value indicating whether tax exempt /// diff --git a/src/Libraries/SmartStore.Services/Tax/TaxService.cs b/src/Libraries/SmartStore.Services/Tax/TaxService.cs index 241b85f9fb..63c32b1610 100644 --- a/src/Libraries/SmartStore.Services/Tax/TaxService.cs +++ b/src/Libraries/SmartStore.Services/Tax/TaxService.cs @@ -275,7 +275,6 @@ public virtual IEnumerable> LoadAllTaxProviders() return _providerManager.GetAllProviders(); } - private decimal GetOriginTaxRate(Product product) { return GetTaxRate(product, 0, null); @@ -362,7 +361,6 @@ protected virtual decimal GetTaxRateCore(Product product, int taxCategoryId, Cus } } - /// /// Gets price /// @@ -470,9 +468,6 @@ public virtual decimal GetProductPrice( return price; } - - - public virtual decimal GetShippingPrice(decimal price, Customer customer) { var includingTax = (_workContext.TaxDisplayType == TaxDisplayType.IncludingTax); @@ -510,8 +505,6 @@ public virtual decimal GetShippingPrice(decimal price, bool includingTax, Custom return result; } - - public virtual decimal GetPaymentMethodAdditionalFee(decimal price, Customer customer) { var includingTax = (_workContext.TaxDisplayType == TaxDisplayType.IncludingTax); @@ -549,8 +542,6 @@ public virtual decimal GetPaymentMethodAdditionalFee(decimal price, bool includi return result; } - - /// /// Gets checkout attribute value price /// @@ -616,10 +607,6 @@ public virtual decimal GetCheckoutAttributePrice(CheckoutAttributeValue cav, return GetProductPrice(null, taxClassId, price, includingTax, customer, _workContext.WorkingCurrency, priceIncludesTax, out taxRate); } - - - - /// /// Gets VAT Number status /// @@ -752,7 +739,6 @@ public virtual VatNumberStatus DoVatCheck(string twoLetterIsoCode, string vatNum } } - /// /// Gets a value indicating whether tax exempt /// diff --git a/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs b/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs index 5f9b98f6a3..98b041034b 100644 --- a/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs +++ b/src/Libraries/SmartStore.Services/Themes/ThemeVariablesService.cs @@ -311,7 +311,6 @@ public string ExportVariables(string themeName, int storeId) return sb.ToString(); } - /// /// Validates the result SASS file by calling it's url. /// diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs index f3f9e19667..b01e6fbda6 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayCheckoutController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Services; using SmartStore.Core.Html; using SmartStore.Core.Logging; diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs index 014492316e..c3878a9c93 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayController.cs @@ -3,7 +3,7 @@ using System.Net; using System.Text; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Models; using SmartStore.AmazonPay.Services; using SmartStore.ComponentModel; diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayControllerBase.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayControllerBase.cs index 423463b7d7..11fbb575b6 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayControllerBase.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayControllerBase.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Models; using SmartStore.AmazonPay.Services; using SmartStore.Web.Framework.Controllers; diff --git a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayShoppingCartController.cs b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayShoppingCartController.cs index 9da9735274..647f0c187a 100644 --- a/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayShoppingCartController.cs +++ b/src/Plugins/SmartStore.AmazonPay/Controllers/AmazonPayShoppingCartController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Services; namespace SmartStore.AmazonPay.Controllers 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..8d5771e54a 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; @@ -74,7 +74,6 @@ public class ConfigurationModel : ModelBase [SmartResourceDisplayName("Plugins.Payments.AmazonPay.InformCustomerAddErrors")] public bool InformCustomerAddErrors { get; set; } - [SmartResourceDisplayName("Plugins.Payments.AmazonPay.PayButtonColor")] public string PayButtonColor { get; set; } diff --git a/src/Plugins/SmartStore.AmazonPay/Plugin.cs b/src/Plugins/SmartStore.AmazonPay/Plugin.cs index 8b6904f964..0f691b71e6 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; @@ -142,7 +142,6 @@ public override VoidPaymentResult Void(VoidPaymentRequest voidPaymentRequest) return result; } - public override void GetConfigurationRoute(out string actionName, out string controllerName, out RouteValueDictionary routeValues) { actionName = "Configure"; diff --git a/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs b/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs index 3cfe49b1b8..173d7ca142 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.Mvc; +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..0e901500c1 100644 --- a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs +++ b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayService.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using AmazonPay; using AmazonPay.Responses; using AmazonPay.StandardPaymentRequests; @@ -753,7 +753,6 @@ private void EarlyPolling(int orderId, AmazonPaySettings settings) return true; }); - PollingLoop(d, () => { if (d.Order.CaptureTransactionId.IsEmpty()) diff --git a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayUtilities.cs b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayUtilities.cs index a2ade0617a..11cde46cb5 100644 --- a/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayUtilities.cs +++ b/src/Plugins/SmartStore.AmazonPay/Services/AmazonPayUtilities.cs @@ -18,14 +18,12 @@ public class AmazonPayCheckoutState public bool SubmitForm { get; set; } } - public class AmazonPayActionState { public Guid OrderGuid { get; set; } public List Errors { get; set; } } - [Serializable] public class AmazonPayOrderAttribute { @@ -33,7 +31,6 @@ public class AmazonPayOrderAttribute public bool OrderReferenceClosed { get; set; } } - internal class PollingLoopData { public PollingLoopData(int orderId) diff --git a/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs b/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs index 05e0589571..c3f71ac030 100644 --- a/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs +++ b/src/Plugins/SmartStore.AmazonPay/Services/IAmazonPayService.cs @@ -1,5 +1,5 @@ using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using AmazonPay; using SmartStore.AmazonPay.Models; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs b/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs index dc02828931..fa81385650 100644 --- a/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs +++ b/src/Plugins/SmartStore.AmazonPay/Widgets/AmazonPayWidget.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Services.Cms; using SmartStore.Web.Models.ShoppingCart; diff --git a/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs b/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs index 2c6a23810d..54cb7e9b65 100644 --- a/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs +++ b/src/Plugins/SmartStore.Clickatell/ClickatellSmsProvider.cs @@ -3,7 +3,7 @@ using System.IO; using System.Net; using System.Text; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SmartStore.Core.Logging; diff --git a/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs b/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs index a79d2de550..1ceb05b84b 100644 --- a/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs +++ b/src/Plugins/SmartStore.Clickatell/Controllers/SmsClickatellController.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Clickatell.Models; using SmartStore.ComponentModel; using SmartStore.Core.Plugins; diff --git a/src/Plugins/SmartStore.Clickatell/RouteProvider.cs b/src/Plugins/SmartStore.Clickatell/RouteProvider.cs index 6271b445db..ddeead6933 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.Mvc; +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/Controllers/DevToolsController.cs b/src/Plugins/SmartStore.DevTools/Controllers/DevToolsController.cs index 6ed295335a..bed273e21c 100644 --- a/src/Plugins/SmartStore.DevTools/Controllers/DevToolsController.cs +++ b/src/Plugins/SmartStore.DevTools/Controllers/DevToolsController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core.Search.Facets; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.DevTools/Controllers/MyCheckoutController.cs b/src/Plugins/SmartStore.DevTools/Controllers/MyCheckoutController.cs index ef7ca20cf2..a80890fa2b 100644 --- a/src/Plugins/SmartStore.DevTools/Controllers/MyCheckoutController.cs +++ b/src/Plugins/SmartStore.DevTools/Controllers/MyCheckoutController.cs @@ -2,7 +2,7 @@ //using System.Collections.Generic; //using System.Linq; //using System.Web; -//using System.Web.Mvc; +//using Microsoft.AspNetCore.Mvc; //using SmartStore.Web.Controllers; //using SmartStore.Web.Framework.Controllers; 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..2596b3142a 100644 --- a/src/Plugins/SmartStore.DevTools/Filters/ProfilerFilter.cs +++ b/src/Plugins/SmartStore.DevTools/Filters/ProfilerFilter.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services; using SmartStore.Services.Common; using SmartStore.Services.Customers; diff --git a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs index 624f28253b..7a58c5febd 100644 --- a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs +++ b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleActionFilter.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Logging; namespace SmartStore.DevTools.Filters diff --git a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleCheckoutFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleCheckoutFilter.cs index b2ff97632d..1a57a68505 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Logging; namespace SmartStore.DevTools.Filters diff --git a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleProductDetailActionFilter.cs b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleProductDetailActionFilter.cs index 185f65234e..409db91746 100644 --- a/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleProductDetailActionFilter.cs +++ b/src/Plugins/SmartStore.DevTools/Filters/Samples/SampleProductDetailActionFilter.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services; using SmartStore.Web.Models.Catalog; 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..655a723d11 100644 --- a/src/Plugins/SmartStore.DevTools/Filters/WidgetZoneFilter.cs +++ b/src/Plugins/SmartStore.DevTools/Filters/WidgetZoneFilter.cs @@ -1,6 +1,6 @@ using System; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Caching; using SmartStore.Services; using SmartStore.Services.Customers; diff --git a/src/Plugins/SmartStore.DevTools/RouteProvider.cs b/src/Plugins/SmartStore.DevTools/RouteProvider.cs index 1d35543960..de124e15a3 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; namespace SmartStore.DevTools diff --git a/src/Plugins/SmartStore.DevTools/Security/DevToolsPermissionProvider.cs b/src/Plugins/SmartStore.DevTools/Security/DevToolsPermissionProvider.cs index d84a20d7a6..c8d3b7cf69 100644 --- a/src/Plugins/SmartStore.DevTools/Security/DevToolsPermissionProvider.cs +++ b/src/Plugins/SmartStore.DevTools/Security/DevToolsPermissionProvider.cs @@ -18,7 +18,6 @@ public static class DevToolsPermissions public const string Update = "devtools.update"; } - public class DevToolsPermissionProvider : IPermissionProvider { public IEnumerable GetPermissions() diff --git a/src/Plugins/SmartStore.DevTools/Services/CustomFacetTemplateSelector.cs b/src/Plugins/SmartStore.DevTools/Services/CustomFacetTemplateSelector.cs index 7b5265df8f..181410ca79 100644 --- a/src/Plugins/SmartStore.DevTools/Services/CustomFacetTemplateSelector.cs +++ b/src/Plugins/SmartStore.DevTools/Services/CustomFacetTemplateSelector.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Search.Facets; using SmartStore.Services.Customers; diff --git a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 4a2abff1a9..6ebc62d5eb 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -1,357 +1,28 @@ - - - - - - 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 - SmartStore.DevTools + net8.0 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 + SmartStore.DevTools + latest + disable + 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/Controllers/ExternalAuthFacebookController.cs b/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs index c6351de248..5e437f7599 100644 --- a/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs +++ b/src/Plugins/SmartStore.FacebookAuth/Controllers/ExternalAuthFacebookController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs index 398f771ff5..5420d95e28 100644 --- a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs +++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookOAuth2Client.cs @@ -44,7 +44,6 @@ internal class FacebookOAuth2Client : OAuth2Client ///     private readonly string[] _requestedScopes; - /// /// Creates a new Facebook OAuth2 client, requesting the default "email" scope. /// diff --git a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs index 41594bc23e..5b095351e6 100644 --- a/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs +++ b/src/Plugins/SmartStore.FacebookAuth/Core/FacebookProviderAuthorizer.cs @@ -7,7 +7,7 @@ using System.Net; using System.Text; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using DotNetOpenAuth.AspNet; using Newtonsoft.Json.Linq; using SmartStore.Core.Domain.Customers; diff --git a/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs b/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs index 0c7b986ed9..07f89bc859 100644 --- a/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs +++ b/src/Plugins/SmartStore.FacebookAuth/FacebookExternalAuthMethod.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Services.Authentication.External; using SmartStore.Services.Localization; diff --git a/src/Plugins/SmartStore.FacebookAuth/RouteProvider.cs b/src/Plugins/SmartStore.FacebookAuth/RouteProvider.cs index 1d9b8cf532..7b62cb5fd4 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.Mvc; +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..c39a6dd9b1 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; @@ -17,22 +17,21 @@ public ConfigurationModel() public string ZoneId { get; set; } public IList AvailableZones { get; set; } - [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..0f8a42ed0d 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.Mvc; +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..1509cf57cb 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; @@ -32,7 +32,6 @@ public GoogleProductObjectContext(string nameOrConnectionString) { } - protected override void OnModelCreating(DbModelBuilder modelBuilder) { modelBuilder.Configurations.Add(new GoogleProductRecordMap()); diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs index 81c634f39c..c2542a95ec 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.GoogleMerchantCenter.Domain; namespace SmartStore.GoogleMerchantCenter.Data diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs index 46fdc6a4f9..7945306f45 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs @@ -14,7 +14,6 @@ public GoogleProductRecord() Export = true; } - [Index] public int ProductId { get; set; } public string Taxonomy { get; set; } @@ -26,12 +25,10 @@ public GoogleProductRecord() public string Pattern { get; set; } public string ItemGroupId { get; set; } - [Index] public bool IsTouched { get; set; } public DateTime CreatedOnUtc { get; set; } public DateTime UpdatedOnUtc { get; set; } - [Index] public bool Export { get; set; } public int Multipack { get; set; } diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs index 19cea6a178..22cd5759f1 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs @@ -1,5 +1,5 @@ using System.Data.Entity.Migrations; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.GoogleMerchantCenter.Data.Migrations; using SmartStore.GoogleMerchantCenter.Providers; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs index 3d5f89eda8..016f9ffc21 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Xml.Serialization; using FluentValidation; using FluentValidation.Attributes; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs index 6220b658da..73c4212ec0 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; @@ -259,7 +259,6 @@ protected override void Export(ExportExecuteContext context) defaultAvailability = config.Availability; } - using (var writer = XmlWriter.Create(context.DataStream, ExportXmlHelper.DefaultSettings)) { writer.WriteStartDocument(); diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs index 32b09e96ef..9f51f930fa 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; namespace SmartStore.GoogleMerchantCenter diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Services/GoogleFeedService.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Services/GoogleFeedService.cs index d8ea715973..5517e318ef 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Services/GoogleFeedService.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Services/GoogleFeedService.cs @@ -251,7 +251,6 @@ public GridModel GetGridModel(GridCommand command, string se " WHERE " + whereClause.ToString(); } - var data = _gpRepository.Context.SqlQuery(sql, (command.Page - 1) * command.PageSize, command.PageSize).ToList(); data.ForEach(x => diff --git a/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs b/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs index e7af8235c0..f5aaeabc73 100644 --- a/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs +++ b/src/Plugins/SmartStore.OfflinePayment/Controllers/OfflinePaymentController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Autofac; using FluentValidation; using FluentValidation.Results; diff --git a/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs b/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs index 9bab769070..4a0a9a506a 100644 --- a/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs +++ b/src/Plugins/SmartStore.OfflinePayment/Models/ConfigurationModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.OfflinePayment.Settings; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -11,7 +11,6 @@ public abstract class ConfigurationModelBase : ModelBase { public string PrimaryStoreCurrencyCode { get; set; } - [AllowHtml] [SmartResourceDisplayName("Plugins.SmartStore.OfflinePayment.DescriptionText")] public string DescriptionText { get; set; } diff --git a/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs b/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs index b32748e19d..17526aed42 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,30 @@ 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,11 +104,10 @@ public class PrepaymentPaymentInfoModel : PaymentInfoModelBase public class PurchaseOrderNumberPaymentInfoModel : PaymentInfoModelBase { [SmartResourceDisplayName("Plugins.Payments.PurchaseOrder.PurchaseOrderNumber")] - [AllowHtml] + public string PurchaseOrderNumber { get; set; } } - #region Validators public class DirectDebitPaymentInfoValidator : AbstractValidator 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..48013837b3 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.Mvc; +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..9c1c3b4943 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -1,271 +1,28 @@ - - - - - - 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 - SmartStore.OfflinePayment + net8.0 SmartStore.OfflinePayment - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - - - - 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 + SmartStore.OfflinePayment + latest + disable + disable + false + - - ..\..\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..375152a3ba 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs @@ -6,7 +6,7 @@ using System.Net; using System.Text; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; @@ -33,7 +33,6 @@ protected void PrepareConfigurationModel(ApiConfigurationModel model, int storeS } } - public abstract class PayPalControllerBase : PayPalPaymentControllerBase where TSetting : PayPalSettingsBase, ISettings, new() { public PayPalControllerBase( diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs index 7627f1be3d..2e7a8ee29a 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Payments; using SmartStore.PayPal.Models; using SmartStore.PayPal.Settings; diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs index fa7295802e..0741c5f8c1 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs index df1da9f9cf..16a6e2c634 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalInstalmentsController.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Common; diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs index 9da0dd3d08..ba40523815 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalPlusController.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Customers; diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs index 564bf916fa..b7824832c1 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalRestApiControllerBase.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Net; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core.Configuration; using SmartStore.Core.Logging; diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs index 9e38694835..aa60f3b4ad 100644 --- a/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs +++ b/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Logging; using SmartStore.PayPal.Models; diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs index ff494de305..46982a4565 100644 --- a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs +++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressCheckoutFilter.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Customers; using SmartStore.Services; using SmartStore.Services.Common; diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs index c68f172505..91ab0355a2 100644 --- a/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs +++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalExpressWidgetZoneFilter.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Orders; using SmartStore.PayPal.Settings; using SmartStore.Services; diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs index 1d2dc1c344..ff7db5bda6 100644 --- a/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs +++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalInstalmentsCheckoutFilter.cs @@ -1,6 +1,6 @@ using System; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs index d0d51d502c..78ec760421 100644 --- a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs +++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusCheckoutFilter.cs @@ -1,6 +1,6 @@ using System; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; using SmartStore.Services; diff --git a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs index b962c689e2..52fb0e87fd 100644 --- a/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs +++ b/src/Plugins/SmartStore.PayPal/Filters/PayPalPlusWidgetZoneFilter.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.UI; namespace SmartStore.PayPal.Filters diff --git a/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs b/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs index aa10dac96c..a9d70c611d 100644 --- a/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs +++ b/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalInstalmentsConfigModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.PayPal.Services; using SmartStore.PayPal.Settings; using SmartStore.Web.Framework; diff --git a/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalPlusConfigurationModel.cs b/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalPlusConfigurationModel.cs index b104dfdd0a..35e3db9147 100644 --- a/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalPlusConfigurationModel.cs +++ b/src/Plugins/SmartStore.PayPal/Models/Congfiguration/PayPalPlusConfigurationModel.cs @@ -26,7 +26,6 @@ public PayPalPlusConfigurationModel() public bool DisplayPaymentMethodDescription { get; set; } } - public class PayPalApiConfigValidator : SmartValidatorBase { public PayPalApiConfigValidator(Localizer T, Func addRule) diff --git a/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs b/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs index cd001f5558..ca744e2f05 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,33 @@ 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..44fc7d5dd4 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs @@ -544,7 +544,6 @@ public ProcessPaymentRequest SetCheckoutDetails(ProcessPaymentRequest processPay processPaymentRequest.PaypalPayerId = checkoutDetails.PayerInfo.PayerID; - return processPaymentRequest; } @@ -595,7 +594,6 @@ public DoExpressCheckoutPaymentResponseType DoExpressCheckoutPayment(ProcessPaym } } - public class PayPalProcessPaymentRequest : ProcessPaymentRequest { /// diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalInstalmentsProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalInstalmentsProvider.cs index bf4d1e2da6..6597aee752 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalInstalmentsProvider.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalInstalmentsProvider.cs @@ -44,7 +44,6 @@ public override void PostProcessPayment(PostProcessPaymentRequest postProcessPay } } - [Serializable] public class PayPalInstalmentsOrderAttribute { diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs index c6b2da707b..81b7d38be8 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalProviderBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs index d217db5343..e21c373727 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalRestApiProviderBase.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs index 02fbb10855..f6ee6a2b45 100644 --- a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs +++ b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs @@ -7,7 +7,7 @@ using System.Net; using System.Text; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; @@ -566,7 +566,6 @@ public override void GetPaymentInfoRoute(out string actionName, out string contr } } - public class PayPalLineItem : ICloneable { public PayPalItemType Type { get; set; } diff --git a/src/Plugins/SmartStore.PayPal/RouteProvider.cs b/src/Plugins/SmartStore.PayPal/RouteProvider.cs index 01da8fd84d..c17d81c49b 100644 --- a/src/Plugins/SmartStore.PayPal/RouteProvider.cs +++ b/src/Plugins/SmartStore.PayPal/RouteProvider.cs @@ -1,5 +1,5 @@ -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; namespace SmartStore.PayPal @@ -36,8 +36,6 @@ public void RegisterRoutes(RouteCollection routes) ) .DataTokens["area"] = Plugin.SystemName; - - //Legacay Routes routes.MapRoute("SmartStore.PayPalExpress.IPN", "Plugins/PaymentPayPalExpress/IPNHandler", diff --git a/src/Plugins/SmartStore.PayPal/Services/PayPalService.Credit.cs b/src/Plugins/SmartStore.PayPal/Services/PayPalService.Credit.cs index 15380d7652..e2b8bb3230 100644 --- a/src/Plugins/SmartStore.PayPal/Services/PayPalService.Credit.cs +++ b/src/Plugins/SmartStore.PayPal/Services/PayPalService.Credit.cs @@ -148,7 +148,6 @@ public FinancingOptions GetFinancingOptions( } } - public class FinancingOptions { public FinancingOptions(string origin) diff --git a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs index dd5d2847fb..f43011aac7 100644 --- a/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs +++ b/src/Plugins/SmartStore.PayPal/Services/PayPalService.cs @@ -1129,7 +1129,6 @@ public HttpStatusCode ProcessWebhook( //foreach (var key in headers.AllKeys)"{0}: {1}".FormatInvariant(key, headers[key]).Dump(); //string data = JsonConvert.SerializeObject(json, Formatting.Indented);data.Dump(); - // validating against PayPal SDK failing using sandbox, so better we do not use it: //var apiContext = new global::PayPal.Api.APIContext //{ @@ -1285,7 +1284,6 @@ private void GetPayerInfo(Customer customer, out string firstName, out string la #endregion } - public class PayPalResponse { public bool Success { get; set; } diff --git a/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs b/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs index 405e714eac..0445cc756d 100644 --- a/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs +++ b/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs @@ -56,7 +56,6 @@ public class PayPalApiSettingsBase : PayPalSettingsBase public string WebhookId { get; set; } } - public class PayPalDirectPaymentSettings : PayPalApiSettingsBase, ISettings { public PayPalDirectPaymentSettings() @@ -153,7 +152,6 @@ public PayPalStandardPaymentSettings() public bool IsShippingAddressRequired { get; set; } } - /// /// Represents payment processor transaction mode /// diff --git a/src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs b/src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs index 4e59e487cd..5d23b6f00c 100644 --- a/src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs +++ b/src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Common; using SmartStore.Services; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs b/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs index 2173dbbb72..0a1dbb29fd 100644 --- a/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs +++ b/src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Configuration; using SmartStore.Services.Shipping; using SmartStore.Shipping.Models; diff --git a/src/Plugins/SmartStore.Shipping/Data/ByTotalObjectContext.cs b/src/Plugins/SmartStore.Shipping/Data/ByTotalObjectContext.cs index 7efe429c1b..278bf4383a 100644 --- a/src/Plugins/SmartStore.Shipping/Data/ByTotalObjectContext.cs +++ b/src/Plugins/SmartStore.Shipping/Data/ByTotalObjectContext.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Data; using SmartStore.Data.Setup; using SmartStore.Shipping.Data.Migrations; diff --git a/src/Plugins/SmartStore.Shipping/Data/ByTotalRecordMap.cs b/src/Plugins/SmartStore.Shipping/Data/ByTotalRecordMap.cs index 42db4fd8be..4922a1b1a7 100644 --- a/src/Plugins/SmartStore.Shipping/Data/ByTotalRecordMap.cs +++ b/src/Plugins/SmartStore.Shipping/Data/ByTotalRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Shipping.Domain; namespace SmartStore.Shipping.Data diff --git a/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs b/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs index 1b4033e202..544b9a32d1 100644 --- a/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs +++ b/src/Plugins/SmartStore.Shipping/Models/ByTotalListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs b/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs index 5bc81716fc..5ebad0752c 100644 --- a/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs +++ b/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Localization; diff --git a/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs b/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs index 96de1e9066..15c6ce27af 100644 --- a/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs +++ b/src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Localization; using SmartStore.Core.Plugins; diff --git a/src/Plugins/SmartStore.Shipping/RouteProvider.cs b/src/Plugins/SmartStore.Shipping/RouteProvider.cs index fd87b94fe1..f2581e1bfa 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.Mvc; +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..d885de72e4 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -1,275 +1,29 @@ - - - - - - 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 - SmartStore.Shipping + net8.0 SmartStore.Shipping - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - - - - 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 + SmartStore.Shipping + latest + disable + 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\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..4a8cbc51e4 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs @@ -1,6 +1,6 @@ using System; using System.Data.Entity.Migrations; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Domain.Tax; @@ -246,7 +246,6 @@ public override void Uninstall() /// public ShippingRateComputationMethodType ShippingRateComputationMethodType => ShippingRateComputationMethodType.Offline; - /// /// Gets a shipment tracker /// diff --git a/src/Plugins/SmartStore.ShippingByWeight/Controllers/ShippingByWeightController.cs b/src/Plugins/SmartStore.ShippingByWeight/Controllers/ShippingByWeightController.cs index 74cc909afc..4810d47af9 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Controllers/ShippingByWeightController.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Controllers/ShippingByWeightController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Directory; using SmartStore.Services; diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs index c81b90679e..50c0cc9b30 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightObjectContext.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Data; using SmartStore.Data.Setup; using SmartStore.ShippingByWeight.Data.Migrations; diff --git a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs index 8f906b6226..ccf38c7fd5 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Data/ShippingByWeightRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.ShippingByWeight.Domain; namespace SmartStore.ShippingByWeight.Data diff --git a/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs b/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs index 31bd7fb8df..91f68351fe 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/Models/ShippingByWeightListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Plugins/SmartStore.ShippingByWeight/RouteProvider.cs b/src/Plugins/SmartStore.ShippingByWeight/RouteProvider.cs index 486bab5f1d..0929df33c0 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; namespace SmartStore.ShippingByWeight diff --git a/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs b/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs index 9f5be9be9a..add2d75f4e 100644 --- a/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs +++ b/src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs @@ -1,5 +1,5 @@ using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Tax; using SmartStore.Services.Directory; diff --git a/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs b/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs index 4cbdaa4c6c..bb24483a7a 100644 --- a/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs +++ b/src/Plugins/SmartStore.Tax/Controllers/TaxFixedRateController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Configuration; using SmartStore.Services.Tax; using SmartStore.Tax.Models; diff --git a/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs b/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs index f145987d0f..f4401e5143 100644 --- a/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs +++ b/src/Plugins/SmartStore.Tax/Data/TaxRateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.Metadata.Builders; using SmartStore.Tax.Domain; namespace SmartStore.Tax.Data diff --git a/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs b/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs index 76f79510e0..c2ffc46883 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; @@ -34,7 +34,6 @@ public TaxRateObjectContext(string nameOrConnectionString) { } - protected override void OnModelCreating(DbModelBuilder modelBuilder) { modelBuilder.Configurations.Add(new TaxRateMap()); diff --git a/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs b/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs index 65e6053f46..3741198c8b 100644 --- a/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs +++ b/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs b/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs index 8a2c010e64..cd7c65cc95 100644 --- a/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs +++ b/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs @@ -1,5 +1,5 @@ using System.Linq; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Plugins; using SmartStore.Services.Configuration; diff --git a/src/Plugins/SmartStore.Tax/Providers/FixedRateTaxProvider.cs b/src/Plugins/SmartStore.Tax/Providers/FixedRateTaxProvider.cs index cd325fa3cb..273f1385a3 100644 --- a/src/Plugins/SmartStore.Tax/Providers/FixedRateTaxProvider.cs +++ b/src/Plugins/SmartStore.Tax/Providers/FixedRateTaxProvider.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Services.Configuration; using SmartStore.Services.Tax; diff --git a/src/Plugins/SmartStore.Tax/RouteProvider.cs b/src/Plugins/SmartStore.Tax/RouteProvider.cs index f9e56d6632..fd84429e5e 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; namespace SmartStore.Tax diff --git a/src/Plugins/SmartStore.Tax/Services/TaxRateService.cs b/src/Plugins/SmartStore.Tax/Services/TaxRateService.cs index 8d60f47023..fe6ce5623e 100644 --- a/src/Plugins/SmartStore.Tax/Services/TaxRateService.cs +++ b/src/Plugins/SmartStore.Tax/Services/TaxRateService.cs @@ -49,13 +49,11 @@ public virtual IList GetAllTaxRates(int taxCategoryId, int countryId, if (stateProvinceId == taxRate.StateProvinceId) matchedByStateProvince.Add(taxRate); - if (matchedByStateProvince.Count == 0) foreach (var taxRate in existingRates) if (taxRate.StateProvinceId == 0) matchedByStateProvince.Add(taxRate); - //filter by zip var matchedByZip = new List(); foreach (var taxRate in matchedByStateProvince) diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 4f0f0c8a61..c18d380e4a 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -1,277 +1,29 @@ - - - - - - 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 - SmartStore.Tax + net8.0 SmartStore.Tax - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - - - - 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 + SmartStore.Tax + latest + disable + disable + false + - - ..\..\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/HomeController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/HomeController.cs index 40acd9c9eb..c687f14323 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/HomeController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/HomeController.cs @@ -1,4 +1,4 @@ -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.WebApi.Security; namespace SmartStore.WebApi.Controllers.Api diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs index 7b6b0f63be..f53855a986 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/PaymentsController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Plugins; using SmartStore.Core.Security; using SmartStore.Services.Payments; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs index 67b5927002..4f0f7df709 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/Api/UploadsController.cs @@ -8,7 +8,7 @@ using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs index 6cc3c35344..6c200116cd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/AddressesController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs index 97aec40b54..6607f70267 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogCommentsController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Data; using SmartStore.Core.Domain.Blogs; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs index 4271b1f00a..e4e7c16ba8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/BlogPostsController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Blogs; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs index 8a8ced7e0f..8fe85b992a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CategoriesController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs index 3740544c0f..4436369cf6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CountriesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs index bee90353c4..d9d4d87d0f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CurrenciesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs index 42da3db029..11b9aca451 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRoleMappingsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs index 247c78e490..cf22d5dcd1 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomerRolesController.cs @@ -1,6 +1,6 @@ using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs index 3d36a43a54..7e3d6b5ab6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/CustomersController.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; @@ -179,7 +179,6 @@ public IHttpActionResult DeleteAddresses(int key, int relatedKey = 0 /*addressId return StatusCode(HttpStatusCode.NoContent); } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Customer.Read)] public IHttpActionResult GetBillingAddress(int key) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs index 2fd99d7da9..a9c14e2da5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DeliveryTimesController.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs index dcbadc3a51..31e3e65448 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DiscountsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Discounts; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs index 57718455cb..a51e365995 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/DownloadsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs index 1dd34341da..d9ec25c9f2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/GenericAttributesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Common; using SmartStore.Services.Common; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs index 0c4a0b3149..9eaedaa02f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LanguagesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs index e895b018ef..0ea93776fd 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/LocalizedPropertiesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Localization; using SmartStore.Services.Localization; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs index 64f4e274c0..5a4905dc9f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ManufacturersController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs index 0554a6d8aa..2ca9d2f1a7 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureDimensionsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs index 463a664274..186506794b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MeasureWeightsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs index 3194927122..51308d1587 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFilesController.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Media; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs index 006634321c..f74bdbeaf0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/MediaFoldersController.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Net; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Collections; using SmartStore.Core.Domain.Media; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs index d412456cb4..982cd17d42 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/NewsLetterSubscriptionsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Messages; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs index 7d04aedc07..f9d90b144b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderItemsController.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs index d7464b9155..17780eb3aa 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrderNotesController.cs @@ -1,7 +1,7 @@ using System; using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs index 7c5e3b6cc3..2f7b84eb6b 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/OrdersController.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net.Http; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs index 27f26cd4af..2023e928ba 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/PaymentMethodsController.cs @@ -1,6 +1,6 @@ using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs index 30a632b403..ff6758e82f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs index 73357da55e..13504951a5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributeOptionsSetsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs index 3b0d397166..8dd660256d 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductAttributesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs index 7222c931e6..f81d316c0c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductBundleItemsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs index f21fdbe8b2..0383c41e1a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductCategoriesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs index 674c5f82bc..2cfb14458a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductManufacturersController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs index 4f318e3abb..8fb74c670f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductPicturesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs index 48aa52f74e..c07a9d77a2 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductSpecificationAttributesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs index 0f923bb726..09d5420ed6 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeCombinationsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs index f95e6c1332..c84c8c2fe0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributeValuesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs index 9e41d3eb35..dd279a6e45 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductVariantAttributesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs index 03eea6136d..cc8fff8ea0 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ProductsController.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.ModelBinding; using System.Web.OData; using SmartStore.Core.Domain.Catalog; @@ -168,7 +168,6 @@ public IHttpActionResult GetSampleDownload(int key) return Ok(GetRelatedEntity(key, x => x.SampleDownload)); } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult GetProductCategories(int key, int relatedKey = 0 /*categoryId*/) @@ -226,7 +225,6 @@ public IHttpActionResult DeleteProductCategories(int key, int relatedKey = 0 /*c return StatusCode(HttpStatusCode.NoContent); } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult GetProductManufacturers(int key, int relatedKey = 0 /*manufacturerId*/) @@ -284,7 +282,6 @@ public IHttpActionResult DeleteProductManufacturers(int key, int relatedKey = 0 return StatusCode(HttpStatusCode.NoContent); } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult GetProductPictures(int key, int relatedKey = 0 /*mediaFileId*/) @@ -342,7 +339,6 @@ public IHttpActionResult DeleteProductPictures(int key, int relatedKey = 0 /*med return StatusCode(HttpStatusCode.NoContent); } - [WebApiQueryable] [WebApiAuthenticate(Permission = Permissions.Catalog.Product.Read)] public IHttpActionResult GetProductSpecificationAttributes(int key) diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs index c381d0da4d..cea19f153f 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/QuantityUnitsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs index 7b9125bf41..d851745aee 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RelatedProductsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs index 22f0f7a91a..fba02f785e 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ReturnRequestsController.cs @@ -1,6 +1,6 @@ using System.Net; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Security; using SmartStore.Services.Orders; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs index 198bf3fccb..05a46322de 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/RewardPointsHistoryController.cs @@ -1,5 +1,5 @@ using System.Net; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; using SmartStore.Services.Customers; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs index 7f9cdcc9d1..560f9c3432 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SettingsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs index ad59cbfe48..4c2e019fee 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentItemsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs index 1c3e24941e..0a330788f8 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShipmentsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs index 6395a7e891..609440be83 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/ShippingMethodsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs index 6d59fea159..1319cd9144 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributeOptionsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs index 91d59be2b3..8e924485a5 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SpecificationAttributesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs index 3801ab926f..64f969f636 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StateProvincesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs index af3078d3b8..69dcc05454 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoreMappingsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Stores; using SmartStore.Services.Stores; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs index bd6e188a73..4f89f9a56a 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/StoresController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Stores; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs index 887b6ee2c6..e52b88919c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/SyncMappingsController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.DataExchange; using SmartStore.Services.DataExchange; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs index 90079f3462..46373c101c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TaxCategoriesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs index 7cfecd460b..c23b533df9 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/TierPricesController.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs index 2aa505279d..13a9d92d6c 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/OData/UrlRecordsController.cs @@ -1,5 +1,5 @@ using System.Net; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Seo; using SmartStore.Services.Seo; using SmartStore.Web.Framework.WebApi.OData; diff --git a/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs b/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs index 79c56d5f25..bdc40f9e06 100644 --- a/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs +++ b/src/Plugins/SmartStore.WebApi/Controllers/WebApiController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Common; using SmartStore.Core.Security; using SmartStore.Web.Framework; diff --git a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs index 05bb0133b9..c3b5bb2c35 100644 --- a/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs +++ b/src/Plugins/SmartStore.WebApi/Extensions/MiscExtensions.cs @@ -1,6 +1,6 @@ using System.Net.Http; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using System.Web.OData.Builder; using SmartStore.Core.Infrastructure; diff --git a/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs b/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs index e090d816b1..7c3ed7af79 100644 --- a/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs +++ b/src/Plugins/SmartStore.WebApi/Filters/IEEE754CompatibleAttribute.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Http.Filters; +using Microsoft.AspNetCore.Mvc.Filters; namespace SmartStore.WebApi { diff --git a/src/Plugins/SmartStore.WebApi/RouteProvider.cs b/src/Plugins/SmartStore.WebApi/RouteProvider.cs index f782ad71e4..ec8a06227b 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; 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..bf879d96e4 100644 --- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerDefaultValueFilter.cs +++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerDefaultValueFilter.cs @@ -37,7 +37,6 @@ public void Apply(Operation operation, SchemaRegistry schemaRegistry, ApiDescrip } } - public class SwaggerDefaultValueAttribute : Attribute { public SwaggerDefaultValueAttribute(string parameterName, object value) diff --git a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs index 4abef43f37..ca850e8087 100644 --- a/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs +++ b/src/Plugins/SmartStore.WebApi/Services/Swagger/SwaggerOdataDocumentFilter.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.Description; using System.Web.OData; using System.Web.OData.Routing; diff --git a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs index 136ac34e0e..f6142faf8b 100644 --- a/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs +++ b/src/Plugins/SmartStore.WebApi/Services/WebApiPdfHelper.cs @@ -4,8 +4,8 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +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/Plugins/SmartStore.WebApi/WebApiPlugin.cs b/src/Plugins/SmartStore.WebApi/WebApiPlugin.cs index ea42dc0e17..151eb87a5f 100644 --- a/src/Plugins/SmartStore.WebApi/WebApiPlugin.cs +++ b/src/Plugins/SmartStore.WebApi/WebApiPlugin.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Core.Security; using SmartStore.Services.Configuration; 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/Bundling/IBundleProvider.cs b/src/Presentation/SmartStore.Web.Framework/Bundling/IBundleProvider.cs index 6bd9ec5bd6..0643f1c44c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Bundling/IBundleProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Bundling/IBundleProvider.cs @@ -1,4 +1,4 @@ -using System.Web.Optimization; +using WebOptimizer; namespace SmartStore.Web.Framework.Bundling { diff --git a/src/Presentation/SmartStore.Web.Framework/Bundling/IBundlePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Bundling/IBundlePublisher.cs index 50859b9456..5646fe904e 100644 --- a/src/Presentation/SmartStore.Web.Framework/Bundling/IBundlePublisher.cs +++ b/src/Presentation/SmartStore.Web.Framework/Bundling/IBundlePublisher.cs @@ -1,4 +1,4 @@ -using System.Web.Optimization; +using WebOptimizer; namespace SmartStore.Web.Framework.Bundling { diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs index e390c90952..7e8654bfb2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/AdminControllerBase.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Web.Framework.Filters; using SmartStore.Web.Framework.Security; diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs index 063643c745..6b07b3b2f2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/ContollerExtensions.cs @@ -1,8 +1,8 @@ using System.Globalization; using System.IO; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Services.Common; diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs index 29b187f3c7..628d6e8682 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/ManageController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Security; using SmartStore.Core.Domain.Stores; diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs index 00aefaf66c..85995a414a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/PaymentControllerBase.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Payments; namespace SmartStore.Web.Framework.Controllers diff --git a/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs b/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs index cadbef89cf..419a1b9ce8 100644 --- a/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs +++ b/src/Presentation/SmartStore.Web.Framework/Controllers/SmartController.cs @@ -1,6 +1,6 @@ using System; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.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..bfa2601733 100644 --- a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs +++ b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using Autofac; using Autofac.Builder; using Autofac.Core; 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/ActionResultExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs index 8e5f88e4c3..0894600482 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/ActionResultExtensions.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; // use base SmartStore Namespace to ensure the extension methods are always available namespace SmartStore diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs index efb5eecbae..71ee73d1a4 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlExtensions.cs @@ -7,9 +7,9 @@ using System.Text; using System.Threading; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using SmartStore.Core; using SmartStore.Core.Domain.Catalog; @@ -371,7 +371,6 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html, days.AppendFormat("", i, (selectedDay.HasValue && selectedDay.Value == i) ? " selected=\"selected\"" : null); - months.AppendFormat("", monthLocale); for (int i = 1; i <= 12; i++) { @@ -381,7 +380,6 @@ public static MvcHtmlString DatePickerDropDowns(this HtmlHelper html, CultureInfo.CurrentUICulture.DateTimeFormat.GetMonthName(i)); } - years.AppendFormat("", yearLocale); if (beginYear == null) diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs index 86ddff19a9..dd9815b3c0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlPrefixScopeExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Utilities; namespace SmartStore.Web.Framework diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs index 6d042beca7..6b43e3a8c7 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; @@ -132,7 +132,6 @@ public static void SelectValue(this List lst, string value, stri } } - public partial class ExtendedSelectListItem : SelectListItem { public ExtendedSelectListItem() diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs index 9677aa41a9..ea094642f3 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Web; -using System.Web.Mvc; +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..6335292b73 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Infrastructure; using SmartStore.Services.Orders; diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/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..67b8be5fce 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; @@ -170,7 +170,6 @@ public static IEnumerable PagedForCommand(this IEnumerable current, Gri return current.Skip((command.Page - 1) * command.PageSize).Take(command.PageSize); } - public static GridBoundColumnBuilder Centered(this GridBoundColumnBuilder columnBuilder) where T : class { return columnBuilder.HtmlAttributes(new { align = "center" }).HeaderHtmlAttributes(new { style = "text-align:center;" }); 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/FormValueExistsAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/FormValueExistsAttribute.cs index cdf11c221c..75cfc8dd30 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/FormValueExistsAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/FormValueExistsAttribute.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.Filters { 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..5b920a9a8a 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/HandleExceptionFilter.cs @@ -1,7 +1,7 @@ using System; using System.Net; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.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..ad9a88ae5e 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.Mvc; +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..1a6bc233b0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/NotifyAttribute.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Logging; namespace SmartStore.Web.Framework.Filters diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAndValueAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAndValueAttribute.cs index 710b51e048..51a32c0019 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAndValueAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAndValueAttribute.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.Filters { diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAttribute.cs index c6b2a9f8c4..e5079d074d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/ParameterBasedOnFormNameAttribute.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; 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..30db6a554f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/PublicStoreAllowNavigationAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Data; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs index 3b7905ca67..70e49e0015 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/ResponseFilterStream.cs @@ -54,7 +54,6 @@ public ResponseFilterStream(Stream innerStream, HttpContextBase httpContext, int _captureStream = new MemoryStream(capacity); } - /// /// Determines whether the stream is captured /// @@ -66,7 +65,6 @@ public ResponseFilterStream(Stream innerStream, HttpContextBase httpContext, int ///     private bool IsOutputDelayed => TransformStream != null || TransformString != null; - /// /// Event that captures Response output and makes it available /// as a MemoryStream instance. Output is captured but won't @@ -118,13 +116,11 @@ public ResponseFilterStream(Stream innerStream, HttpContextBase httpContext, int /// public event Func TransformString; - protected virtual void OnCaptureStream(MemoryStream ms) { CaptureStream?.Invoke(ms); } - private void OnCaptureStringInternal(MemoryStream ms) { if (CaptureString != null) @@ -162,7 +158,6 @@ private string OnTransformWriteString(string value) return value; } - protected virtual MemoryStream OnTransformCompleteStream(MemoryStream ms) { if (TransformStream != null) @@ -171,7 +166,6 @@ protected virtual MemoryStream OnTransformCompleteStream(MemoryStream ms) return ms; } - /// /// Wrapper method form OnTransformString that handles /// stream to string and vice versa conversions diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs index 43cbd1dce2..96bce57aef 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreClosedAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs index aa57f5c33f..9a2f197e3f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreIpAddressAttribute.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs index a9392a363c..b12ad988fc 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/StoreLastVisitedPageAttribute.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs index 93eddf7752..b7198a2f5f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/UnitOfWorkAttribute.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Data; namespace SmartStore.Web.Framework.Filters diff --git a/src/Presentation/SmartStore.Web.Framework/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..c01475e2db 100644 --- a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRoute.cs @@ -1,8 +1,8 @@ using System; using System.Globalization; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Infrastructure; diff --git a/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Localization/LocalizedRouteExtensions.cs index aeb0c37107..38b69548ae 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.Mvc; +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..22df283e96 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; @@ -127,7 +127,6 @@ public abstract partial class EntityModelBase : ModelBase internal int EntityId => Id; } - public abstract partial class TabbableModel : EntityModelBase { public virtual string[] LoadedTabs { get; set; } diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs index 976ac877b3..5f2d5a542f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBoundEvent.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.Modelling { diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs index ed232f2cf9..7ec007a0a0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/CachedFileResult.cs @@ -2,8 +2,8 @@ using System.Globalization; using System.IO; using System.Web; -using System.Web.Hosting; -using System.Web.Mvc; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.IO; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs index bbf053767c..afacbdf053 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/FileResponder.cs @@ -45,7 +45,6 @@ public virtual bool TrySendHeaders(HttpContextBase context) public abstract void SendFile(HttpContextBase context); } - internal sealed class HeadFileResponder : FileResponder { public HeadFileResponder(IFileResponse fileResponse) @@ -79,7 +78,6 @@ public override void SendFile(HttpContextBase context) } } - internal sealed class UnmodifiedFileResponder : FileResponder { public UnmodifiedFileResponder(IFileResponse fileResponse) @@ -109,8 +107,6 @@ public override void SendFile(HttpContextBase context) } } - - internal sealed class FullFileResponder : FileResponder { public FullFileResponder(IFileResponse fileResponse) @@ -135,8 +131,6 @@ public override void SendFile(HttpContextBase context) } } - - internal sealed class RangeFileResponder : FileResponder { internal struct ByteRange 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/PermissiveRedirectResult.cs b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs index 7c6c729645..2543461b57 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/Results/PermissiveRedirectResult.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.Modelling { 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/PdfPartialViewContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs index 19ad2d26bb..59d9ebdd5d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfPartialViewContent.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Pdf; namespace SmartStore.Web.Framework.Pdf diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfRouteContent.cs index 67611c5559..16e258cf16 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Services.Pdf; namespace SmartStore.Web.Framework.Pdf diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs index c81c46d4e7..6769cc4aa0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/Content/PdfViewContent.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Pdf; using SmartStore.Web.Framework.Controllers; diff --git a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs index 525e0b070e..7f6efebecf 100644 --- a/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs +++ b/src/Presentation/SmartStore.Web.Framework/Pdf/PdfResult.cs @@ -1,5 +1,5 @@ using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Pdf; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs index ac2a4cd5fd..033a703277 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/PluginRazorHost.cs @@ -1,5 +1,5 @@ using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using System.Web.Mvc.Razor; using System.Web.WebPages.Razor; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs index 39fbe63e21..3f1b33ffcb 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,11 @@ 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 +68,11 @@ 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..3ee18e3005 100644 --- a/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs +++ b/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs @@ -1,6 +1,6 @@ using System; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.Routing { diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/IRouteProvider.cs b/src/Presentation/SmartStore.Web.Framework/Routing/IRouteProvider.cs index 164f01e62f..f9f0a43bdd 100644 --- a/src/Presentation/SmartStore.Web.Framework/Routing/IRouteProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Routing/IRouteProvider.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.Routing { diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/IRoutePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Routing/IRoutePublisher.cs index 6cda18243c..27db934b46 100644 --- a/src/Presentation/SmartStore.Web.Framework/Routing/IRoutePublisher.cs +++ b/src/Presentation/SmartStore.Web.Framework/Routing/IRoutePublisher.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.Routing { diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs b/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs index 8906a4a3c8..99f0a42546 100644 --- a/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs +++ b/src/Presentation/SmartStore.Web.Framework/Routing/RoutePublisher.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Infrastructure; namespace SmartStore.Web.Framework.Routing diff --git a/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs index 4493d1d338..e973911fd4 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/AdminAuthorizeAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Security; namespace SmartStore.Web.Framework.Security diff --git a/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs index 9568d12685..87d8e8618c 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/AdminValidateIpAddressAttribute.cs @@ -1,6 +1,6 @@ using System; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Security; diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs index d00153bfac..9a933e4521 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/HtmlCaptchaExtensions.cs @@ -1,5 +1,5 @@ using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs index d1f65774f2..7cf8aa53ec 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Captcha/ValidateCaptchaAttribute.cs @@ -7,7 +7,7 @@ using System.Runtime.Serialization.Json; using System.Text; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Logging; using SmartStore.Services.Localization; using SmartStore.Utilities; @@ -146,7 +146,6 @@ private bool VerifyRecaptcha(ActionExecutingContext context) } } - [DataContract] public class GoogleRecaptchaApiResponse { diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs index 8bad998c40..7e928f96b0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/Honeypot.cs @@ -1,7 +1,7 @@ using System; using System.Text; using System.Web; -using System.Web.Security; +using Microsoft.AspNetCore.Identity; using Newtonsoft.Json; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs index 328b3ce01d..d58902c14f 100644 --- a/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Security/Honeypot/HtmlHoneypotExtensions.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; 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..1377e1a145 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRoute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Data; diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs index e83872c01a..ceaf787357 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/GenericPathRouteExtensions.cs @@ -1,6 +1,6 @@ using System; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.Seo { diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs index d39485def5..9a0a4a57ed 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/ISeoModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Localization; namespace SmartStore.Web.Framework.Seo @@ -6,15 +6,15 @@ 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 +23,15 @@ 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..9a065ff683 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 { @@ -35,7 +35,6 @@ public override void OnActionExecuting(ActionExecutingContext filterContext) ? (FormCollection)filterContext.ActionParameters[formParam.ParameterName] : BindFormCollection(filterContext.Controller.ControllerContext); - _settingsWriteBatch = Services.Settings.BeginScope(); } 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..6b11fd7f94 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -1,521 +1,34 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {75FD4163-333C-4DD5-854D-2EF294E45D94} - Library - Properties - SmartStore.Web.Framework + net8.0 SmartStore.Web.Framework - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - - - 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 + SmartStore.Web.Framework + latest + disable + disable + false + - - ..\..\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..ede05c5b05 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartUrlRoutingModule.cs @@ -4,8 +4,8 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Web; -using System.Web.Hosting; -using System.Web.Routing; +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/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..c023f1667d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Web; -using System.Web.Caching; -using System.Web.Hosting; -using System.Web.Optimization; +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..019d5d6375 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/CssHttpHandler.cs @@ -1,6 +1,6 @@ using System; using System.Web; -using System.Web.Caching; +using Microsoft.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..f763bf861b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/DefaultThemeFileResolver.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core; using SmartStore.Core.Infrastructure; using SmartStore.Core.Themes; @@ -280,7 +280,6 @@ private string LocateFile(string themeName, string relativePath, out string virt return null; } - private class FileKey : Tuple { public FileKey(string themeName, string relativePath, string query) 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/SmartVirtualPathProvider.cs b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs index f05bcca22a..cdfd665467 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/SmartVirtualPathProvider.cs @@ -3,7 +3,7 @@ using System.IO; using System.Threading; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Infrastructure; using SmartStore.Core.Themes; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs index bb16495453..18c0ffc6c0 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHelper.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Web; -using System.Web.Optimization; +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..b9990cda93 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs @@ -1,7 +1,7 @@ using System.IO; using System.Linq; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; using SmartStore.Core; using SmartStore.Core.Infrastructure; @@ -144,7 +144,6 @@ public static string IdForThemeVar(this HtmlHelper html, ThemeVariableInfo info) #endregion - #region Href & Path public static string ThemeAwareContent(this UrlHelper url, string path) 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..cfd23cdc27 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeableVirtualPathProviderViewEngine.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.WebPages; using SmartStore.Core.Infrastructure; using SmartStore.Core.Logging; 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..de0915684d 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/TwoLevelViewLocationCache.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Utilities; namespace SmartStore.Web.Framework.Theming diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs index 7fe8956162..d59586c612 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/WebViewPage.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.WebPages; using SmartStore.Core; using SmartStore.Core.Infrastructure; 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..fbf344e898 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/BundleBuilder.cs @@ -4,7 +4,7 @@ using System.Security.Cryptography; using System.Text; using System.Web; -using System.Web.Optimization; +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..b1ff62ec50 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 { @@ -30,8 +30,6 @@ public IDictionary HtmlAttributes private set; } - - public virtual bool NameIsRequired => false; } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs index e6029660ad..212f9507c7 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.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..94aaa3f3cb 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs @@ -1,9 +1,7 @@ using System; using System.IO; using System.Web; -using System.Web.Mvc; -using System.Web.UI; - +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.UI { public abstract class ComponentRenderer : IHtmlString where TComponent : Component 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..582112165e 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 { @@ -63,7 +63,6 @@ public EntityPickerBuilder DialogUrl(string value) return this; } - public EntityPickerBuilder For(Expression> expression) { Guard.NotNull(expression, nameof(expression)); @@ -77,7 +76,6 @@ public EntityPickerBuilder For(string expression) return this; } - public EntityPickerBuilder DisableGroupedProducts(bool value) { base.Component.DisableGroupedProducts = value; @@ -114,7 +112,6 @@ public EntityPickerBuilder HighlightSearchTerm(bool value) return this; } - public EntityPickerBuilder MaxItems(int value) { base.Component.MaxItems = value; @@ -139,7 +136,6 @@ public EntityPickerBuilder FieldName(string value) return this; } - public EntityPickerBuilder OnDialogLoading(string handlerName) { base.Component.OnDialogLoadingHandlerName = handlerName; 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..58d9053e94 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Utilities.ObjectPools; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs index 1703ee3988..0fdd3f986c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuBuilder.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; 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/MenuItemBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs index cda64e9c12..e8d3fc8e7f 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuItemBuilder.cs @@ -41,7 +41,6 @@ public static implicit operator MenuItem(MenuItemBuilder builder) return builder.ToItem(); } - } } 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..30c5497f34 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs @@ -1,6 +1,4 @@ using System.Web.Mvc.Html; -using System.Web.UI; - namespace SmartStore.Web.Framework.UI { public class MenuRenderer : ComponentRenderer diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs index 18cb948efb..8556497877 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponent.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; 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..3053a573d4 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigatableComponentBuilder.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs index dfc5cb4ba3..3832066024 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItem.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using Newtonsoft.Json; @@ -98,7 +98,6 @@ public bool Enabled } } - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public string ActionName { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs index 7242fec0a5..167665cfdb 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using SmartStore.Utilities; @@ -26,7 +26,6 @@ protected internal TItem Item private set; } - public TBuilder Action(RouteValueDictionary routeValues) { this.Item.Action(routeValues); diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs index 06601ae7f7..9a0b4bf23d 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerBuilder.cs @@ -1,4 +1,4 @@ -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/Pager/PagerRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs index 6d770bf586..b57f2d9be4 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; -using System.Web.UI; - +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { public class PagerRenderer : ComponentRenderer diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs index ebb7545bc8..fbb1391696 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabBuilder.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; 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/TabStripBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs index b0a1cfdf26..2a20c1a120 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripBuilder.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.WebPages; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs index 7a77fc0320..d261ace69f 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -using System.Web.Mvc; -using System.Web.UI; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs index 29463fd2d7..487b1b13cc 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/Window.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; 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..485a7f352c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowBuilder.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.WebPages; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs index 6ba1c06b7c..b4586e4ce6 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs @@ -1,6 +1,4 @@ -using System.Web.UI; - -namespace SmartStore.Web.Framework.UI +namespace SmartStore.Web.Framework.UI { // TODO: (mc) make modal window renderer BS4 ready (after backend has been updated to BS4) public class WindowRenderer : ComponentRenderer diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs index edf98c825f..23fc83c3e6 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.WebPages; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/HtmlAttributeExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/HtmlAttributeExtensions.cs index fc975429dc..381d4ef024 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/HtmlAttributeExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/HtmlAttributeExtensions.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework { 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..0f53e25ef1 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/NavigatableExtensions.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Seo; using SmartStore.Services.Localization; using SmartStore.Web.Framework.Seo; @@ -269,7 +269,6 @@ private static void SetRouteValues(this INavigatable navigatable, IDictionary ResolveCurrentNode(ActionExecutedContext filterContex } } - public class MenuResultFilter : IResultFilter { private readonly IWidgetProvider _widgetProvider; 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/Menus/Providers/IMenuItemProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/IMenuItemProvider.cs index 43443cef93..b21e220b74 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/IMenuItemProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/IMenuItemProvider.cs @@ -13,7 +13,6 @@ public interface IMenuItemProvider TreeNode Append(MenuItemProviderRequest request); } - public class MenuItemProviderRequest { /// diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/MenuItemProviderMetadata.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/MenuItemProviderMetadata.cs index 7e8eae2f23..59a495751e 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/MenuItemProviderMetadata.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/MenuItemProviderMetadata.cs @@ -28,7 +28,6 @@ public MenuItemProviderAttribute(string providerName) public bool AppendsMultipleItems { get; set; } } - /// /// Represents menu item provider registration metadata. /// diff --git a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs index a80b0957b2..9f51946581 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs @@ -4,10 +4,10 @@ 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 Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using WebOptimizer; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using SmartStore.Core; using SmartStore.Core.Domain.Seo; @@ -173,7 +173,6 @@ public virtual string GenerateTitle(bool addDefaultTitle) return result; } - public void AddMetaDescriptionParts(IEnumerable parts, bool append = false) { AddPartsCore(ref _metaDescriptionParts, parts, append); @@ -195,7 +194,6 @@ public virtual string GenerateMetaDescription() return result; } - public void AddMetaKeywordParts(IEnumerable parts, bool append = false) { AddPartsCore(ref _metaKeywordParts, parts, append); @@ -362,7 +360,6 @@ private string TryFindMinFile(string path) }); } - public void AddCssFileParts(ResourceLocation location, IEnumerable parts, bool excludeFromBundling = false, bool append = false) { if (_cssParts == null) diff --git a/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs index e30149e103..cd8eb4f782 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/WidgetProvider.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using System.Web; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json.Linq; using SmartStore.Collections; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/WidgetRouteInfo.cs b/src/Presentation/SmartStore.Web.Framework/UI/WidgetRouteInfo.cs index d498c81591..f94069051c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/WidgetRouteInfo.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/WidgetRouteInfo.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/Validators/FluentValidatorExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Validators/FluentValidatorExtensions.cs index bb2c15a176..13c1de9f74 100644 --- a/src/Presentation/SmartStore.Web.Framework/Validators/FluentValidatorExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Validators/FluentValidatorExtensions.cs @@ -74,7 +74,6 @@ public static IRuleBuilderOptions Password( } } - public class CreditCardCvvNumberValidator : RegularExpressionValidator { public CreditCardCvvNumberValidator() diff --git a/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs b/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs index 48af92da70..d968b16e57 100644 --- a/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs +++ b/src/Presentation/SmartStore.Web.Framework/Validators/SmartBaseValidator.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; namespace SmartStore.Web.Framework.Validators diff --git a/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs b/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs index 358471ec92..a7a25ff100 100644 --- a/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs +++ b/src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs @@ -1,5 +1,5 @@ using System.Globalization; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using FluentValidation.Resources; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs index 3490bf69bf..58201fd5b6 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingControllingData.cs @@ -1,5 +1,5 @@ using System.Web; -using System.Web.Caching; +using Microsoft.Extensions.Caching.Memory; using SmartStore.Core.Infrastructure; using SmartStore.Core.Plugins; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs index 7aeba68fa7..1faada00b2 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Caching/WebApiCachingUserData.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using System.Web; -using System.Web.Caching; +using Microsoft.Extensions.Caching.Memory; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs index d6e0f936fc..43be2a4ef0 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData.Builder; using System.Web.OData.Routing.Conventions; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs index ddcae71dde..c4c519e376 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.WebApi { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs index fd97e3a26b..06a7cefebc 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Reflection; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.WebApi { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs index a9f9652cb2..6901c60054 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using System.Linq.Expressions; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using System.Web.OData.Formatter; using Autofac; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs index bd5da2861d..154a675d5a 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Net.Http; -using System.Web.Http; -using System.Web.Http.Filters; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; using System.Web.OData; using SmartStore.Web.Framework.WebApi.Caching; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs index 761652fef7..c709a800be 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/HmacAuthentication.cs @@ -152,7 +152,6 @@ public bool ParseTimestamp(string timestamp, out DateTime time) } } - public enum HmacResult : int { Success = 0, diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs index 2194436571..40526e0a56 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs @@ -5,7 +5,7 @@ using System.Net.Http.Headers; using System.Security; using System.Web; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.Controllers; using System.Web.Http.Dependencies; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs index 0f279f2350..8ec46edf95 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiCore.cs @@ -55,7 +55,6 @@ public static class QueryOption } } - public class WebApiRequestContext { public string PublicKey { get; set; } diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 8fe2772ae6..129a7f7836 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -1,6 +1,6 @@ using System; using System.Net.Http.Formatting; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.Cors; using System.Web.OData.Builder; using System.Web.OData.Extensions; diff --git a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs index 6aa41a3a49..34fdeb66e5 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebWorkContext.cs @@ -535,7 +535,6 @@ public TaxDisplayType GetTaxDisplayTypeFor(Customer customer, int storeId) return _cachedTaxDisplayType.Value; } - public bool IsAdmin { get 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..1720cc940e 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; @@ -206,7 +206,6 @@ public ActionResult Create(AffiliateModel model, bool continueEditing) return View(model); } - [Permission(Permissions.Promotion.Affiliate.Read)] public ActionResult Edit(int id) { 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..b96c893eb8 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs @@ -12,8 +12,8 @@ using System.Text; using System.Threading.Tasks; using System.Web; -using System.Web.Hosting; -using System.Web.Mvc; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Admin.Models.Common; using SmartStore.ComponentModel; @@ -447,7 +447,6 @@ private IDictionary GetMemoryCacheStats() stats.Add("AspNetCache:" + key.Replace(':', '_'), size + Encoding.Default.GetByteCount(key)); } - // Memory cache if (!cache.IsDistributedCache) { @@ -649,7 +648,6 @@ public ActionResult Warnings() }); } - // Base measure weight // ==================================== var bWeight = _measureService.Value.GetMeasureWeightById(_measureSettings.Value.BaseWeightId); @@ -679,7 +677,6 @@ public ActionResult Warnings() }); } - // Base dimension weight // ==================================== var bDimension = _measureService.Value.GetMeasureDimensionById(_measureSettings.Value.BaseDimensionId); @@ -924,7 +921,6 @@ public ActionResult MaintenanceDeleteFiles(MaintenanceModel model) DateTime? endDateValue = (model.DeleteExportedFiles.EndDate == null) ? null : (DateTime?)_dateTimeHelper.Value.ConvertToUtcTime(model.DeleteExportedFiles.EndDate.Value, _dateTimeHelper.Value.CurrentTimeZone).AddDays(1); - model.DeleteExportedFiles.NumberOfDeletedFiles = 0; model.DeleteExportedFiles.NumberOfDeletedFolders = 0; 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..6520893062 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; @@ -452,7 +452,6 @@ private void PrepareProfileModelForEdit(ExportProfileModel model, ExportProfile }) .ToList(); - if (provider != null) { model.Provider.Feature = provider.Metadata.ExportFeatures; @@ -821,8 +820,6 @@ public ActionResult Edit(ExportProfileModel model, bool continueEditing) return (continueEditing ? RedirectToAction("Edit", new { id = profile.Id }) : RedirectToAction("List")); } - - [Permission(Permissions.Configuration.Export.Read)] public ActionResult ResolveFileNamePatternExample(int id, string pattern) { 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..d0f956e51c 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; @@ -1698,7 +1698,6 @@ public ActionResult EditDirectDebitInfo(int id, OrderModel model) return View(model); } - [HttpPost, ActionName("Edit")] [FormValueRequired("btnSaveOrderTotals")] [ValidateAntiForgeryToken] 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..6104ae3210 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; @@ -1316,7 +1316,6 @@ protected void InsertProductDownload(int? fileId, int entityId, string fileVersi return null; } - [NonAction] protected void MapModelToProduct(ProductModel model, Product product, FormCollection form, out bool nameChanged) { 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..58787161cf 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading.Tasks; using System.Web; -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/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..7b6de6b741 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; @@ -372,7 +372,6 @@ private void DownloadDir(string path) throw new DirectoryNotFoundException($"Directory '{path}' does not exist."); } - var files = GetFiles(path, null).DistinctBy(x => x.Name).ToList(); // Create zip file 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..263e8a106c 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; @@ -305,7 +305,6 @@ public ActionResult Forum(ForumSettings forumSettings, ForumSettingsModel model, return NotifyAndRedirect("Forum"); } - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting] public ActionResult News(NewsSettings newsSettings, int storeId) @@ -596,7 +595,6 @@ public ActionResult Tax(TaxSettingsModel model, FormCollection form) return NotifyAndRedirect("Tax"); } - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting] public ActionResult Catalog(CatalogSettings catalogSettings) @@ -641,7 +639,6 @@ public ActionResult Catalog(CatalogSettings catalogSettings, CatalogSettingsMode return NotifyAndRedirect("Catalog"); } - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting] public ActionResult RewardPoints(RewardPointsSettings rewardPointsSettings, int storeScope) @@ -688,7 +685,6 @@ public ActionResult RewardPoints(RewardPointsSettingsModel model, FormCollection return NotifyAndRedirect("RewardPoints"); } - [Permission(Permissions.Configuration.Setting.Read)] public ActionResult Order() { @@ -786,7 +782,6 @@ public ActionResult Order(OrderSettingsModel model, FormCollection form) return NotifyAndRedirect("Order"); } - [Permission(Permissions.Configuration.Setting.Read)] public ActionResult ShoppingCart() { @@ -838,7 +833,6 @@ public ActionResult ShoppingCart(ShoppingCartSettingsModel model, FormCollection return NotifyAndRedirect("ShoppingCart"); } - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting] public ActionResult Payment(PaymentSettings settings) @@ -866,7 +860,6 @@ public ActionResult Payment(PaymentSettings settings, PaymentSettingsModel model return NotifyAndRedirect("Payment"); } - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting] public ActionResult Media(MediaSettings mediaSettings) @@ -944,7 +937,6 @@ public ActionResult ChangeMediaStorage(string targetProvider) return RedirectToAction("Media"); } - [Permission(Permissions.Configuration.Setting.Read)] public ActionResult CustomerUser() { @@ -1032,7 +1024,6 @@ public ActionResult CustomerUser(CustomerUserSettingsModel model, FormCollection return NotifyAndRedirect("CustomerUser"); } - #region CookieInfos [HttpPost, GridAction(EnableCustomBinding = true)] @@ -1240,7 +1231,6 @@ public ActionResult CookieInfoEditPopup(string btnId, string formId, CookieInfoM #endregion - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting(IsRootedModel = true)] public ActionResult GeneralCommon(int storeScope, @@ -1598,7 +1588,6 @@ public ActionResult TestSeoNameCreation(GeneralCommonSettingsModel model) return Content(result); } - [Permission(Permissions.Configuration.Setting.Read)] [LoadSetting] public ActionResult DataExchange(DataExchangeSettings settings) @@ -1625,7 +1614,6 @@ public ActionResult DataExchange(DataExchangeSettings settings, DataExchangeSett return NotifyAndRedirect("DataExchange"); } - [Permission(Permissions.Configuration.Setting.Read)] public ActionResult Search() { @@ -1908,7 +1896,6 @@ public ActionResult Search(SearchSettingsModel model, FormCollection form) return NotifyAndRedirect("Search"); } - [Permission(Permissions.Configuration.Setting.Read)] public ActionResult AllSettings() { diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs index 564c6d0652..cc6006af72 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Shipping; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs index 6f9549f5ae..a6b695822e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.ShoppingCart; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs index 7f8be3c231..b32c6bfa8a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Catalog; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs index 87034f5e4a..935a0e9136 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Store; using SmartStore.Admin.Models.Stores; using SmartStore.Core.Domain.Stores; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs index aeb2b63e16..686a2e7644 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Tax; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs index c6dc7e2442..8d69364045 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Hosting; -using System.Web.Mvc; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Themes; using SmartStore.Collections; using SmartStore.Core.Domain.Themes; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs index 43fb8f9300..53914acd50 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Topics; using SmartStore.Core; using SmartStore.Core.Domain.Cms; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs index d3d10c2397..1779b1dfad 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.UrlRecord; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Seo; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs index 30c75e3fcf..d1af476ed9 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Cms; using SmartStore.Core.Domain.Cms; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs index a1774b5340..84be87178f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; using SmartStore.Admin.Models.Plugins; using SmartStore.Web.Framework.Plugins; diff --git a/src/Presentation/SmartStore.Web/Administration/Infrastructure/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..3c81ef6d1b 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Routing; namespace SmartStore.Admin.Infrastructure diff --git a/src/Presentation/SmartStore.Web/Administration/Infrastructure/SettingsMenu.cs b/src/Presentation/SmartStore.Web/Administration/Infrastructure/SettingsMenu.cs index 62a6d3c540..c3157d45c0 100644 --- a/src/Presentation/SmartStore.Web/Administration/Infrastructure/SettingsMenu.cs +++ b/src/Presentation/SmartStore.Web/Administration/Infrastructure/SettingsMenu.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core.Localization; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/MappingExtensions.cs b/src/Presentation/SmartStore.Web/Administration/MappingExtensions.cs index 99b46a65ea..dfdf24c566 100644 --- a/src/Presentation/SmartStore.Web/Administration/MappingExtensions.cs +++ b/src/Presentation/SmartStore.Web/Administration/MappingExtensions.cs @@ -823,7 +823,6 @@ public static TaxSettings ToEntity(this TaxSettingsModel model, TaxSettings enti return entity; } - public static ShippingSettingsModel ToModel(this ShippingSettings entity) { return MapperFactory.Map(entity); @@ -838,7 +837,6 @@ public static ShippingSettings ToEntity(this ShippingSettingsModel model, Shippi return entity; } - public static ForumSettingsModel ToModel(this ForumSettings entity) { return MapperFactory.Map(entity); @@ -853,7 +851,6 @@ public static ForumSettings ToEntity(this ForumSettingsModel model, ForumSetting return entity; } - public static BlogSettingsModel ToModel(this BlogSettings entity) { return MapperFactory.Map(entity); @@ -868,7 +865,6 @@ public static BlogSettings ToEntity(this BlogSettingsModel model, BlogSettings e return entity; } - public static NewsSettingsModel ToModel(this NewsSettings entity) { return MapperFactory.Map(entity); @@ -883,7 +879,6 @@ public static NewsSettings ToEntity(this NewsSettingsModel model, NewsSettings e return entity; } - public static CatalogSettingsModel ToModel(this CatalogSettings entity) { return MapperFactory.Map(entity); @@ -898,7 +893,6 @@ public static CatalogSettings ToEntity(this CatalogSettingsModel model, CatalogS return entity; } - public static RewardPointsSettingsModel ToModel(this RewardPointsSettings entity) { return MapperFactory.Map(entity); @@ -913,7 +907,6 @@ public static RewardPointsSettings ToEntity(this RewardPointsSettingsModel model return entity; } - public static OrderSettingsModel ToModel(this OrderSettings entity) { return MapperFactory.Map(entity); @@ -928,7 +921,6 @@ public static OrderSettings ToEntity(this OrderSettingsModel model, OrderSetting return entity; } - public static ShoppingCartSettingsModel ToModel(this ShoppingCartSettings entity) { return MapperFactory.Map(entity); @@ -943,7 +935,6 @@ public static ShoppingCartSettings ToEntity(this ShoppingCartSettingsModel model return entity; } - public static MediaSettingsModel ToModel(this MediaSettings entity) { return MapperFactory.Map(entity); @@ -1016,7 +1007,6 @@ public static ThemeSettings ToEntity(this ThemeListModel model, ThemeSettings en #endregion - #region Plugins public static PluginModel ToModel(this PluginDescriptor entity) @@ -1026,7 +1016,6 @@ public static PluginModel ToModel(this PluginDescriptor entity) #endregion - #region Stores public static StoreModel ToModel(this Store entity) diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs index 05ea69c98b..840a9b4161 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,7 @@ 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 +20,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..4a75e61133 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,19 @@ 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 +77,15 @@ 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,35 +117,34 @@ 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; } } - public partial class BlogPostValidator : AbstractValidator { public BlogPostValidator() diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs index dda855bc60..38dc8cfbf1 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,7 @@ 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..c39ba004d6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -7,14 +7,14 @@ 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..cfa74a3b06 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,7 @@ 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..80861e793c 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,18 +29,18 @@ 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")] @@ -48,7 +48,7 @@ public CategoryModel() 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 +59,24 @@ 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 +196,38 @@ 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..174aefe47a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -18,7 +18,7 @@ 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..83ed493c8f 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,7 @@ 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..2a5e9f32e8 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,36 @@ 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 +151,31 @@ 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..802dae9ce4 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; @@ -21,11 +21,11 @@ public ProductAttributeModel() 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")] @@ -54,11 +54,11 @@ public class ProductAttributeLocalizedModel : ILocalizedModelLocal 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..93c6ebf693 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; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs index 9dacced0bb..4f09a04669 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeOptionsSetModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Admin.Models.Catalog @@ -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..26792816ff 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; @@ -59,7 +59,6 @@ public ProductBundleItemModel() public DateTime UpdatedOn { get; set; } } - public class ProductBundleItemLocalizedModel : ILocalizedModelLocal { public int LanguageId { get; set; } @@ -71,7 +70,6 @@ public class ProductBundleItemLocalizedModel : ILocalizedModelLocal public string ShortDescription { get; set; } } - public class ProductBundleItemAttributeModel : EntityModelBase { public ProductBundleItemAttributeModel() diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs index a53a7f199c..b841aff2da 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,7 @@ 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 +48,7 @@ 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..f297a7e150 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,24 @@ 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 +91,19 @@ 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 +114,15 @@ 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 +193,9 @@ 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")] @@ -612,7 +611,6 @@ public class TierPriceModel : EntityModelBase [UIHint("TierPriceCustomer")] public string CustomerRole { get; set; } - public int StoreId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.TierPrices.Fields.Store")] [UIHint("TierPriceStore")] @@ -643,11 +641,11 @@ 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")] @@ -697,7 +695,7 @@ public ProductVariantAttributeValueModel() 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; } @@ -754,7 +752,7 @@ 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 +764,31 @@ 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..015c884940 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,7 @@ public ProductSpecificationAttributeModel() } [SmartResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttribute")] - [AllowHtml] + public string SpecificationAttributeName { get; set; } public int SpecificationAttributeId { get; set; } @@ -23,7 +23,6 @@ public ProductSpecificationAttributeModel() public List SpecificationAttributeOptions { get; set; } - [SmartResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttributeOption")] public string SpecificationAttributeOptionName { 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..c35fb4a691 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,7 @@ public ProductTagModel() } [SmartResourceDisplayName("Admin.Catalog.ProductTags.Fields.Name")] - [AllowHtml] + public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.ProductTags.Published")] @@ -34,7 +34,7 @@ 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..625f25e5c4 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,13 @@ 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..6e1a0fdb9f 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,7 +20,7 @@ public SpecificationAttributeModel() } [SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Name")] - [AllowHtml] + public string Name { get; set; } [AllowHtml, SmartResourceDisplayName("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Alias")] @@ -52,7 +52,7 @@ 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")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeOptionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeOptionModel.cs index 2391475a43..fc6abc1364 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,7 +22,7 @@ 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; } @@ -54,7 +54,7 @@ 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")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs index 532bdc9705..2570d7f817 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,61 @@ 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..d935f9cce9 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -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..99156d8a83 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,35 @@ 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; } + 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..4c239cd136 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,15 @@ 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 +52,10 @@ 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 +66,32 @@ 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 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 +106,16 @@ 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 +129,7 @@ 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 +137,7 @@ public CustomerModel() public IList AvailableTimeZones { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.VatNumber")] - [AllowHtml] + public string VatNumber { get; set; } public string VatNumberStatusNote { get; set; } @@ -153,7 +152,6 @@ public CustomerModel() [SmartResourceDisplayName("Admin.Customers.Customers.Fields.IPAddress")] public string LastIpAddress { get; set; } - [SmartResourceDisplayName("Admin.Customers.Customers.Fields.LastVisitedPage")] public string LastVisitedPage { get; set; } @@ -172,7 +170,7 @@ 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 +207,7 @@ 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 +216,11 @@ 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..d9d362671f 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,11 @@ 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")] @@ -65,7 +65,6 @@ public CustomerRoleModel() public bool UsernamesEnabled { get; set; } } - public partial class CustomerRoleValidator : AbstractValidator { public CustomerRoleValidator(Localizer T) diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/RegisteredCustomersDashboardReportModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/RegisteredCustomersDashboardReportModel.cs index 8c24669114..c78a70bb79 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/RegisteredCustomersDashboardReportModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/RegisteredCustomersDashboardReportModel.cs @@ -5,6 +5,5 @@ namespace SmartStore.Admin.Models.Customers public class RegisteredCustomersDashboardReportModel : ModelBase { - } } \ No newline at end of file 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..123056a6b3 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Admin.Models.Tasks; @@ -122,7 +122,7 @@ 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..de5b9e18ec 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,7 @@ 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..08240cb4a8 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,7 @@ public CountryModel() } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.Name")] - [AllowHtml] + public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.AllowsBilling")] @@ -30,11 +30,11 @@ 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 +79,7 @@ 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..9da79f43c9 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,22 @@ 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 +110,7 @@ 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..874c7644dc 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,16 @@ 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 +51,7 @@ 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..aeaa023ed3 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,11 @@ 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")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs index 3dbf5741fc..b99c0336ab 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,11 @@ 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")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs index 7f7bfbfaf2..1cda5bd9c0 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,7 @@ 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..628f6252c9 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,11 @@ 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 +40,7 @@ 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..9a4767d0a0 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,7 @@ 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 +67,7 @@ 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")] @@ -76,7 +76,6 @@ public string FormattedDiscountPercentage [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.LimitationTimes")] public int LimitationTimes { get; set; } - [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.AppliedToCategories")] public IList AppliedToCategories { get; set; } @@ -86,7 +85,6 @@ public string FormattedDiscountPercentage [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.AppliedToProducts")] public IList AppliedToProducts { get; set; } - [UIHint("RuleSets")] [AdditionalMetadata("multiple", true)] [AdditionalMetadata("scope", RuleScope.Cart)] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs index d78f9cd994..942af3ee74 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,15 @@ 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 +67,15 @@ 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..62a74568cf 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,15 @@ 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 +52,15 @@ 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/AvailableLanguageModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Localization/AvailableLanguageModel.cs index ce6349ebeb..44df056dba 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Localization/AvailableLanguageModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Localization/AvailableLanguageModel.cs @@ -28,7 +28,6 @@ public class AvailableLanguageModel : LanguageModel public decimal? TranslatedPercentageAtLastImport { get; set; } } - public class LanguageDownloadState { public int Id { 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..898be6fec2 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,21 @@ 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..cfe3ea3af7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -10,15 +10,15 @@ 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..1e96d8523b 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,7 @@ 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..6b32469101 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,7 @@ 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..95fbdb717d 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,15 @@ 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 +30,11 @@ 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..3d19448938 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Collections; @@ -91,7 +91,6 @@ public class MenuItemRecordModel : TabbableModel, IIcon, ILocalizedModel Locales { get; set; } } - public class MenuItemRecordLocalizedModel : ILocalizedModelLocal { public int LanguageId { get; set; } @@ -103,7 +102,6 @@ public class MenuItemRecordLocalizedModel : ILocalizedModelLocal public string ShortDescription { get; set; } } - public partial class MenuItemRecordValidator : AbstractValidator { public MenuItemRecordValidator(Localizer T) 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..4aeb4a89cd 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; @@ -61,7 +61,6 @@ public class MenuRecordModel : TabbableModel, ILocalizedModel ItemTree { get; set; } } - public class MenuRecordLocalizedModel : ILocalizedModelLocal { public int LanguageId { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs index 01be797a68..34bcb5a052 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,15 @@ 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 +32,7 @@ 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..be708110de 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,26 @@ 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; } @@ -43,9 +43,8 @@ public class EmailAccountModel : EntityModelBase [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.IsDefaultEmailAccount")] public bool IsDefaultEmailAccount { get; set; } - [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..9a625d9ef6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Script.Serialization; using FluentValidation; using FluentValidation.Attributes; @@ -26,15 +26,15 @@ 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 +42,15 @@ 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 +92,23 @@ 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..f48e568695 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,7 @@ 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..795bd52e07 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,11 @@ 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..51ef2bff3e 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,27 @@ 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 +61,7 @@ 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..8f8bec1471 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,7 @@ 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 +21,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..db02e6a1bc 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,19 @@ 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 +55,15 @@ 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,35 +101,34 @@ 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; } } - public partial class NewsItemValidator : AbstractValidator { public NewsItemValidator() 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..be0309a1f4 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,11 @@ 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 +45,7 @@ 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 +67,11 @@ 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..a60d0beec4 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,7 @@ 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; } @@ -55,7 +55,7 @@ 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..ea4e1d03f0 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,7 @@ 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..ab46111aa0 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,27 @@ 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..822a9e5b37 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,7 @@ 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 +46,15 @@ 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..f355d902d1 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,51 @@ 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 @@ -337,17 +337,15 @@ public string ShippingStatusLabelClass //checkout attributes public string CheckoutAttributeInfo { get; set; } - //order notes [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; } - //refund info [SmartResourceDisplayName("Admin.Orders.Fields.PartialRefund.AmountToRefund")] public decimal AmountToRefund { get; set; } @@ -525,7 +523,7 @@ 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 +543,11 @@ 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; } @@ -639,25 +637,24 @@ public class ProductVariantAttributeValueModel : EntityModelBase public bool IsPreSelected { get; set; } } - 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/OrdersIncompleteDashboardReportModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrdersIncompleteDashboardReportModel.cs index f89b5d96c5..261241ae4c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrdersIncompleteDashboardReportModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrdersIncompleteDashboardReportModel.cs @@ -18,7 +18,6 @@ public OrdersIncompleteDashboardReportModel() }; } - public List Data { get; set; } public decimal Amount { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/RecurringPaymentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/RecurringPaymentModel.cs index 552a712db8..844d134697 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/RecurringPaymentModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/RecurringPaymentModel.cs @@ -49,12 +49,10 @@ public RecurringPaymentModel() public bool CanCancelRecurringPayment { get; set; } - public IList History { get; set; } #region Nested classes - public class RecurringPaymentHistoryModel : EntityModelBase { [SmartResourceDisplayName("Admin.RecurringPayments.History.Order")] 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..523bce056f 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,7 @@ 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..5edbee9596 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,11 @@ 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")] @@ -51,7 +51,6 @@ public PaymentMethodEditModel() public int[] SelectedRuleSetIds { get; set; } } - public class PaymentMethodLocalizedModel : ILocalizedModelLocal { public int LanguageId { get; set; } @@ -60,11 +59,11 @@ 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..70d4793d2b 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,27 @@ 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")] @@ -65,17 +65,16 @@ public PluginModel() public int[] SelectedStoreIds { get; set; } } - 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..923963ef84 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -12,7 +12,7 @@ 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..fea207c6ee 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,15 @@ 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/Rules/RuleSetModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Rules/RuleSetModel.cs index d824efb33d..c056abae5c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Rules/RuleSetModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Rules/RuleSetModel.cs @@ -55,7 +55,6 @@ public class AssignedToEntityModel : EntityModelBase } } - public class RuleSetPreviewModel : RuleSetModel { public int GridPageSize { get; set; } @@ -64,7 +63,6 @@ public class RuleSetPreviewModel : RuleSetModel public bool DisplayProductPictures { get; set; } } - public partial class RuleSetValidator : AbstractValidator { public RuleSetValidator() 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..cbc36eede0 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,7 @@ public SeoSettingsModel() } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeparator")] - [AllowHtml] + public string PageTitleSeparator { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeoAdjustment")] @@ -175,11 +175,11 @@ 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 +225,11 @@ 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 +327,7 @@ 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..e719879339 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; @@ -54,7 +54,6 @@ public OrderSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Order.NumberOfDaysReturnRequestAvailable")] public int NumberOfDaysReturnRequestAvailable { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Order.GiftCards_Activated")] public int? GiftCards_Activated_OrderStatusId { get; set; } public IList GiftCards_Activated_OrderStatuses { get; set; } 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..030469b042 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; @@ -103,7 +103,6 @@ public class CommonFacetSettingsLocalizedModel : ILocalizedModelLocal public string Alias { get; set; } } - public class SearchSettingValidator : SmartValidatorBase { public static int MaxInstantSearchItems => 16; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs index 3a3318684a..2b9b79af1e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -10,11 +10,11 @@ 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..0a5ebac718 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; @@ -85,7 +85,6 @@ public ShoppingCartSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.ShoppingCart.ShowCommentBox")] public bool ShowCommentBox { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.ShoppingCart.ShowEsdRevocationWaiverBox")] public bool ShowEsdRevocationWaiverBox { get; set; } @@ -107,7 +106,6 @@ public ShoppingCartSettingsModel() public bool AddProductsToBasketInSinglePositions { get; set; } } - public class ShoppingCartSettingsLocalizedModel : ILocalizedModelLocal { public int LanguageId { get; set; } 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..c0d521f0b0 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; @@ -38,7 +38,6 @@ public TaxSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.HideTaxInOrderSummary")] public bool HideTaxInOrderSummary { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.ShowLegalHintsInProductList")] public bool ShowLegalHintsInProductList { get; set; } @@ -48,14 +47,12 @@ public TaxSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.ShowLegalHintsInFooter")] public bool ShowLegalHintsInFooter { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.TaxBasedOn")] public TaxBasedOn TaxBasedOn { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.DefaultTaxAddress")] public AddressModel DefaultTaxAddress { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.ShippingIsTaxable")] public bool ShippingIsTaxable { get; set; } @@ -66,7 +63,6 @@ public TaxSettingsModel() public int? ShippingTaxClassId { get; set; } public IList ShippingTaxCategories { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.PaymentMethodAdditionalFeeIsTaxable")] public bool PaymentMethodAdditionalFeeIsTaxable { get; set; } @@ -80,7 +76,6 @@ public TaxSettingsModel() [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.AuxiliaryServicesTaxingType")] public AuxiliaryServicesTaxType AuxiliaryServicesTaxingType { get; set; } - [SmartResourceDisplayName("Admin.Configuration.Settings.Tax.EuVatEnabled")] public bool EuVatEnabled { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs index 099202217c..6352dd5f1e 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,11 @@ 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 +58,11 @@ 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..8809a1f4ed 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,25 @@ 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")] @@ -59,7 +59,6 @@ public partial class StoreModel : EntityModelBase [UIHint("Color")] public string MsTileColor { get; set; } - [SmartResourceDisplayName("Common.DisplayOrder")] public int DisplayOrder { get; set; } @@ -67,7 +66,7 @@ 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..0f4ff5f55e 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,7 @@ 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..c50bdfbc2e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -10,7 +10,7 @@ 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..87b4b0421d 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,7 @@ 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 +77,35 @@ 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 +151,31 @@ 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..b9c62bf7fd 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,7 @@ 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..98f425ca3e 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -1,1390 +1,28 @@ - - - + - Debug - AnyCPU - - - 2.0 - {152C761A-DD2E-4C1F-AF89-DFB2547A3BCA} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - SmartStore.Admin + net8.0 SmartStore.Admin - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - - - - - ..\..\..\ - true - true - 1e5b888b - - - - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - false + SmartStore.Admin + latest + disable + disable + 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..572759ca17 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; @@ -425,7 +425,6 @@ public ActionResult HomepageBestSellers(int? productThumbPictureSize) // ACL and store mapping products = products.Where(p => _aclService.Authorize(p) && _storeMappingService.Authorize(p)).ToList(); - var viewMode = _catalogSettings.UseSmallProductBoxOnHomePage ? ProductSummaryViewMode.Mini : ProductSummaryViewMode.Grid; var settings = _helper.GetBestFitProductSummaryMappingSettings(viewMode, x => diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index 2db4cb1ce5..5be02f358b 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs index 2b14817c5a..2a9b386544 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CheckoutController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; @@ -463,7 +463,6 @@ public ActionResult Index() return RedirectToAction("BillingAddress"); } - public ActionResult BillingAddress() { var cart = _workContext.CurrentCustomer.GetCartItems(ShoppingCartType.ShoppingCart, _storeContext.CurrentStore.Id); @@ -517,7 +516,6 @@ public ActionResult NewBillingAddress(CheckoutBillingAddressModel model) return RedirectToAction("ShippingAddress"); } - //If we got this far, something failed, redisplay form model = PrepareBillingAddressModel(model.NewAddress.CountryId); return View(model); @@ -592,7 +590,6 @@ public ActionResult NewShippingAddress(CheckoutShippingAddressModel model) return RedirectToAction("ShippingMethod"); } - //If we got this far, something failed, redisplay form model = PrepareShippingAddressModel(model.NewAddress.CountryId); return View(model); @@ -711,7 +708,6 @@ public ActionResult SelectShippingMethod(string shippingoption) return RedirectToAction("PaymentMethod"); } - public ActionResult PaymentMethod() { var store = _storeContext.CurrentStore; @@ -947,7 +943,6 @@ public ActionResult ConfirmOrder(FormCollection form) return RedirectToAction("Completed"); } - public ActionResult Completed() { //validation 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..1cc557f206 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CustomerController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Domain.Common; @@ -804,7 +804,6 @@ public ActionResult Register(RegisterModel model, string returnUrl, string captc model.AvailableCountries.Add(new SelectListItem() { Text = c.GetLocalized(x => x.Name), Value = c.Id.ToString(), Selected = (c.Id == model.CountryId) }); } - if (_customerSettings.StateProvinceEnabled) { //states @@ -1195,7 +1194,6 @@ public ActionResult AddressAdd(CustomerAddressEditModel model) var customer = _workContext.CurrentCustomer; - if (ModelState.IsValid) { var address = model.Address.ToEntity(); @@ -1211,7 +1209,6 @@ public ActionResult AddressAdd(CustomerAddressEditModel model) return RedirectToAction("Addresses"); } - // If we got this far, something failed, redisplay form model.Address.PrepareModel(null, true, _addressSettings, _localizationService, _stateProvinceService, () => _countryService.GetAllCountries()); @@ -1527,7 +1524,6 @@ public ActionResult ChangePassword(ChangePasswordModel model) } } - //If we got this far, something failed, redisplay form return View(model); } @@ -1663,7 +1659,6 @@ public ActionResult PasswordRecoverySend(PasswordRecoveryModel model) return View(model); } - [RewriteUrl(SslRequirement.Yes)] public ActionResult PasswordRecoveryConfirm(string token, string email) { diff --git a/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs b/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs index e696904d29..2b9693117f 100644 --- a/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Media; @@ -190,7 +190,6 @@ public ActionResult GetLicense(Guid id) return RedirectToAction("DownloadableProducts", "Customer"); } - if (_customerSettings.DownloadableProductsValidateUser) { if (_workContext.CurrentCustomer == null) 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/ErrorController.cs b/src/Presentation/SmartStore.Web/Controllers/ErrorController.cs index b28a409f34..aed47eb6c8 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ErrorController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ErrorController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Controllers; using SmartStore.Web.Infrastructure; 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..586bc262ae 100644 --- a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.SqlClient; using System.Linq; using System.Security.Principal; using System.Threading; using System.Threading.Tasks; -using System.Web.Hosting; -using System.Web.Mvc; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using System.Web.SessionState; using Autofac; using SmartStore.Core; @@ -347,7 +347,6 @@ protected virtual InstallationResult InstallCore(ILifetimeScope scope, InstallMo } } - // Consider granting access rights to the resource to the ASP.NET request identity. // ASP.NET has a base process identity // (typically {MACHINE}\ASPNET on IIS 5 or Network Service on IIS 6 and IIS 7, diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs index 06ae833f85..ba4a8b4808 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using System.Web.SessionState; using SmartStore.Core; using SmartStore.Core.Domain.Media; 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/OrderHelper.cs b/src/Presentation/SmartStore.Web/Controllers/OrderHelper.cs index 386ce5360d..7a3857419d 100644 --- a/src/Presentation/SmartStore.Web/Controllers/OrderHelper.cs +++ b/src/Presentation/SmartStore.Web/Controllers/OrderHelper.cs @@ -297,7 +297,6 @@ public OrderDetailsModel PrepareOrderDetailsModel(Order order) model.ShippingAddress.PrepareModel(order.ShippingAddress, false, addressSettings); model.ShippingMethod = order.ShippingMethod; - // Shipments (only already shipped). var shipments = order.Shipments.Where(x => x.ShippedDateUtc.HasValue).OrderBy(x => x.CreatedOnUtc).ToList(); foreach (var shipment in shipments) @@ -458,7 +457,6 @@ public OrderDetailsModel PrepareOrderDetailsModel(Order order) model.DisplayTaxRates = displayTaxRates; model.DisplayTax = displayTax; - // Discount (applied to order total). var orderDiscountInCustomerCurrency = _currencyService.ConvertCurrency(order.OrderDiscount, order.CurrencyRate); if (orderDiscountInCustomerCurrency > decimal.Zero) 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..3adc05d2a7 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; @@ -636,7 +636,6 @@ public ActionResult UpdateProductDetails(int productId, string itemType, int bun #endregion - #region Product tags [ChildActionOnly] @@ -675,7 +674,6 @@ public ActionResult ProductTags(int productId) #endregion - #region Product reviews [RewriteUrl(SslRequirement.No)] @@ -856,7 +854,6 @@ where prh.WasHelpful #endregion - #region Ask product question public ActionResult AskQuestionAjax(int id, ProductVariantQuery query) 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..3a280cd903 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.Linq; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; @@ -2027,7 +2027,6 @@ public ActionResult OrderTotals(bool isEditable) && model.IsEditable; } - //shipping info model.RequiresShipping = cart.RequiresShipping(); if (model.RequiresShipping) diff --git a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs index 8b820e73ae..47656cdca8 100644 --- a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.SessionState; using SmartStore.Collections; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web/Controllers/ThemeController.cs b/src/Presentation/SmartStore.Web/Controllers/ThemeController.cs index 12f341d3e6..caafd18b0a 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ThemeController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ThemeController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Themes; using SmartStore.Services.Themes; diff --git a/src/Presentation/SmartStore.Web/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Controllers/TopicController.cs index ac5c01c2a9..c82d9e7dbb 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.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Caching; using SmartStore.Core.Domain.Seo; diff --git a/src/Presentation/SmartStore.Web/Controllers/WidgetController.cs b/src/Presentation/SmartStore.Web/Controllers/WidgetController.cs index 4062ad6694..edddf291c7 100644 --- a/src/Presentation/SmartStore.Web/Controllers/WidgetController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/WidgetController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Controllers; using SmartStore.Web.Framework.UI; 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..cad0ec9c37 100644 --- a/src/Presentation/SmartStore.Web/Global.asax.cs +++ b/src/Presentation/SmartStore.Web/Global.asax.cs @@ -2,10 +2,10 @@ 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 Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using WebOptimizer; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using FluentValidation; using FluentValidation.Mvc; diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DefaultBundles.cs b/src/Presentation/SmartStore.Web/Infrastructure/DefaultBundles.cs index 608c47985f..58fa7c4d70 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/DefaultBundles.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/DefaultBundles.cs @@ -1,4 +1,4 @@ -using System.Web.Optimization; +using WebOptimizer; using BundleTransformer.Core.Bundles; using BundleTransformer.Core.Orderers; using SmartStore.Web.Framework.Bundling; diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DefaultFacetTemplateSelector.cs b/src/Presentation/SmartStore.Web/Infrastructure/DefaultFacetTemplateSelector.cs index 2621a37138..3ba7b0b4b4 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/DefaultFacetTemplateSelector.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/DefaultFacetTemplateSelector.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Search.Facets; using SmartStore.Services.Search.Rendering; 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/DeDESeedData.cs b/src/Presentation/SmartStore.Web/Infrastructure/Installation/DeDESeedData.cs index f3a9c91c84..fe3ab04ab7 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Installation/DeDESeedData.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Installation/DeDESeedData.cs @@ -218,7 +218,6 @@ protected override void Alter(Address entity) entity.ZipPostalCode = "12345"; } - protected override string TaxNameBooks => "Ermäßigt"; protected override string TaxNameDigitalGoods => "Normal"; protected override string TaxNameJewelry => "Normal"; @@ -2701,7 +2700,6 @@ protected override void Alter(IList entities) x.ProductVariantAttributeValues.Where(y => y.Alias == "mixed-linen").Each(y => y.Name = "Leinen gemischt"); }); - } protected override void Alter(IList entities) diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs index 6a74443b5f..cb3e5d6f46 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallDataSeeder.cs @@ -391,7 +391,6 @@ private void MoveMedia() protected SmartObjectContext DataContext => _ctx; - protected ISettingService SettingService { get diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs index d2882781e3..a6627f3a5e 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Installation/InstallationLocalizationService.cs @@ -131,7 +131,6 @@ public virtual IList GetAvailableLanguages() var xmlDocument = new XmlDocument(); xmlDocument.Load(filePath); - //get language code var languageCode = ""; //we file name format: installation.{languagecode}.xml 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..17a3138b92 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 Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Routing.Constraints; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Services.Media; using SmartStore.Web.Framework; @@ -66,7 +66,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) #endregion - /* Common ----------------------------------------*/ @@ -138,7 +137,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { customertaxtype = idConstraint }, new[] { "SmartStore.Web.Controllers" }); - /* Catalog ----------------------------------------*/ @@ -200,7 +198,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { productId = idConstraint, shoppingCartTypeId = idConstraint }, new[] { "SmartStore.Web.Controllers" }); - /* Checkout ----------------------------------------*/ @@ -209,7 +206,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { controller = "Checkout", action = "Index" }, new[] { "SmartStore.Web.Controllers" }); - /* Newsletter ----------------------------------------*/ @@ -224,7 +220,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { controller = "Newsletter", action = "Subscribe" }, new[] { "SmartStore.Web.Controllers" }); - /* Customer ----------------------------------------*/ @@ -239,7 +234,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { id = idConstraint }, new[] { "SmartStore.Web.Controllers" }); - /* Blog ----------------------------------------*/ @@ -263,7 +257,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { controller = "Blog", action = "ListRss" }, new[] { "SmartStore.Web.Controllers" }); - /* Boards ----------------------------------------*/ @@ -313,7 +306,6 @@ Route RegisterMediaRoute(string routeName, string actionName, string url) new { controller = "Boards", action = "Search" }, new[] { "SmartStore.Web.Controllers" }); - /* Misc ----------------------------------------*/ diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs index 11e862629d..9e1e9d5462 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/2_DefaultRoutes.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Controllers; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Routing; diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/3_GenericRoutes.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/3_GenericRoutes.cs index ea828c6e22..5924be93e4 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/3_GenericRoutes.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/3_GenericRoutes.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Routing; using SmartStore.Web.Framework.Seo; diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/4_LastRoutes.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/4_LastRoutes.cs index 2ad0c37d6f..164162563b 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/4_LastRoutes.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/4_LastRoutes.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Routing; using SmartStore.Web.Framework.Seo; diff --git a/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs b/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs index 578b78e54b..0e2e29faca 100644 --- a/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs +++ b/src/Presentation/SmartStore.Web/Infrastructure/Routes/MapLegacyRoutesAttribute.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; using SmartStore.Utilities; diff --git a/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs b/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs index e7fbe3f270..aafdb60154 100644 --- a/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Boards/EditForumTopicModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Forums; diff --git a/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs b/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs index 6a5dccb4cc..4c2efd577f 100644 --- a/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Boards/TopicMoveModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Models.Boards diff --git a/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs b/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs index 2a254474fd..12d24716b7 100644 --- a/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs +++ b/src/Presentation/SmartStore.Web/Models/Catalog/IQuantityInput.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Services.Localization; diff --git a/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs b/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs index a3aa09facc..4b7ac00227 100644 --- a/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Catalog/ProductDetailsModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; using SmartStore.Services.Catalog.Modelling; diff --git a/src/Presentation/SmartStore.Web/Models/Checkout/CheckoutPaymentInfoModel.cs b/src/Presentation/SmartStore.Web/Models/Checkout/CheckoutPaymentInfoModel.cs index 2c23a55607..7585bdda8d 100644 --- a/src/Presentation/SmartStore.Web/Models/Checkout/CheckoutPaymentInfoModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Checkout/CheckoutPaymentInfoModel.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Models.Checkout 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..856a489873 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; @@ -52,7 +52,6 @@ public CustomerInfoModel() [SmartResourceDisplayName("Account.Fields.LastName")] public string LastName { get; set; } - public bool DateOfBirthEnabled { get; set; } [SmartResourceDisplayName("Account.Fields.DateOfBirth")] public int? DateOfBirthDay { get; set; } diff --git a/src/Presentation/SmartStore.Web/Models/Customer/ExternalAuthenticationMethodModel.cs b/src/Presentation/SmartStore.Web/Models/Customer/ExternalAuthenticationMethodModel.cs index c9a81bc26b..2ee4aa0a96 100644 --- a/src/Presentation/SmartStore.Web/Models/Customer/ExternalAuthenticationMethodModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Customer/ExternalAuthenticationMethodModel.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Models.Customer diff --git a/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs b/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs index c84c5ac8b9..26c6592b82 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,7 @@ 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..8cb7ad9431 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,17 @@ 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; } @@ -43,7 +42,6 @@ public InstallModel() public bool UseCustomCollation { get; set; } public string Collation { get; set; } - public bool InstallSampleData { get; set; } public List AvailableLanguages { get; set; } diff --git a/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs b/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs index 09b85a691f..7d7563bb88 100644 --- a/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Localization; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs b/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs index 57b8bb8c21..c632c3989c 100644 --- a/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Autofac.Integration.Mvc; using SmartStore.Services.Search; diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs index dd85cd1111..613e0ffa76 100644 --- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs +++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ButtonPaymentMethodModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Web.Models.ShoppingCart diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs index 426407e7c1..00a1e86453 100644 --- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs +++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/EstimateShippingModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs index e3f75bc700..ac51b4e501 100644 --- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs +++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/MiniShoppingCartModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Services.Localization; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs index 7c2b3dc8b9..578cb2e10c 100644 --- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs +++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/ShoppingCartModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; using SmartStore.Services.Catalog.Modelling; diff --git a/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs b/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs index 54a1d3a187..62b570dc08 100644 --- a/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs +++ b/src/Presentation/SmartStore.Web/Models/ShoppingCart/WishlistModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Services.Localization; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index c96f601e5a..3d40018633 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1,2170 +1,36 @@ - - - - - - - - + - Debug - AnyCPU - - - 2.0 - {4F1F649C-1020-45BE-A487-F416D9297FF3} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - SmartStore.Web + net8.0 SmartStore.Web - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - ..\..\ - true - - - - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - latest - false - AnyCPU - AllFilesInProjectFolder - - - pdbonly - true - bin\ - TRACE - prompt - 4 + SmartStore.Web latest - false - AllFilesInProjectFolder - false - false - AnyCPU + disable + disable + false + - - ..\..\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/DefaultDbHookHandlerTests.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs index fa1bfa2978..cd4f24008a 100644 --- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs +++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/DefaultDbHookHandlerTests.cs @@ -129,7 +129,6 @@ public void Can_handle_importance() Assert.IsTrue(processedHooks.All(x => expected.Contains(x.GetType()))); } - #region Utils private static IHookedEntity CreateEntry(EntityState state) where T : BaseEntity, new() diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs index ac1fcd17c4..dda6b60ea5 100644 --- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs +++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using SmartStore.Core.Data; using SmartStore.Core.Data.Hooks; diff --git a/src/Tests/SmartStore.Core.Tests/ExtensionsTests.cs b/src/Tests/SmartStore.Core.Tests/ExtensionsTests.cs index c04322606d..f546d01683 100644 --- a/src/Tests/SmartStore.Core.Tests/ExtensionsTests.cs +++ b/src/Tests/SmartStore.Core.Tests/ExtensionsTests.cs @@ -40,5 +40,3 @@ public void Can_Strip_Html() } } - - diff --git a/src/Tests/SmartStore.Core.Tests/FastPropertyTests.cs b/src/Tests/SmartStore.Core.Tests/FastPropertyTests.cs index 5029757c79..815c636be0 100644 --- a/src/Tests/SmartStore.Core.Tests/FastPropertyTests.cs +++ b/src/Tests/SmartStore.Core.Tests/FastPropertyTests.cs @@ -91,5 +91,3 @@ public TestClass(long param1) } - - diff --git a/src/Tests/SmartStore.Core.Tests/FileSystemStorageProviderTests.cs b/src/Tests/SmartStore.Core.Tests/FileSystemStorageProviderTests.cs index bec86770fd..b5610629de 100644 --- a/src/Tests/SmartStore.Core.Tests/FileSystemStorageProviderTests.cs +++ b/src/Tests/SmartStore.Core.Tests/FileSystemStorageProviderTests.cs @@ -63,7 +63,6 @@ public void ExistingFileIsReturnedWithShortPath() Assert.That(file.Name, Is.EqualTo("testfile.txt")); } - [Test] public void ListFilesReturnsItemsWithShortPathAndEnvironmentSlashes() { @@ -77,7 +76,6 @@ public void ListFilesReturnsItemsWithShortPathAndEnvironmentSlashes() Assert.That(two.Path, Is.EqualTo("Subfolder1" + Path.DirectorySeparatorChar + "two.txt")); } - [Test] public void AnySlashInGetFileBecomesEnvironmentAppropriate() { @@ -152,7 +150,6 @@ public void RenameFolderTakesShortPathWithAnyKindOfSlash() Assert.That(GetFolder(Path.Combine("SubFolder1", "SubSubFolder5")), Is.Not.Null); } - [Test] public void CreateFileAndDeleteFileTakesAnySlash() { @@ -185,5 +182,3 @@ public void RenameFileTakesShortPathWithAnyKindOfSlash() } } - - diff --git a/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs b/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs index 6a560d6b46..84b6677456 100644 --- a/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs +++ b/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs @@ -230,5 +230,3 @@ //} - - diff --git a/src/Tests/SmartStore.Core.Tests/Rules/Filters/FilterTests.cs b/src/Tests/SmartStore.Core.Tests/Rules/Filters/FilterTests.cs index 7c7ee1e3a3..4459b90cc6 100644 --- a/src/Tests/SmartStore.Core.Tests/Rules/Filters/FilterTests.cs +++ b/src/Tests/SmartStore.Core.Tests/Rules/Filters/FilterTests.cs @@ -266,7 +266,6 @@ public void OperatorNotIn() AssertEquality(expectedResult, result); } - [Test] public void SimpleMemberFiltersMatchAnd() { diff --git a/src/Tests/SmartStore.Data.Tests/Catalog/SpecificationAttributePersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Catalog/SpecificationAttributePersistenceTests.cs index 6e2d41ad28..f2fcbffda8 100644 --- a/src/Tests/SmartStore.Data.Tests/Catalog/SpecificationAttributePersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Catalog/SpecificationAttributePersistenceTests.cs @@ -43,7 +43,6 @@ public void Can_save_and_load_specificationAttribute_with_specificationAttribute fromDb.ShouldNotBeNull(); fromDb.Name.ShouldEqual("Name 1"); - fromDb.SpecificationAttributeOptions.ShouldNotBeNull(); (fromDb.SpecificationAttributeOptions.Count == 1).ShouldBeTrue(); fromDb.SpecificationAttributeOptions.First().Name.ShouldEqual("SpecificationAttributeOption name 1"); diff --git a/src/Tests/SmartStore.Data.Tests/Customers/CustomerContentPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Customers/CustomerContentPersistenceTests.cs index 346a9e9b66..c3b5e3d251 100644 --- a/src/Tests/SmartStore.Data.Tests/Customers/CustomerContentPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Customers/CustomerContentPersistenceTests.cs @@ -133,7 +133,6 @@ public void Can_save_productReview_with_helpfulness() fromDb.ShouldNotBeNull(); fromDb.ReviewText.ShouldEqual("A review"); - fromDb.ProductReviewHelpfulnessEntries.ShouldNotBeNull(); (fromDb.ProductReviewHelpfulnessEntries.Count == 1).ShouldBeTrue(); fromDb.ProductReviewHelpfulnessEntries.First().WasHelpful.ShouldEqual(true); diff --git a/src/Tests/SmartStore.Data.Tests/Customers/CustomerPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Customers/CustomerPersistenceTests.cs index bc180bd4d8..5c5ff451c9 100644 --- a/src/Tests/SmartStore.Data.Tests/Customers/CustomerPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Customers/CustomerPersistenceTests.cs @@ -82,7 +82,6 @@ public void Can_save_and_load_customer_with_externalAuthenticationRecord() } ); - var fromDb = SaveAndLoadEntity(customer); fromDb.ShouldNotBeNull(); @@ -195,7 +194,6 @@ public void Can_save_and_load_customer_with_shopping_cart() } ); - var fromDb = SaveAndLoadEntity(customer); fromDb.ShouldNotBeNull(); @@ -229,7 +227,6 @@ public void Can_save_and_load_customer_with_orders() } ); - var fromDb = SaveAndLoadEntity(customer); fromDb.ShouldNotBeNull(); diff --git a/src/Tests/SmartStore.Data.Tests/GlobalSetup.cs b/src/Tests/SmartStore.Data.Tests/GlobalSetup.cs index ffd140bb10..fd6f866fc4 100644 --- a/src/Tests/SmartStore.Data.Tests/GlobalSetup.cs +++ b/src/Tests/SmartStore.Data.Tests/GlobalSetup.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using NUnit.Framework; using SmartStore.Core.Data; diff --git a/src/Tests/SmartStore.Data.Tests/Logging/ActivityLogPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Logging/ActivityLogPersistenceTests.cs index ffb409dc0b..3296a4be12 100644 --- a/src/Tests/SmartStore.Data.Tests/Logging/ActivityLogPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Logging/ActivityLogPersistenceTests.cs @@ -26,7 +26,6 @@ public void Can_save_and_load_activityLogType() fromDb.Enabled.ShouldEqual(true); } - protected Customer GetTestCustomer() { return new Customer diff --git a/src/Tests/SmartStore.Data.Tests/Messages/MessageTemplatePersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Messages/MessageTemplatePersistenceTests.cs index 76d3e79a9b..83b74c93ae 100644 --- a/src/Tests/SmartStore.Data.Tests/Messages/MessageTemplatePersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Messages/MessageTemplatePersistenceTests.cs @@ -22,7 +22,6 @@ public void Can_save_and_load_messageTemplate() LimitedToStores = true }; - var fromDb = SaveAndLoadEntity(mt); fromDb.ShouldNotBeNull(); fromDb.Name.ShouldEqual("Template1"); diff --git a/src/Tests/SmartStore.Data.Tests/Orders/GiftCardPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Orders/GiftCardPersistenceTests.cs index 1379c2739d..ba0c435e2a 100644 --- a/src/Tests/SmartStore.Data.Tests/Orders/GiftCardPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Orders/GiftCardPersistenceTests.cs @@ -75,7 +75,6 @@ public void Can_save_and_load_giftCard_with_usageHistory() var fromDb = SaveAndLoadEntity(giftCard); fromDb.ShouldNotBeNull(); - fromDb.GiftCardUsageHistory.ShouldNotBeNull(); (fromDb.GiftCardUsageHistory.Count == 1).ShouldBeTrue(); fromDb.GiftCardUsageHistory.First().UsedValue.ShouldEqual(1.1M); @@ -94,7 +93,6 @@ public void Can_save_and_load_giftCard_with_associatedOrderItem() var fromDb = SaveAndLoadEntity(giftCard); fromDb.ShouldNotBeNull(); - fromDb.PurchasedWithOrderItem.ShouldNotBeNull(); fromDb.PurchasedWithOrderItem.Product.ShouldNotBeNull(); fromDb.PurchasedWithOrderItem.Product.Name.ShouldEqual("Product name 1"); diff --git a/src/Tests/SmartStore.Data.Tests/Orders/GiftCardUsageHistoryPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Orders/GiftCardUsageHistoryPersistenceTests.cs index 75628e74ce..215b5bcc15 100644 --- a/src/Tests/SmartStore.Data.Tests/Orders/GiftCardUsageHistoryPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Orders/GiftCardUsageHistoryPersistenceTests.cs @@ -31,7 +31,6 @@ public void Can_save_and_load_giftCardUsageHistory() fromDb.UsedWithOrder.ShouldNotBeNull(); } - protected Customer GetTestCustomer() { return new Customer diff --git a/src/Tests/SmartStore.Data.Tests/Polls/PollPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Polls/PollPersistenceTests.cs index e53d4ceafb..a4c7b3c028 100644 --- a/src/Tests/SmartStore.Data.Tests/Polls/PollPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Polls/PollPersistenceTests.cs @@ -74,7 +74,6 @@ public void Can_save_and_load_poll_with_answers() var fromDb = SaveAndLoadEntity(poll); fromDb.ShouldNotBeNull(); - fromDb.PollAnswers.ShouldNotBeNull(); (fromDb.PollAnswers.Count == 1).ShouldBeTrue(); fromDb.PollAnswers.First().Name.ShouldEqual("Answer 1"); @@ -123,7 +122,6 @@ public void Can_save_and_load_poll_with_answer_and_votingrecord() var fromDb = SaveAndLoadEntity(poll); fromDb.ShouldNotBeNull(); - fromDb.PollAnswers.ShouldNotBeNull(); (fromDb.PollAnswers.Count == 1).ShouldBeTrue(); 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/Setup/MigrateBuilderTests.cs b/src/Tests/SmartStore.Data.Tests/Setup/MigrateBuilderTests.cs index 8819bcc033..e88691558c 100644 --- a/src/Tests/SmartStore.Data.Tests/Setup/MigrateBuilderTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Setup/MigrateBuilderTests.cs @@ -134,8 +134,6 @@ private IEnumerable GetDefaultResourceEntries() return builder.Build(); } - - [Test] public void Can_add_setting_entries() { diff --git a/src/Tests/SmartStore.Data.Tests/Shipping/ShipmentPersistenceTests.cs b/src/Tests/SmartStore.Data.Tests/Shipping/ShipmentPersistenceTests.cs index 7338962b9d..d58685c0c0 100644 --- a/src/Tests/SmartStore.Data.Tests/Shipping/ShipmentPersistenceTests.cs +++ b/src/Tests/SmartStore.Data.Tests/Shipping/ShipmentPersistenceTests.cs @@ -55,13 +55,11 @@ public void Can_save_and_load_shipment_with_items() var fromDb = SaveAndLoadEntity(shipment); fromDb.ShouldNotBeNull(); - fromDb.ShipmentItems.ShouldNotBeNull(); (fromDb.ShipmentItems.Count == 1).ShouldBeTrue(); fromDb.ShipmentItems.First().Quantity.ShouldEqual(2); } - protected Customer GetTestCustomer() { return new Customer diff --git a/src/Tests/SmartStore.Data.Tests/TestDbConfiguration.cs b/src/Tests/SmartStore.Data.Tests/TestDbConfiguration.cs index 03ade15aa8..ebf514930f 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; +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..0150860ce8 100644 --- a/src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Catalog/PriceCalculationServiceTests.cs @@ -211,7 +211,6 @@ public void Can_get_final_product_price_with_tier_prices_by_customerRole() }); product.HasTierPrices = true; - var customer = new Customer(); customer.CustomerRoleMappings.Add(new CustomerRoleMapping { @@ -399,7 +398,6 @@ public void Can_get_product_discount() //discount is not valid _discountService.Expect(ds => ds.IsDiscountValid(discount3, customer)).Return(false); - Discount appliedDiscount; _priceCalcService.GetDiscountAmount(product, customer, 0, 1, out appliedDiscount).ShouldEqual(4); appliedDiscount.ShouldNotBeNull(); diff --git a/src/Tests/SmartStore.Services.Tests/Catalog/ProductAttributeParserAndFormatterTests.cs b/src/Tests/SmartStore.Services.Tests/Catalog/ProductAttributeParserAndFormatterTests.cs index a6c2d5a681..0a03030039 100644 --- a/src/Tests/SmartStore.Services.Tests/Catalog/ProductAttributeParserAndFormatterTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Catalog/ProductAttributeParserAndFormatterTests.cs @@ -145,7 +145,6 @@ public class ProductAttributeParserTests : ServiceTest ProductAttributeId = pa3.Id }; - #endregion _productAttributeRepo = MockRepository.GenerateMock>(); diff --git a/src/Tests/SmartStore.Services.Tests/DataExchange/CsvWriterTests.cs b/src/Tests/SmartStore.Services.Tests/DataExchange/CsvWriterTests.cs index 33c5f9267c..68d26221ff 100644 --- a/src/Tests/SmartStore.Services.Tests/DataExchange/CsvWriterTests.cs +++ b/src/Tests/SmartStore.Services.Tests/DataExchange/CsvWriterTests.cs @@ -147,5 +147,3 @@ public void CanEscapeQuotes() } - - diff --git a/src/Tests/SmartStore.Services.Tests/DataExchange/DataReaderTests.cs b/src/Tests/SmartStore.Services.Tests/DataExchange/DataReaderTests.cs index 473375857f..8b606d71db 100644 --- a/src/Tests/SmartStore.Services.Tests/DataExchange/DataReaderTests.cs +++ b/src/Tests/SmartStore.Services.Tests/DataExchange/DataReaderTests.cs @@ -102,5 +102,3 @@ private void VerifyDataTable(IDataTable table) } - - diff --git a/src/Tests/SmartStore.Services.Tests/Directory/MeasureServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Directory/MeasureServiceTests.cs index 0fa0643e60..4c0580c5f2 100644 --- a/src/Tests/SmartStore.Services.Tests/Directory/MeasureServiceTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Directory/MeasureServiceTests.cs @@ -58,8 +58,6 @@ public class MeasureServiceTests : ServiceTest DisplayOrder = 4, }; - - measureWeight1 = new MeasureWeight() { Id = 1, @@ -107,7 +105,6 @@ public class MeasureServiceTests : ServiceTest _measureWeightRepository.Expect(x => x.GetById(measureWeight3.Id)).Return(measureWeight3); _measureWeightRepository.Expect(x => x.GetById(measureWeight4.Id)).Return(measureWeight4); - _measureSettings = new MeasureSettings(); _measureSettings.BaseDimensionId = measureDimension1.Id; //inch(es) _measureSettings.BaseWeightId = measureWeight2.Id; //lb(s) diff --git a/src/Tests/SmartStore.Services.Tests/Orders/CheckoutAttributeParserAndFormatterTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/CheckoutAttributeParserAndFormatterTests.cs index adb5262b35..942134ac27 100644 --- a/src/Tests/SmartStore.Services.Tests/Orders/CheckoutAttributeParserAndFormatterTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Orders/CheckoutAttributeParserAndFormatterTests.cs @@ -108,7 +108,6 @@ public class CheckoutAttributeParserAndFormatterTests : ServiceTest DisplayOrder = 3, }; - #endregion _checkoutAttributeRepo = MockRepository.GenerateMock>(); @@ -139,8 +138,6 @@ public class CheckoutAttributeParserAndFormatterTests : ServiceTest _checkoutAttributeParser = new CheckoutAttributeParser(_checkoutAttributeService); - - //var workingLanguage = new Language(); //_workContext = MockRepository.GenerateMock(); //_workContext.Expect(x => x.WorkingLanguage).Return(workingLanguage); @@ -197,7 +194,6 @@ public void Can_add_and_parse_checkoutAttributes() // //custom text // attributes = _checkoutAttributeParser.AddCheckoutAttribute(attributes, ca3, "Some custom text goes here"); - // var customer = new Customer(); // string formattedAttributes = _checkoutAttributeFormatter.FormatAttributes(attributes, customer, "
    ", false, false); // formattedAttributes.ShouldEqual("Color: Green
    Custom option: Option 1
    Custom option: Option 2
    Custom text: Some custom text goes here"); diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs index ac0980ca3f..4146db81c1 100644 --- a/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs @@ -259,7 +259,6 @@ public void Ensure_order_can_only_be_captured_when_orderStatus_is_not_cancelled_ _paymentService.Expect(ps => ps.SupportCapture("paymentMethodSystemName_that_doesn't_support_capture")).Return(false); var order = new Order(); - order.PaymentMethodSystemName = "paymentMethodSystemName_that_supports_capture"; foreach (OrderStatus os in Enum.GetValues(typeof(OrderStatus))) foreach (PaymentStatus ps in Enum.GetValues(typeof(PaymentStatus))) @@ -276,7 +275,6 @@ public void Ensure_order_can_only_be_captured_when_orderStatus_is_not_cancelled_ _orderProcessingService.CanCapture(order).ShouldBeFalse(); } - order.PaymentMethodSystemName = "paymentMethodSystemName_that_doesn't_support_capture"; foreach (OrderStatus os in Enum.GetValues(typeof(OrderStatus))) foreach (PaymentStatus ps in Enum.GetValues(typeof(PaymentStatus))) @@ -332,8 +330,6 @@ public void Ensure_order_can_only_be_refunded_when_paymentstatus_is_paid_and_pay _orderProcessingService.CanRefund(order).ShouldBeFalse(); } - - order.PaymentMethodSystemName = "paymentMethodSystemName_that_doesn't_support_refund"; foreach (OrderStatus os in Enum.GetValues(typeof(OrderStatus))) foreach (PaymentStatus ps in Enum.GetValues(typeof(PaymentStatus))) @@ -428,8 +424,6 @@ public void Ensure_order_can_only_be_voided_when_paymentstatus_is_authorized_and _orderProcessingService.CanVoid(order).ShouldBeFalse(); } - - order.PaymentMethodSystemName = "paymentMethodSystemName_that_doesn't_support_void"; foreach (OrderStatus os in Enum.GetValues(typeof(OrderStatus))) foreach (PaymentStatus ps in Enum.GetValues(typeof(PaymentStatus))) @@ -524,8 +518,6 @@ public void Ensure_order_can_only_be_partially_refunded_when_paymentstatus_is_pa _orderProcessingService.CanPartiallyRefund(order, 10).ShouldBeFalse(); } - - order.PaymentMethodSystemName = "paymentMethodSystemName_that_doesn't_support_partialrefund"; foreach (OrderStatus os in Enum.GetValues(typeof(OrderStatus))) foreach (PaymentStatus ps in Enum.GetValues(typeof(PaymentStatus))) diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs index 9a0e0c5eec..c9d980630c 100644 --- a/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs @@ -441,8 +441,6 @@ public void Can_get_shopping_cart_subTotal_discount_including_tax() taxRates[10].ShouldEqual(8.639); } - - [Test] public void Can_get_shoppingCartItem_additional_shippingCharge() { @@ -714,7 +712,6 @@ public void Can_get_shipping_total_with_fixed_shipping_rate_excluding_tax() Discount appliedDiscount = null; decimal? shipping = null; - shipping = _orderTotalCalcService.GetShoppingCartShippingTotal(cart, false, out taxRate, out appliedDiscount); shipping.ShouldNotBeNull(); //10 - default fixed shipping rate, 42.5 - additional shipping change @@ -951,7 +948,6 @@ public void Can_get_shipping_total_discount_including_tax() _discountService.Expect(ds => ds.IsDiscountValid(discount1, customer)).Return(true); _discountService.Expect(ds => ds.GetAllDiscounts(DiscountType.AssignedToShipping)).Return(new List() { discount1 }); - decimal taxRate = decimal.Zero; Discount appliedDiscount = null; decimal? shipping = null; @@ -1012,7 +1008,6 @@ public void Can_get_tax_total() cart.ForEach(sci => sci.Item.Customer = customer); cart.ForEach(sci => sci.Item.CustomerId = customer.Id); - //_genericAttributeService.Expect(x => x.GetAttributesForEntity(customer.Id, "Customer")) // .Return(new List() // { @@ -1121,8 +1116,6 @@ public void Can_get_tax_total() // cart.ForEach(sci => sci.Customer = customer); // cart.ForEach(sci => sci.CustomerId = customer.Id); - - // _genericAttributeService.Expect(x => x.GetAttributesForEntity(customer.Id, "Customer")) // .Return(new List() // { @@ -1145,7 +1138,6 @@ public void Can_get_tax_total() // int redeemedRewardPoints; // decimal redeemedRewardPointsAmount; - // //shipping is taxable, payment fee is taxable // _taxSettings.ShippingIsTaxable = true; // _taxSettings.PaymentMethodAdditionalFeeIsTaxable = true; @@ -1221,7 +1213,6 @@ public void Can_get_tax_total() // int redeemedRewardPoints; // decimal redeemedRewardPointsAmount; - // //shipping is taxable, payment fee is taxable // _taxSettings.ShippingIsTaxable = true; // _taxSettings.PaymentMethodAdditionalFeeIsTaxable = true; @@ -1275,8 +1266,6 @@ public void Can_get_tax_total() // cart.ForEach(sci => sci.Customer = customer); // cart.ForEach(sci => sci.CustomerId = customer.Id); - - // _genericAttributeService.Expect(x => x.GetAttributesForEntity(customer.Id, "Customer")) // .Return(new List() // { @@ -1299,7 +1288,6 @@ public void Can_get_tax_total() // }); // _paymentService.Expect(ps => ps.GetAdditionalHandlingFee(cart, "test1")).Return(20); - // _discountService.Expect(ds => ds.GetAllDiscounts(DiscountType.AssignedToCategories)).Return(new List()); // decimal discountAmount; @@ -1308,7 +1296,6 @@ public void Can_get_tax_total() // int redeemedRewardPoints; // decimal redeemedRewardPointsAmount; - // //shipping is taxable, payment fee is taxable // _taxSettings.ShippingIsTaxable = true; // _taxSettings.PaymentMethodAdditionalFeeIsTaxable = true; @@ -1384,7 +1371,6 @@ public void Can_get_shopping_cart_total() _discountService.Expect(ds => ds.GetAllDiscounts(DiscountType.AssignedToCategories)).Return(new List()); _discountService.Expect(ds => ds.GetAllDiscounts(DiscountType.AssignedToManufacturers)).Return(new List()); - //_genericAttributeService.Expect(x => x.GetAttributesForEntity(customer.Id, "Customer")) // .Return(new List // { 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/Search/LinqCatalogSearchServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Search/LinqCatalogSearchServiceTests.cs index edf0cb2b6f..efff5ee68b 100644 --- a/src/Tests/SmartStore.Services.Tests/Search/LinqCatalogSearchServiceTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Search/LinqCatalogSearchServiceTests.cs @@ -513,7 +513,6 @@ public void LinqSearch_filter_with_stock_quantity() result = Search(new CatalogSearchQuery().WithStockQuantity(null, 10002, null, false), products); Assert.That(result.Hits.Count(), Is.EqualTo(5)); - result = Search(new CatalogSearchQuery().WithStockQuantity(10000, 10000), products); Assert.That(result.Hits.Count(), Is.EqualTo(1)); diff --git a/src/Tests/SmartStore.Services.Tests/Seo/SeoExtensionsTests.cs b/src/Tests/SmartStore.Services.Tests/Seo/SeoExtensionsTests.cs index 10855e2ec8..a63fbc309e 100644 --- a/src/Tests/SmartStore.Services.Tests/Seo/SeoExtensionsTests.cs +++ b/src/Tests/SmartStore.Services.Tests/Seo/SeoExtensionsTests.cs @@ -57,5 +57,3 @@ public void Can_allow_unicode_chars() } } - - diff --git a/src/Tests/SmartStore.Services.Tests/Shipping/FixedRateTestShippingRateComputationMethod.cs b/src/Tests/SmartStore.Services.Tests/Shipping/FixedRateTestShippingRateComputationMethod.cs index 1745c0d74a..1b6b508d5b 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; @@ -59,7 +59,6 @@ public GetShippingOptionResponse GetShippingOptions(GetShippingOptionRequest get #region Properties - /// /// Gets a shipping rate computation method type /// diff --git a/src/Tests/SmartStore.Services.Tests/Tax/FixedRateTestTaxProvider.cs b/src/Tests/SmartStore.Services.Tests/Tax/FixedRateTestTaxProvider.cs index 6c04dc94fb..6c7339fba0 100644 --- a/src/Tests/SmartStore.Services.Tests/Tax/FixedRateTestTaxProvider.cs +++ b/src/Tests/SmartStore.Services.Tests/Tax/FixedRateTestTaxProvider.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Services.Tax; diff --git a/src/Tests/SmartStore.Tests/MemoryRepository.cs b/src/Tests/SmartStore.Tests/MemoryRepository.cs index e1ec7c8376..239834c94d 100644 --- a/src/Tests/SmartStore.Tests/MemoryRepository.cs +++ b/src/Tests/SmartStore.Tests/MemoryRepository.cs @@ -50,7 +50,6 @@ public void Insert(T entity) _dbSet.Add(entity); } - public Task InsertAsync(T entity) { Insert(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/Admin/Controllers/CategoryControllerTests.cs b/src/Tests/SmartStore.Web.MVC.Tests/Admin/Controllers/CategoryControllerTests.cs index a6cc3b8fa7..3b727a796e 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Admin/Controllers/CategoryControllerTests.cs +++ b/src/Tests/SmartStore.Web.MVC.Tests/Admin/Controllers/CategoryControllerTests.cs @@ -8,7 +8,6 @@ public class CategoryControllerTests : SmartStore.Tests.TestsBase //TODO also test MVC views. //Find more info here: http://blog.davidebbo.com/2011/06/unit-test-your-mvc-views-using-razor.html - //TODO ASP.NET MVC Outbound Url tests with NSubstitute. //Find more info here: http://blogs.planetcloud.co.uk/mygreatdiscovery/post/ASPNET-MVC-Outbound-Url-tests-with-NSubstitute.aspx public override void SetUp() 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..df64b6ca80 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.Mvc; +using Microsoft.AspNetCore.Routing; using NUnit.Framework; using Rhino.Mocks; using SmartStore.Core.Fakes; @@ -48,7 +48,6 @@ public void Normal_request_should_not_be_affected() Assert.That(authorizationContext.Result, Is.Null); } - [Test] public void Normal_with_attribute_request_should_require_permission() { 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..fd1d814fe0 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RouteTestingExtensions.cs +++ b/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RouteTestingExtensions.cs @@ -4,8 +4,8 @@ using System.Linq.Expressions; using System.Reflection; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Collections; using SmartStore.Core.Fakes; using SmartStore.Tests; diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RoutesTestsBase.cs b/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RoutesTestsBase.cs index 54c30e9979..349688f707 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RoutesTestsBase.cs +++ b/src/Tests/SmartStore.Web.MVC.Tests/Public/Infrastructure/RoutesTestsBase.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using NUnit.Framework; using SmartStore.Core.Data; diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Common/AddressValidatorTests.cs b/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Common/AddressValidatorTests.cs index eac7d17824..90341afaa8 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Common/AddressValidatorTests.cs +++ b/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Common/AddressValidatorTests.cs @@ -101,7 +101,6 @@ public void Should_have_error_when_company_is_null_or_empty_based_on_required_se model.Company = ""; validator.ShouldHaveValidationErrorFor(x => x.Company, model); - //not required validator = new AddressValidator(T, new AddressSettings { @@ -225,7 +224,6 @@ public void Should_have_error_when_zippostalcode_is_null_or_empty_based_on_requi model.ZipPostalCode = ""; validator.ShouldHaveValidationErrorFor(x => x.ZipPostalCode, model); - //not required validator = new AddressValidator(T, new AddressSettings { @@ -267,7 +265,6 @@ public void Should_have_error_when_city_is_null_or_empty_based_on_required_setti model.City = ""; validator.ShouldHaveValidationErrorFor(x => x.City, model); - //not required validator = new AddressValidator(T, new AddressSettings { @@ -350,7 +347,6 @@ public void Should_have_error_when_fax_is_null_or_empty_based_on_required_settin model.FaxNumber = ""; validator.ShouldHaveValidationErrorFor(x => x.FaxNumber, model); - //not required validator = new AddressValidator(T, new AddressSettings { diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Customer/CustomerInfoValidatorTests.cs b/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Customer/CustomerInfoValidatorTests.cs index 4ddf973f8f..b1abecc7cd 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Customer/CustomerInfoValidatorTests.cs +++ b/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Customer/CustomerInfoValidatorTests.cs @@ -102,7 +102,6 @@ public void Should_have_error_when_company_is_null_or_empty_based_on_required_se model.Company = ""; validator.ShouldHaveValidationErrorFor(x => x.Company, model); - //not required validator = new CustomerInfoValidator(new CustomerSettings { @@ -226,7 +225,6 @@ public void Should_have_error_when_zippostalcode_is_null_or_empty_based_on_requi model.ZipPostalCode = ""; validator.ShouldHaveValidationErrorFor(x => x.ZipPostalCode, model); - //not required validator = new CustomerInfoValidator(new CustomerSettings { @@ -268,7 +266,6 @@ public void Should_have_error_when_city_is_null_or_empty_based_on_required_setti model.City = ""; validator.ShouldHaveValidationErrorFor(x => x.City, model); - //not required validator = new CustomerInfoValidator(new CustomerSettings { @@ -349,7 +346,6 @@ public void Should_have_error_when_fax_is_null_or_empty_based_on_required_settin model.Fax = ""; validator.ShouldHaveValidationErrorFor(x => x.Fax, model); - //not required validator = new CustomerInfoValidator(new CustomerSettings { diff --git a/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Person.cs b/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Person.cs index 0ea5f2b7c9..c0967ec9b1 100644 --- a/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Person.cs +++ b/src/Tests/SmartStore.Web.MVC.Tests/Public/Validators/Person.cs @@ -41,7 +41,6 @@ public int CalculateSalary() public string CreditCard { get; set; } } - public class Address { public string Line1 { get; set; } diff --git a/src/Tools/SmartStore.Packager/MainForm.cs b/src/Tools/SmartStore.Packager/MainForm.cs index bc9412afed..20ae16c089 100644 --- a/src/Tools/SmartStore.Packager/MainForm.cs +++ b/src/Tools/SmartStore.Packager/MainForm.cs @@ -149,7 +149,6 @@ private void btnReadDescriptions_Click(object sender, EventArgs e) btnReadDescriptions.Enabled = true; } - private void ReadPackages(IVirtualPathProvider vpp) { if (!ValidatePaths()) diff --git a/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs b/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs index 1bf46a8049..5411e8e85c 100644 --- a/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs +++ b/src/Tools/SmartStore.WebApi.Client/Models/FileUploadModel.cs @@ -63,7 +63,6 @@ public class FileModel } } - public enum DuplicateFileHandling { ThrowError, diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs index 82deee90cd..c0181ef1e4 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/HmacAuthentication.cs @@ -152,7 +152,6 @@ public bool ParseTimestamp(string timestamp, out DateTime time) } } - public enum HmacResult : int { Success = 0, diff --git a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs index fe54da527f..d8b950f8f7 100644 --- a/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs +++ b/src/Tools/SmartStore.WebApi.Client/WebApi/WebApiCore.cs @@ -32,7 +32,6 @@ public override string ToString() } } - public static class WebApiGlobal { public static int MaxTop => 120;