Upgrade .NET version to 8 on iteration 52

src/Libraries/SmartStore.Core/Async/AsyncRunner.cs → src/Libraries/SmartStore.Core/Async/AsyncRunner.cs.disabled

@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Autofac;
 using SmartStore.Core.Infrastructure;
 
@@ -344,6 +344,9 @@ public override SynchronizationContext CreateCopy()
         }
     }
 
+    // Commented out for .NET 8 migration - IRegisteredObject not available
+    // Replace with IHostedService in ASP.NET Core
+    /*
     internal class BackgroundWorkHost : IRegisteredObject
     {
         private readonly CancellationTokenSource _shutdownCancellationTokenSource = new CancellationTokenSource();
@@ -421,4 +424,5 @@ private void FinalShutdown()
         }
 
     }
+    */
 }

src/Libraries/SmartStore.Core/BaseEntity.cs

@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Data.Entity.Core.Objects;
+// using Microsoft.EntityFrameworkCore.Core.Objects; // Removed for .NET 8 migration
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
@@ -32,7 +32,7 @@ public Type GetUnproxiedType()
         {
             #region Old
             //var t = GetType();
-            //if (t.AssemblyQualifiedName.StartsWith("System.Data.Entity."))
+            //if (t.AssemblyQualifiedName.StartsWith("Microsoft.EntityFrameworkCore."))
             //{
             //	// it's a proxied type
             //	t = t.BaseType;

src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs → src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs.disabled

@@ -7,7 +7,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using SmartStore.Core.Infrastructure.DependencyManagement;
+// using SmartStore.Core.Infrastructure.DependencyManagement; // Removed for .NET 8 migration
 using SmartStore.Utilities;
 using SmartStore.Utilities.Threading;
 

src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs → src/Libraries/SmartStore.Core/Caching/OutputCache.disabled/IOutputCacheInvalidationObserver.cs

@@ -4,7 +4,7 @@
 using System.Linq.Expressions;
 using SmartStore.Core.Configuration;
 using SmartStore.Core.Data.Hooks;
-using SmartStore.Core.Infrastructure.DependencyManagement;
+// using SmartStore.Core.Infrastructure.DependencyManagement; // Removed for .NET 8 migration
 using SmartStore.Utilities;
 
 namespace SmartStore.Core.Caching

src/Libraries/SmartStore.Core/Caching/RequestCache.cs

@@ -3,7 +3,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Web;
+// using System.Web; // Removed for .NET 8 migration
+using Microsoft.AspNetCore.Http;
 using SmartStore.Utilities;
 
 namespace SmartStore.Core.Caching
@@ -14,9 +15,9 @@ public class RequestCache : DisposableObject, IRequestCache
 
         private readonly IDictionary _emptyDictionary = new Dictionary<string, object>();
 
-        private readonly HttpContextBase _context;
+        private readonly HttpContext _context;
 
-        public RequestCache(HttpContextBase context)
+        public RequestCache(HttpContext context)
         {
             _context = context;
         }

src/Libraries/SmartStore.Core/Collections/Querystring.cs

@@ -1,7 +1,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
-using System.Web;
+// using System.Web; // Removed for .NET 8 migration
 using SmartStore.Utilities.ObjectPools;
 
 namespace SmartStore.Collections

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

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;

src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs

@@ -1,6 +1,8 @@
 using System;
-using System.Data.Entity.Infrastructure;
-using EfState = System.Data.Entity.EntityState;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using EfState = Microsoft.EntityFrameworkCore.EntityState;
 
 namespace SmartStore.Core.Data.Hooks
 {
@@ -14,7 +16,7 @@ public interface IHookedEntity
         /// <summary>
         /// Gets the hooked entity entry
         /// </summary>
-        DbEntityEntry Entry { get; }
+        EntityEntry Entry { get; }
 
         /// <summary>
         /// Gets the hooked entity instance
@@ -61,12 +63,12 @@ public class HookedEntity : IHookedEntity
     {
         private Type _entityType;
 
-        public HookedEntity(IDbContext context, DbEntityEntry entry)
+        public HookedEntity(IDbContext context, EntityEntry entry)
             : this(context.GetType(), entry)
         {
         }
 
-        internal HookedEntity(Type contextType, DbEntityEntry entry)
+        internal HookedEntity(Type contextType, EntityEntry entry)
         {
             ContextType = contextType;
             Entry = entry;
@@ -78,7 +80,7 @@ public Type ContextType
             get;
         }
 
-        public DbEntityEntry Entry
+        public EntityEntry Entry
         {
             get;
         }

src/Libraries/SmartStore.Core/Data/IDbContext.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
 
 namespace SmartStore.Core.Data
@@ -151,7 +151,7 @@ IList<TEntity> ExecuteStoredProcedureList<TEntity>(string commandText, params ob
         /// <typeparam name="TEntity">Type of entity</typeparam>
         /// <param name="entity">The entity instance</param>
         /// <param name="requestedState">The requested new state</param>
-        void ChangeState<TEntity>(TEntity entity, System.Data.Entity.EntityState requestedState) where TEntity : BaseEntity;
+        void ChangeState<TEntity>(TEntity entity, Microsoft.EntityFrameworkCore.EntityState requestedState) where TEntity : BaseEntity;
 
         /// <summary>
         /// Reloads the entity from the database overwriting any property values with values from the database. 

src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Linq.Expressions;
 using SmartStore.Core;
@@ -41,7 +41,7 @@ public static bool SetToUnchanged<TEntity>(this IDbContext ctx, TEntity entity)
         {
             try
             {
-                ctx.ChangeState<TEntity>(entity, System.Data.Entity.EntityState.Unchanged);
+                ctx.ChangeState<TEntity>(entity, Microsoft.EntityFrameworkCore.EntityState.Unchanged);
                 return true;
             }
             catch (Exception ex)
@@ -111,7 +111,7 @@ public static void LoadCollection<TEntity, TCollection>(
             var collection = entry.Collection(navigationProperty);
 
             // Avoid System.InvalidOperationException: Member 'IsLoaded' cannot be called for property...
-            if (entry.State == System.Data.Entity.EntityState.Detached)
+            if (entry.State == Microsoft.EntityFrameworkCore.EntityState.Detached)
             {
                 ctx.Attach(entity);
             }
@@ -166,7 +166,7 @@ public static void LoadReference<TEntity, TProperty>(
             var reference = entry.Reference(navigationProperty);
 
             // Avoid System.InvalidOperationException: Member 'IsLoaded' cannot be called for property...
-            if (entry.State == System.Data.Entity.EntityState.Detached)
+            if (entry.State == Microsoft.EntityFrameworkCore.EntityState.Detached)
             {
                 ctx.Attach(entity);
             }

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;

src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
+using Microsoft.EntityFrameworkCore;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
@@ -45,7 +45,7 @@ public static void Delete<T>(this IRepository<T> rs, int id) where T : BaseEntit
             entity.Id = id;
 
             // must downcast 'cause of Rhino mocks stub  
-            rs.Context.ChangeState((BaseEntity)entity, System.Data.Entity.EntityState.Deleted);
+            rs.Context.ChangeState((BaseEntity)entity, Microsoft.EntityFrameworkCore.EntityState.Deleted);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs

@@ -167,7 +167,6 @@ public static IReadOnlyCollection<string> GetVisibilityAffectingPropertyNames()
         /// Gets or sets a language identifier for which the blog post should be displayed.
         /// </summary>
         [DataMember]
-        [Index]
         public int? LanguageId { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs

@@ -173,7 +173,6 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
         public bool Deleted { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs

@@ -109,7 +109,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc
         /// Gets or sets a value indicating whether the entity is subject to ACL.
         /// </summary>
         [DataMember]
-        [Index]
         public bool SubjectToAcl { get; set; }
 
         /// <summary>
@@ -121,7 +120,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
         public bool Deleted { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs

@@ -90,7 +90,6 @@ public static IReadOnlyCollection<string> GetVisibilityAffectingPropertyNames()
         /// Gets or sets the visibility level of the product.
         /// </summary>
         [DataMember]
-        [Index]
         public ProductVisibility Visibility { get; set; }
 
         /// <summary>
@@ -216,7 +215,6 @@ public string Sku
         /// Gets or sets the manufacturer part number
         /// </summary>
         [DataMember]
-        [Index]
         public string ManufacturerPartNumber
         {
             [DebuggerStepThrough]
@@ -228,7 +226,6 @@ public string ManufacturerPartNumber
         /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books).
         /// </summary>
         [DataMember]
-        [Index]
         public string Gtin
         {
             [DebuggerStepThrough]
@@ -669,30 +666,23 @@ public decimal Height
         /// Gets or sets a value indicating whether the entity is published
         /// </summary>
 		[DataMember]
-        [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)]
         public bool Published { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity has been deleted
         /// </summary>
-		[Index]
-        [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)]
         public bool Deleted { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the entity is a system product.
         /// </summary>
         [DataMember]
-        [Index]
-        [Index("IX_Product_SystemName_IsSystemProduct", 2)]
-        [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)]
         public bool IsSystemProduct { get; set; }
 
         /// <summary>
         /// Gets or sets the product system name.
         /// </summary>
         [DataMember]
-        [Index("IX_Product_SystemName_IsSystemProduct", 1)]
         public string SystemName { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs

@@ -37,14 +37,12 @@ public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAli
         /// Gets or sets whether the attribute can be filtered
         /// </summary>
         [DataMember]
-        [Index]
         public bool AllowFiltering { get; set; }
 
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
         [DataMember]
-        [Index]
         public int DisplayOrder { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs

@@ -25,7 +25,6 @@ public partial class ProductCategory : BaseEntity
         /// Gets or sets a value indicating whether the product is featured
         /// </summary>
         [DataMember]
-        [Index]
         public bool IsFeaturedProduct { get; set; }
 
         /// <summary>
@@ -38,7 +37,6 @@ public partial class ProductCategory : BaseEntity
         /// Indicates whether the mapping is created by the user or by the system.
         /// </summary>
         [DataMember]
-        [Index]
         public bool IsSystemMapping { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs

@@ -25,7 +25,6 @@ public partial class ProductManufacturer : BaseEntity
         /// Gets or sets a value indicating whether the product is featured
         /// </summary>
 		[DataMember]
-        [Index]
         public bool IsFeaturedProduct { get; set; }
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs

@@ -23,7 +23,6 @@ public partial class ProductTag : BaseEntity, ILocalizedEntity
         /// Gets or sets a value indicating whether the entity is published.
         /// </summary>
         [DataMember]
-        [Index("IX_ProductTag_Published")]
         public bool Published { get; set; } = true;
 
         /// <summary>

src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs

@@ -18,7 +18,6 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity
         /// Gets or sets the product identifier
         /// </summary>
 		[DataMember]
-        [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)]
         public int ProductId { get; set; }
 
         /// <summary>
@@ -51,14 +50,12 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity
         /// Gets or sets the attribute control type identifier
         /// </summary>
 		[DataMember]
-        [Index]
         public int AttributeControlTypeId { get; set; }
 
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
 		[DataMember]
-        [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)]
         public int DisplayOrder { get; set; }
 
         /// <summary>