From 601ce32927365331591c183465845365f1484d77 Mon Sep 17 00:00:00 2001 From: Version Upgrade Date: Tue, 14 Oct 2025 01:05:54 +0000 Subject: [PATCH] Upgrade to .NET 8 on Iteration 29 --- .../SmartStore.Core/Async/AsyncRunner.cs | 2 +- .../SmartStore.Core/Async/LocalAsyncState.cs | 6 +- .../Caching/MemoryCacheManager.cs | 8 +- .../TypeConversion/DictionaryConverter.cs | 2 +- .../TypeConversion/TypeConverterFactory.cs | 2 +- .../SmartStore.Core/Data/DataSettings.cs | 1 - .../Data/Hooks/HookedEntity.cs | 8 +- .../SmartStore.Core/Data/IDbContext.cs | 2 +- .../Data/IDbContextExtensions.cs | 2 +- .../Data/IQueryableExtensions.cs | 2 +- .../Data/RepositoryExtensions.cs | 2 +- .../SmartStore.Core/Domain/Blogs/BlogPost.cs | 1 - .../Domain/Catalog/Category.cs | 1 - .../Domain/Catalog/Manufacturer.cs | 2 - .../SmartStore.Core/Domain/Catalog/Product.cs | 10 - .../Domain/Catalog/ProductAttribute.cs | 2 - .../Domain/Catalog/ProductCategory.cs | 2 - .../Domain/Catalog/ProductManufacturer.cs | 1 - .../Domain/Catalog/ProductTag.cs | 1 - .../Domain/Catalog/ProductVariantAttribute.cs | 3 - .../ProductVariantAttributeCombination.cs | 2 - .../Catalog/ProductVariantAttributeValue.cs | 4 - ...StoreProductVariantAttributeCombination.cs | 3 - .../Domain/Catalog/SpecificationAttribute.cs | 1 - .../Domain/Cms/MenuItemRecord.cs | 5 - .../SmartStore.Core/Domain/Cms/MenuRecord.cs | 4 - .../Domain/Customers/Customer.cs | 5 - .../Domain/Customers/CustomerRole.cs | 5 - .../Domain/Customers/CustomerRoleMapping.cs | 1 - .../Domain/Customers/WalletHistory.cs | 2 - .../Domain/DataExchange/SyncMapping.cs | 6 - .../SmartStore.Core/Domain/Forums/Forum.cs | 2 - .../Domain/Forums/ForumGroup.cs | 3 - .../Domain/Forums/ForumPost.cs | 2 - .../Domain/Forums/ForumTopic.cs | 7 - .../Domain/Localization/LocalizedProperty.cs | 5 - .../SmartStore.Core/Domain/Logging/Log.cs | 2 - .../SmartStore.Core/Domain/Media/Download.cs | 5 - .../SmartStore.Core/Domain/Media/MediaFile.cs | 22 - .../Domain/Media/MediaFolder.cs | 2 - .../Domain/Media/MediaTrack.cs | 4 - .../Domain/Messages/MessageTemplate.cs | 3 +- .../Domain/Messages/NewsLetterSubscription.cs | 3 - .../SmartStore.Core/Domain/News/NewsItem.cs | 1 - .../SmartStore.Core/Domain/Orders/Order.cs | 1 - .../Domain/Security/PermissionRecord.cs | 1 - .../Domain/Tasks/ScheduleTask.cs | 3 - .../Domain/Tasks/ScheduleTaskHistory.cs | 4 - .../AppRegisterGlobalFiltersEvent.cs | 2 +- .../Extensions/HtmlTextWriterExtensions.cs | 1 - .../Extensions/HttpExtensions.cs | 6 +- .../Extensions/RouteExtensions.cs | 4 +- .../SmartStore.Core/Fakes/FakeController.cs | 2 +- .../SmartStore.Core/Fakes/FakeHttpContext.cs | 2 +- .../SmartStore.Core/Fakes/FakeHttpRequest.cs | 4 +- .../Fakes/FakeHttpSessionState.cs | 2 +- .../SmartStore.Core/Html/HtmlUtils.cs | 6 +- src/Libraries/SmartStore.Core/IMergedData.cs | 2 +- .../SmartStore.Core/IO/DirectoryHasher.cs | 2 +- .../SmartStore.Core/IO/LocalFileSystem.cs | 2 +- .../VirtualPath/DefaultVirtualPathProvider.cs | 4 +- .../IO/VirtualPath/IVirtualPathProvider.cs | 2 +- .../Infrastructure/ApplicationStart.cs | 2 +- .../Infrastructure/ContextState.cs | 2 +- .../Infrastructure/SmartStoreEngine.cs | 2 +- .../Infrastructure/WebAppTypeFinder.cs | 2 +- .../Logging/log4net/Log4netLoggerFactory.cs | 2 +- .../Packaging/PackagingUtils.cs | 2 +- src/Libraries/SmartStore.Core/PagedList`T.cs | 2 +- .../SmartStore.Core/Plugins/IConfigurable.cs | 2 +- .../SmartStore.Core/Plugins/PluginManager.cs | 3 - src/Libraries/SmartStore.Core/RouteInfo.cs | 2 +- .../Rules/Domain/RuleEntity.cs | 2 - .../Rules/Domain/RuleSetEntity.cs | 3 - .../SmartStore.Core/Rules/RuleStorage.cs | 2 +- .../Security/PermissionAttribute.cs | 2 +- .../Security/SmartStorePrincipal.cs | 2 +- .../SmartStore.Core/SmartStore.Core.csproj | 823 +------ .../SmartStore.Core.csproj.old-style | 809 ++++++ .../SmartStore.Core/Utilities/CommonHelper.cs | 4 +- src/Libraries/SmartStore.Core/WebHelper.cs | 1 - .../Caching/EfMappingViewCacheFactory.cs | 2 +- src/Libraries/SmartStore.Data/EfRepository.cs | 2 +- .../Extensions/DbContextExtensions.cs | 2 +- .../Extensions/DbEntityEntryExtensions.cs | 20 +- .../Extensions/IDbContextExtensions.cs | 10 +- .../Migrations/201705281903241_MoreIndexes.cs | 2 +- .../201706020759565_UpdateMediaPath.cs | 2 +- .../Migrations/201711222311112_MoveFsMedia.cs | 2 +- .../Migrations/201712081631552_Liquid.cs | 2 +- .../201807201157391_DownloadVersions.cs | 2 +- .../201908211825244_ProductTagPublished.cs | 2 +- .../201910021805242_RemoveOldPermissions.cs | 2 +- .../201911090805330_ProductVisibility.cs | 2 +- ...002191252074_RemoveDiscountRequirements.cs | 2 +- .../202003052100521_CustomerRoleMappings.cs | 2 +- ...04301922188_RemoveCustomerCustomerRoles.cs | 2 +- .../202006250801086_V400Resources.cs | 2 +- .../ObjectContextBase.SaveChanges.cs | 6 +- .../SmartStore.Data/ObjectContextBase.cs | 6 +- .../Setup/Builder/ActivityLogTypeMigrator.cs | 2 +- .../Setup/Builder/LocaleResourcesMigrator.cs | 2 +- .../Setup/Builder/SettingsMigrator.cs | 2 +- .../Setup/DbMigrationContext.cs | 2 +- .../Setup/DbSeedingMigrator.cs | 2 +- .../SmartStore.Data/Setup/IDataSeeder.cs | 2 +- .../Setup/InstallDatabaseInitializer.cs | 2 +- .../Setup/MigrateDatabaseInitializer.cs | 2 +- .../Setup/SeedDbMigrationEvent.cs | 2 +- .../SmartStore.Data/SmartDbConfiguration.cs | 4 +- .../SmartStore.Data/SmartObjectContext.cs | 2 +- .../SmartStore.Data/SmartStore.Data.csproj | 1026 +------- .../SmartStore.Data.csproj.old-style | 1015 ++++++++ .../SmartStore.Data/Utilities/DataMigrator.cs | 2 +- .../SmartStore.Data/Utilities/FastPager.cs | 2 +- .../Authentication/External/AuthorizeState.cs | 2 +- .../External/IExternalAuthenticationMethod.cs | 2 +- .../FormsAuthenticationService.cs | 2 +- .../Cart/Rules/Impl/PaidByRule.cs | 2 +- .../Impl/PurchasedFromManufacturerRule.cs | 2 +- .../Cart/Rules/Impl/PurchasedProductRule.cs | 2 +- .../Cart/ValidatingCartEvent.cs | 2 +- .../Catalog/CategoryService.cs | 2 +- .../Catalog/Extensions/ProductUrlHelper.cs | 4 +- .../Catalog/Importer/CategoryImporter.cs | 2 +- .../Catalog/ManufacturerService.cs | 2 +- .../ProductVariantQueryModelBinder.cs | 2 +- .../Catalog/ProductAttributeService.cs | 2 +- .../Catalog/ProductService.cs | 2 +- .../Catalog/Rules/ProductRuleEvaluatorTask.cs | 2 +- .../Cms/Blocks/BlockHandlerBase.cs | 4 +- .../Cms/Blocks/IBindableBlockHandler.cs | 2 +- .../SmartStore.Services/Cms/Blocks/IBlock.cs | 2 +- .../Cms/Blocks/IBlockHandler.cs | 2 +- .../SmartStore.Services/Cms/IWidget.cs | 2 +- .../SmartStore.Services/Cms/LinkResolver.cs | 2 +- .../Cms/Menus/MenuStorage.cs | 2 +- .../Customers/CookieManager.cs | 2 +- .../Customers/CustomerReportService.cs | 2 +- .../Customers/CustomerService.cs | 2 +- .../Customers/ICookieManager.cs | 2 +- .../Rules/TargetGroupEvaluatorTask.cs | 2 +- .../Customers/Rules/TargetGroupService.cs | 2 +- .../DataExchange/Export/DataExporter.cs | 2 +- .../Export/DynamicEntityHelper.cs | 2 +- .../Forums/ForumService.cs | 4 +- .../Media/Album/FolderService.cs | 2 +- .../Media/Album/SystemAlbumProvider.cs | 2 +- .../Media/Handlers/MediaHandlerContext.cs | 2 +- .../Media/Legacy/PictureService.cs | 4 +- .../Media/MediaService.Folder.cs | 2 +- .../SmartStore.Services/Media/MediaService.cs | 2 +- .../Media/MediaUrlGenerator.cs | 2 +- .../Media/Search/MediaSearcher.cs | 2 +- .../Storage/DatabaseMediaStorageProvider.cs | 2 +- .../Media/Storage/MediaMover.cs | 3 +- .../Media/Tracking/MediaTracker.cs | 2 +- .../Media/TransientMediaClearTask.cs | 2 +- .../Messages/CreateAttachmentsConsumer.cs | 2 +- .../Messages/MessageFactory.cs | 2 +- .../Messages/MessageModelProvider.cs | 2 +- .../Messages/QueuedMessagesSendTask.cs | 2 +- .../Orders/OrderReportService.cs | 2 +- .../Payments/IPaymentMethod.cs | 2 +- .../Payments/PaymentExtentions.cs | 2 +- .../Payments/PaymentMethodBase.cs | 2 +- .../Pdf/Content/PdfUrlContent.cs | 2 +- .../Rules/DefaultRuleOptionsProvider.cs | 2 +- .../Search/Catalog/CatalogSearchService.cs | 4 +- .../Catalog/LinqCatalogSearchService.cs | 2 +- .../Modelling/CatalogSearchQueryFactory.cs | 2 +- .../CatalogSearchQueryModelBinder.cs | 2 +- .../Search/Extensions/UrlHelperExtensions.cs | 2 +- .../Search/Forum/ForumSearchService.cs | 2 +- .../Search/Forum/LinqForumSearchService.cs | 2 +- .../Modelling/ForumSearchQueryFactory.cs | 2 +- .../Modelling/ForumSearchQueryModelBinder.cs | 2 +- .../Search/SearchServiceBase.cs | 2 +- .../Security/EncryptionService.cs | 2 +- .../Security/PermissionService.cs | 2 +- .../Seo/IXmlSitemapPublisher.cs | 2 +- .../Seo/XmlSitemapGenerator.cs | 4 +- .../IShippingRateComputationMethod.cs | 2 +- .../SmartStore.Services.csproj | 874 +------ .../Tasks/ScheduleTaskService.cs | 2 +- .../Tasks/TaskScheduler.cs | 2 +- .../Tax/FreeTaxProvider.cs | 2 +- .../SmartStore.Services/Tax/ITaxProvider.cs | 2 +- src/MIGRATION_STATUS.md | 178 ++ .../AmazonPayCheckoutController.cs | 2 +- .../Controllers/AmazonPayController.cs | 2 +- .../Controllers/AmazonPayControllerBase.cs | 2 +- .../AmazonPayShoppingCartController.cs | 2 +- .../Filters/AmazonPayCheckoutFilter.cs | 4 +- .../Models/ConfigurationModel.cs | 2 +- src/Plugins/SmartStore.AmazonPay/Plugin.cs | 2 +- .../SmartStore.AmazonPay/RouteProvider.cs | 4 +- .../Services/AmazonPayService.cs | 2 +- .../Services/IAmazonPayService.cs | 2 +- .../SmartStore.AmazonPay.csproj | 2 - .../Widgets/AmazonPayWidget.cs | 2 +- .../ClickatellSmsProvider.cs | 2 +- .../Controllers/SmsClickatellController.cs | 2 +- .../SmartStore.Clickatell/RouteProvider.cs | 4 +- .../SmartStore.Clickatell.csproj | 3 - .../SmartStore.DevTools/Blocks/SampleBlock.cs | 2 +- .../Controllers/DevToolsController.cs | 2 +- .../Controllers/MyCheckoutController.cs | 2 +- .../SmartStore.DevTools/DevToolsPlugin.cs | 2 +- .../Filters/MachineNameFilter.cs | 2 +- .../Filters/ProfilerFilter.cs | 2 +- .../Filters/Samples/SampleActionFilter.cs | 2 +- .../Filters/Samples/SampleCheckoutFilter.cs | 4 +- .../SampleProductDetailActionFilter.cs | 2 +- .../Filters/Samples/SampleResultFilter.cs | 2 +- .../Filters/WidgetZoneFilter.cs | 2 +- .../SmartStore.DevTools/RouteProvider.cs | 4 +- .../Services/CustomFacetTemplateSelector.cs | 2 +- .../SmartStore.DevTools.csproj | 361 +-- src/Plugins/SmartStore.DevTools/Starter.cs | 1 - .../ExternalAuthFacebookController.cs | 2 +- .../Core/FacebookProviderAuthorizer.cs | 2 +- .../FacebookExternalAuthMethod.cs | 2 +- .../SmartStore.FacebookAuth/RouteProvider.cs | 4 +- .../SmartStore.FacebookAuth.csproj | 3 - .../WidgetsGoogleAnalyticsController.cs | 2 +- .../GoogleAnalyticPlugin.cs | 2 +- .../Models/ConfigurationModel.cs | 6 +- .../RouteProvider.cs | 4 +- .../SmartStore.GoogleAnalytics.csproj | 3 - .../FeedGoogleMerchantCenterController.cs | 2 +- .../Data/GoogleProductObjectContext.cs | 2 +- .../Domain/GoogleProductRecord.cs | 3 - .../GoogleMerchantCenterFeedPlugin.cs | 2 +- .../Models/ProfileConfigurationModel.cs | 2 +- .../Providers/GmcXmlExportProvider.cs | 2 +- .../RouteProvider.cs | 4 +- .../SmartStore.GoogleMerchantCenter.csproj | 3 - .../Controllers/OfflinePaymentController.cs | 2 +- .../Models/ConfigurationModel.cs | 3 +- .../Models/PaymentInfoModel.cs | 9 +- .../Providers/ManualProvider.cs | 2 +- .../Providers/OfflinePaymentProviderBase.cs | 2 +- .../RouteProvider.cs | 4 +- .../SmartStore.OfflinePayment.csproj | 275 +-- .../Controllers/PayPalControllerBase.cs | 2 +- .../Controllers/PayPalDirectController.cs | 2 +- .../Controllers/PayPalExpressController.cs | 2 +- .../PayPalInstalmentsController.cs | 2 +- .../Controllers/PayPalPlusController.cs | 2 +- .../PayPalRestApiControllerBase.cs | 2 +- .../Controllers/PayPalStandardController.cs | 2 +- .../Filters/PayPalExpressCheckoutFilter.cs | 4 +- .../Filters/PayPalExpressWidgetZoneFilter.cs | 2 +- .../PayPalInstalmentsCheckoutFilter.cs | 2 +- .../Filters/PayPalPlusCheckoutFilter.cs | 4 +- .../Filters/PayPalPlusWidgetZoneFilter.cs | 2 +- .../PayPalInstalmentsConfigModel.cs | 2 +- .../Models/PayPalDirectPaymentInfoModel.cs | 8 +- src/Plugins/SmartStore.PayPal/Plugin.cs | 2 +- .../Providers/PayPalProviderBase.cs | 2 +- .../Providers/PayPalRestApiProviderBase.cs | 4 +- .../Providers/PayPalStandardProvider.cs | 2 +- .../SmartStore.PayPal/RouteProvider.cs | 4 +- .../SmartStore.PayPal.csproj | 3 - .../Controllers/ByTotalController.cs | 2 +- .../Controllers/FixedRateController.cs | 2 +- .../Data/ByTotalObjectContext.cs | 2 +- .../Models/ByTotalListModel.cs | 2 +- .../Providers/ByTotalProvider.cs | 2 +- .../Providers/FixedRateProvider.cs | 2 +- .../SmartStore.Shipping/RouteProvider.cs | 4 +- .../SmartStore.Shipping.csproj | 279 +-- .../ByWeightShippingComputationMethod.cs | 2 +- .../Controllers/ShippingByWeightController.cs | 2 +- .../Data/ShippingByWeightObjectContext.cs | 2 +- .../Models/ShippingByWeightListModel.cs | 2 +- .../RouteProvider.cs | 4 +- .../SmartStore.ShippingByWeight.csproj | 3 - .../Controllers/TaxByRegionController.cs | 2 +- .../Controllers/TaxFixedRateController.cs | 2 +- .../Data/TaxRateObjectContext.cs | 2 +- .../Models/ByRegionTaxRateListModel.cs | 2 +- .../Providers/ByRegionTaxProvider.cs | 2 +- .../Providers/FixedRateTaxProvider.cs | 2 +- src/Plugins/SmartStore.Tax/RouteProvider.cs | 4 +- .../SmartStore.Tax/SmartStore.Tax.csproj | 281 +-- .../Controllers/WebApiController.cs | 2 +- .../Extensions/MiscExtensions.cs | 2 +- .../SmartStore.WebApi/RouteProvider.cs | 4 +- .../Services/WebApiPdfHelper.cs | 4 +- .../SmartStore.WebApi.csproj | 3 - src/Plugins/SmartStore.WebApi/WebApiPlugin.cs | 2 +- .../Controllers/AdminControllerBase.cs | 2 +- .../Controllers/ContollerExtensions.cs | 4 +- .../Controllers/ManageController.cs | 2 +- .../Controllers/PaymentControllerBase.cs | 2 +- .../Controllers/SmartController.cs | 2 +- .../DependencyRegistrar.cs | 2 +- .../Events/TabStripCreated.cs | 2 +- .../Extensions/ActionResultExtensions.cs | 2 +- .../Extensions/HtmlExtensions.cs | 4 +- .../Extensions/HtmlPrefixScopeExtensions.cs | 2 +- .../Extensions/HtmlSelectListExtensions.cs | 2 +- .../Extensions/HtmlZoneExtensions.cs | 2 +- .../Extensions/HttpExtensions.cs | 4 +- .../Extensions/TagBuilderExtensions.cs | 2 +- .../Extensions/TelerikExtensions.cs | 2 +- .../Extensions/UrlHelperExtensions.cs | 2 +- .../Filters/CheckAffiliateAttribute.cs | 2 +- .../Filters/CompressAttribute.cs | 2 +- .../Filters/CookieConsentFilter.cs | 2 +- .../Filters/CustomerLastActivityAttribute.cs | 2 +- .../Filters/FormValueExistsAttribute.cs | 2 +- .../Filters/FormValueRequiredAttribute.cs | 2 +- .../Filters/GdprConsentAttribute.cs | 2 +- .../Filters/HandleExceptionFilter.cs | 2 +- .../Filters/HandleInstallFilter.cs | 4 +- .../Filters/JsonNetAttribute.cs | 2 +- .../Filters/MaxMediaFileSizeAttribute.cs | 2 +- .../Filters/NotifyAttribute.cs | 2 +- ...rameterBasedOnFormNameAndValueAttribute.cs | 2 +- .../ParameterBasedOnFormNameAttribute.cs | 2 +- .../PublicStoreAllowNavigationAttribute.cs | 2 +- .../Filters/StoreClosedAttribute.cs | 2 +- .../Filters/StoreIpAddressAttribute.cs | 2 +- .../Filters/StoreLastVisitedPageAttribute.cs | 2 +- .../Filters/UnitOfWorkAttribute.cs | 2 +- .../Localization/LanguageSeoCodeAttribute.cs | 2 +- .../Localization/LocalizedRoute.cs | 4 +- .../Localization/LocalizedRouteExtensions.cs | 4 +- .../SetWorkingCultureAttribute.cs | 2 +- .../Modelling/CommaSeparatedModelBinder.cs | 2 +- .../Modelling/ModelBase.cs | 2 +- .../Modelling/ModelBoundEvent.cs | 2 +- .../Modelling/Results/CachedFileResult.cs | 4 +- .../Modelling/Results/JsonNetResult.cs | 2 +- .../Results/PermissiveRedirectResult.cs | 2 +- .../Modelling/Results/RootActionViewResult.cs | 2 +- .../Modelling/Results/RssActionResult.cs | 2 +- .../Modelling/Results/XmlDownloadResult.cs | 2 +- .../Modelling/SmartMetadataProvider.cs | 2 +- .../Modelling/SmartModelBinder.cs | 2 +- .../Pdf/Content/PdfPartialViewContent.cs | 2 +- .../Pdf/Content/PdfRouteContent.cs | 4 +- .../Pdf/Content/PdfViewContent.cs | 2 +- .../SmartStore.Web.Framework/Pdf/PdfResult.cs | 2 +- .../Plugins/PluginRazorHost.cs | 2 +- .../Plugins/ProviderModel.cs | 6 +- .../Routing/GuidConstraint.cs | 2 +- .../Routing/IRouteProvider.cs | 2 +- .../Routing/IRoutePublisher.cs | 2 +- .../Routing/RoutePublisher.cs | 2 +- .../Security/AdminAuthorizeAttribute.cs | 2 +- .../AdminValidateIpAddressAttribute.cs | 2 +- .../Security/Captcha/HtmlCaptchaExtensions.cs | 2 +- .../Captcha/ValidateCaptchaAttribute.cs | 2 +- .../Security/Honeypot/Honeypot.cs | 2 +- .../Honeypot/HtmlHoneypotExtensions.cs | 2 +- .../Honeypot/ValidateHoneypotAttribute.cs | 2 +- .../Security/SanitizeHtmlAttribute.cs | 2 +- .../Seo/GenericPath.cs | 2 +- .../Seo/GenericPathRoute.cs | 2 +- .../Seo/GenericPathRouteExtensions.cs | 4 +- .../SmartStore.Web.Framework/Seo/ISeoModel.cs | 8 +- .../Seo/RewriteUrlAttribute.cs | 6 +- .../Settings/LoadSettingAttribute.cs | 2 +- .../Settings/SaveSettingAttribute.cs | 2 +- .../Settings/StoreDependingSettingHelper.cs | 2 +- .../SmartDependencyResolver.cs | 2 +- .../SmartStore.Web.Framework.csproj | 532 +--- .../SmartUrlRoutingModule.cs | 4 +- .../Templating/Liquid/LiquidTemplate.cs | 2 +- .../Theming/AdminThemedAttribute.cs | 2 +- .../Assets/BundlingVirtualPathProvider.cs | 4 +- .../Theming/Assets/DefaultAssetCache.cs | 4 +- .../Assets/ModuleImportsVirtualFile.cs | 2 +- .../Theming/CssHttpHandler.cs | 2 +- .../Theming/DefaultThemeFileResolver.cs | 2 +- .../Theming/InheritedVirtualThemeFile.cs | 2 +- .../Theming/SmartVirtualPathProvider.cs | 2 +- .../Theming/ThemeHtmlExtensions.cs | 2 +- .../Theming/ThemeVarsVirtualFile.cs | 2 +- .../Theming/ThemeableRazorViewEngine.cs | 2 +- .../ThemeableVirtualPathProviderViewEngine.cs | 2 +- .../Theming/ThemingVirtualPathProvider.cs | 4 +- .../Theming/TwoLevelViewLocationCache.cs | 2 +- .../Theming/WebViewPage.cs | 2 +- .../Theming/WebViewPageHelper.cs | 2 +- .../UI/Choices/ChoiceModel.cs | 2 +- .../UI/Components/Component.cs | 2 +- .../UI/Components/ComponentBuilder.cs | 2 +- .../UI/Components/ComponentFactory.cs | 2 +- .../UI/Components/ComponentRenderer.cs | 3 +- .../EntityPicker/EntityPickerBuilder.cs | 4 +- .../FileUploader/FileUploaderBuilder.cs | 2 +- .../UI/Components/HtmlHelperExtensions.cs | 2 +- .../UI/Components/Menu/MenuBuilder.cs | 2 +- .../UI/Components/Menu/MenuExtensions.cs | 4 +- .../UI/Components/Menu/MenuRenderer.cs | 1 - .../UI/Components/NavigatableComponent.cs | 2 +- .../Components/NavigatableComponentBuilder.cs | 4 +- .../UI/Components/NavigationItem.cs | 2 +- .../UI/Components/NavigationItemBuilder.cs | 4 +- .../UI/Components/Pager/PagerBuilder.cs | 2 +- .../UI/Components/Pager/PagerRenderer.cs | 3 +- .../UI/Components/TabStrip/TabBuilder.cs | 2 +- .../UI/Components/TabStrip/TabFactory.cs | 2 +- .../UI/Components/TabStrip/TabStripBuilder.cs | 2 +- .../Components/TabStrip/TabStripRenderer.cs | 3 +- .../UI/Components/Window/Window.cs | 2 +- .../UI/Components/Window/WindowBuilder.cs | 2 +- .../UI/Components/Window/WindowRenderer.cs | 1 - .../UI/Extensions/DataListExtensions.cs | 2 +- .../UI/Extensions/HtmlAttributeExtensions.cs | 2 +- .../UI/Extensions/LayoutExtensions.cs | 4 +- .../UI/Extensions/NavigatableExtensions.cs | 4 +- .../RouteValueDictionaryExtensions.cs | 2 +- .../UI/Extensions/ScaffoldExtensions.cs | 2 +- .../UI/INavigatable.cs | 2 +- .../UI/IPageAssetsBuilder.cs | 4 +- .../UI/IWidgetProvider.cs | 2 +- .../UI/Menus/DatabaseMenu.cs | 2 +- .../UI/Menus/IMenu.cs | 2 +- .../UI/Menus/MenuBase.cs | 2 +- .../UI/Menus/MenuFilter.cs | 2 +- .../Menus/Providers/CatalogMenuInvalidator.cs | 2 +- .../UI/PageAssetsBuilder.cs | 6 +- .../UI/WidgetProvider.cs | 2 +- .../UI/WidgetRouteInfo.cs | 2 +- .../Validators/SmartBaseValidator.cs | 2 +- .../Validators/ValidatorLanguageManager.cs | 2 +- .../Caching/WebApiCachingControllingData.cs | 2 +- .../WebApi/Caching/WebApiCachingUserData.cs | 2 +- .../Controllers/ActivityLogController.cs | 2 +- .../Controllers/AdminModelHelper.cs | 2 +- .../Controllers/AffiliateController.cs | 2 +- .../Controllers/BlogController.cs | 2 +- .../Controllers/CampaignController.cs | 2 +- .../Controllers/CategoryController.cs | 2 +- .../CheckoutAttributeController.cs | 2 +- .../Controllers/CommonController.cs | 4 +- .../Controllers/CountryController.cs | 2 +- .../Controllers/CurrencyController.cs | 2 +- .../Controllers/CustomerController.cs | 2 +- .../Controllers/CustomerRoleController.cs | 2 +- .../Controllers/DeliveryTimeController.cs | 2 +- .../Controllers/DiscountController.cs | 2 +- .../Controllers/DownloadController.cs | 2 +- .../Controllers/EmailAccountController.cs | 2 +- .../Controllers/ExportController.cs | 2 +- .../ExternalAuthenticationController.cs | 2 +- .../Controllers/ForumController.cs | 2 +- .../Controllers/GiftCardController.cs | 2 +- .../Controllers/HomeController.cs | 2 +- .../Controllers/ImportController.cs | 2 +- .../Controllers/LanguageController.cs | 4 +- .../Controllers/LogController.cs | 2 +- .../Controllers/ManufacturerController.cs | 2 +- .../Controllers/MeasureController.cs | 2 +- .../Controllers/MediaController.cs | 2 +- .../Controllers/MenuController.cs | 2 +- .../Controllers/MessageTemplateController.cs | 4 +- .../Controllers/NewsController.cs | 2 +- .../NewsLetterSubscriptionController.cs | 2 +- .../Controllers/OnlineCustomerController.cs | 2 +- .../Controllers/OrderController.cs | 4 +- .../Controllers/PackagingController.cs | 2 +- .../Controllers/PaymentController.cs | 2 +- .../Controllers/PluginController.cs | 4 +- .../Controllers/PollController.cs | 2 +- .../Controllers/ProductAttributeController.cs | 2 +- .../Controllers/ProductController.cs | 2 +- .../Controllers/ProductReviewController.cs | 2 +- .../Controllers/QuantityUnitController.cs | 2 +- .../Controllers/QueuedEmailController.cs | 2 +- .../Controllers/RecurringPaymentController.cs | 2 +- .../Controllers/ReturnRequestController.cs | 2 +- .../Controllers/RoxyFileManagerController.cs | 2 +- .../Controllers/RuleController.cs | 2 +- .../Controllers/ScheduleTaskController.cs | 2 +- .../Controllers/SecurityController.cs | 2 +- .../Controllers/SettingController.cs | 2 +- .../Controllers/ShippingController.cs | 2 +- .../Controllers/ShoppingCartController.cs | 2 +- .../SpecificationAttributeController.cs | 2 +- .../Controllers/StoreController.cs | 2 +- .../Controllers/TaxController.cs | 2 +- .../Controllers/ThemeController.cs | 4 +- .../Controllers/TopicController.cs | 2 +- .../Controllers/UrlRecordController.cs | 2 +- .../Controllers/WidgetController.cs | 2 +- .../Extensions/HtmlHelperExtensions.cs | 2 +- .../Infrastructure/PreviewModeFilter.cs | 2 +- .../Infrastructure/RouteProvider.cs | 4 +- .../Infrastructure/SettingsMenu.cs | 2 +- .../Models/Blogs/BlogCommentModel.cs | 4 +- .../Models/Blogs/BlogListModel.cs | 2 +- .../Models/Blogs/BlogPostModel.cs | 16 +- .../Models/Catalog/BulkEditListModel.cs | 3 +- .../Models/Catalog/BulkEditProductModel.cs | 4 +- .../Models/Catalog/CategoryListModel.cs | 3 +- .../Models/Catalog/CategoryModel.cs | 19 +- .../Models/Catalog/CopyProductModel.cs | 3 +- .../Models/Catalog/ManufacturerListModel.cs | 3 +- .../Models/Catalog/ManufacturerModel.cs | 17 +- .../Models/Catalog/ProductAttributeModel.cs | 6 +- .../Catalog/ProductAttributeOptionModel.cs | 2 +- .../ProductAttributeOptionsSetModel.cs | 3 +- .../Models/Catalog/ProductBundleItemModel.cs | 2 +- .../Models/Catalog/ProductListModel.cs | 4 +- .../Models/Catalog/ProductModel.cs | 27 +- .../Models/Catalog/ProductReviewModel.cs | 4 +- .../ProductSpecificationAttributeModel.cs | 3 +- .../Models/Catalog/ProductTagModel.cs | 4 +- ...ProductVariantAttributeCombinationModel.cs | 4 +- .../Catalog/SpecificationAttributeModel.cs | 4 +- .../SpecificationAttributeOptionModel.cs | 4 +- .../Models/Common/AddressModel.cs | 15 +- .../Models/Common/GenericAttributeModel.cs | 3 +- .../Models/Customers/CustomerListModel.cs | 9 +- .../Models/Customers/CustomerModel.cs | 22 +- .../Models/Customers/CustomerRoleModel.cs | 4 +- .../Customers/TopCustomersReportModel.cs | 2 +- .../DataExchange/ExportDeploymentModel.cs | 2 +- .../Models/DataExchange/ExportFilterModel.cs | 2 +- .../Models/DataExchange/ExportProfileModel.cs | 3 +- .../DataExchange/ExportProjectionModel.cs | 3 +- .../DataExchange/ImportProfileListModel.cs | 2 +- .../Models/DataExchange/ImportProfileModel.cs | 2 +- .../Models/Directory/CountryModel.cs | 6 +- .../Models/Directory/CurrencyModel.cs | 7 +- .../Models/Directory/DeliveryTimeModel.cs | 6 +- .../Models/Directory/MeasureDimensionModel.cs | 4 +- .../Models/Directory/MeasureWeightModel.cs | 4 +- .../Models/Directory/QuantityUnitModel.cs | 3 +- .../Models/Directory/StateProvinceModel.cs | 5 +- .../Models/Discounts/DiscountModel.cs | 4 +- .../Models/Forums/ForumGroupModel.cs | 8 +- .../Models/Forums/ForumModel.cs | 8 +- .../Models/Localization/LanguageModel.cs | 6 +- .../Localization/LanguageResourceModel.cs | 5 +- .../Models/Logging/ActivityLogSearchModel.cs | 3 +- .../Models/Logging/LogListModel.cs | 3 +- .../Administration/Models/Logging/LogModel.cs | 7 +- .../Models/Menus/MenuItemRecordModel.cs | 2 +- .../Models/Menus/MenuRecordListModel.cs | 2 +- .../Models/Menus/MenuRecordModel.cs | 2 +- .../Models/Messages/CampaignModel.cs | 6 +- .../Models/Messages/EmailAccountModel.cs | 8 +- .../Messages/MessageTemplateListModel.cs | 2 +- .../Models/Messages/MessageTemplateModel.cs | 13 +- .../NewsLetterSubscriptionListModel.cs | 2 +- .../Messages/NewsLetterSubscriptionModel.cs | 3 +- .../Models/Messages/QueuedEmailListModel.cs | 4 +- .../Models/Messages/QueuedEmailModel.cs | 9 +- .../Models/News/NewsCommentModel.cs | 5 +- .../Models/News/NewsItemListModel.cs | 2 +- .../Models/News/NewsItemModel.cs | 16 +- .../Models/Orders/BestsellersReportModel.cs | 2 +- .../Orders/CheckoutAttributeListModel.cs | 2 +- .../Models/Orders/CheckoutAttributeModel.cs | 7 +- .../Orders/CheckoutAttributeValueModel.cs | 4 +- .../Models/Orders/GiftCardListModel.cs | 3 +- .../Models/Orders/GiftCardModel.cs | 8 +- .../Models/Orders/OrderListModel.cs | 6 +- .../Models/Orders/OrderModel.cs | 24 +- .../Models/Orders/ReturnRequestListModel.cs | 2 +- .../Models/Orders/ReturnRequestModel.cs | 6 +- .../Models/Orders/ShipmentListModel.cs | 3 +- .../Models/Payments/PaymentMethodEditModel.cs | 6 +- .../Models/Plugins/PluginModel.cs | 10 +- .../Models/Polls/PollAnswerModel.cs | 3 +- .../Administration/Models/Polls/PollModel.cs | 5 +- .../Models/Settings/CatalogSettingsModel.cs | 2 +- .../Settings/CustomerUserSettingsModel.cs | 2 +- .../Settings/ForumSearchSettingsModel.cs | 2 +- .../Settings/GeneralCommonSettingsModel.cs | 8 +- .../Models/Settings/MediaSettingsModel.cs | 2 +- .../Models/Settings/OrderSettingsModel.cs | 2 +- .../Models/Settings/PaymentSettingsModel.cs | 2 +- .../Models/Settings/SearchSettingsModel.cs | 2 +- .../Models/Settings/SettingModel.cs | 4 +- .../Models/Settings/ShippingSettingsModel.cs | 2 +- .../Settings/ShoppingCartSettingsModel.cs | 2 +- .../Settings/StoreScopeConfigurationModel.cs | 2 +- .../Models/Settings/TaxSettingsModel.cs | 2 +- .../Models/Shipping/ShippingMethodModel.cs | 6 +- .../Models/Stores/StoreModel.cs | 7 +- .../Models/Tasks/ScheduleTaskModel.cs | 3 +- .../Models/Tax/TaxCategoryModel.cs | 3 +- .../Models/Themes/ConfigureThemeModel.cs | 4 +- .../Models/Themes/ThemeListModel.cs | 2 +- .../Models/Topics/TopicListModel.cs | 2 +- .../Models/Topics/TopicModel.cs | 18 +- .../Models/UrlRecord/UrlRecordListModel.cs | 3 +- .../Models/UrlRecord/UrlRecordModel.cs | 2 +- .../Administration/SmartStore.Admin.csproj | 1395 +---------- .../Controllers/BlogController.cs | 4 +- .../Controllers/BoardsController.cs | 2 +- .../Controllers/CatalogController.cs | 2 +- .../Controllers/CatalogHelper.cs | 6 +- .../Controllers/CheckoutController.cs | 2 +- .../Controllers/CommonController.cs | 2 +- .../Controllers/CountryController.cs | 2 +- .../Controllers/CustomerController.cs | 2 +- .../Controllers/DownloadController.cs | 2 +- .../Controllers/EntityController.cs | 4 +- .../Controllers/ErrorController.cs | 2 +- .../ExternalAuthenticationController.cs | 4 +- .../Controllers/HomeController.cs | 2 +- .../Controllers/InstallController.cs | 8 +- .../Controllers/MediaController.cs | 6 +- .../Controllers/MenuController.cs | 2 +- .../Controllers/NewsController.cs | 2 +- .../Controllers/NewsletterController.cs | 2 +- .../Controllers/OrderController.cs | 4 +- .../Controllers/PollController.cs | 2 +- .../Controllers/PrivateMessagesController.cs | 2 +- .../Controllers/ProductController.cs | 4 +- .../Controllers/ProfileController.cs | 2 +- .../Controllers/ReturnRequestController.cs | 2 +- .../Controllers/SearchController.cs | 2 +- .../Controllers/ShoppingCartController.cs | 4 +- .../Controllers/TaskSchedulerController.cs | 4 +- .../Controllers/ThemeController.cs | 2 +- .../Controllers/TopicController.cs | 4 +- .../Controllers/WidgetController.cs | 2 +- .../Extensions/EditorExtensions.cs | 2 +- .../Extensions/MappingExtensions.cs | 2 +- .../SmartStore.Web/Global.asax.cs | 6 +- .../DefaultFacetTemplateSelector.cs | 2 +- .../Infrastructure/DefaultWidgetSelector.cs | 2 +- .../Infrastructure/Menus/MyAccountMenu.cs | 2 +- .../Infrastructure/Routes/1_StoreRoutes.cs | 4 +- .../Infrastructure/Routes/2_DefaultRoutes.cs | 4 +- .../Infrastructure/Routes/3_GenericRoutes.cs | 2 +- .../Infrastructure/Routes/4_LastRoutes.cs | 2 +- .../Routes/MapLegacyRoutesAttribute.cs | 2 +- .../Models/Boards/EditForumTopicModel.cs | 2 +- .../Models/Boards/TopicMoveModel.cs | 2 +- .../Models/Catalog/IQuantityInput.cs | 2 +- .../Models/Catalog/ProductDetailsModel.cs | 2 +- .../Checkout/CheckoutPaymentInfoModel.cs | 2 +- .../Models/Common/AddressModel.cs | 2 +- .../Models/Customer/CustomerInfoModel.cs | 2 +- .../ExternalAuthenticationMethodModel.cs | 2 +- .../Models/Customer/PaswordRecoveryModel.cs | 3 +- .../Models/Customer/RegisterModel.cs | 2 +- .../Models/Install/InstallModel.cs | 6 +- .../Models/Order/SubmitReturnRequestModel.cs | 2 +- .../Models/Search/ISearchResultModel.cs | 2 +- .../ShoppingCart/ButtonPaymentMethodModel.cs | 2 +- .../ShoppingCart/EstimateShippingModel.cs | 2 +- .../ShoppingCart/MiniShoppingCartModel.cs | 2 +- .../Models/ShoppingCart/ShoppingCartModel.cs | 2 +- .../Models/ShoppingCart/WishlistModel.cs | 2 +- .../SmartStore.Web/SmartStore.Web.csproj | 2173 +---------------- .../Data/Hooks/HookedEntityMock.cs | 2 +- .../SmartStore.Core.Tests/PerformanceTests.cs | 4 +- .../SmartStore.Core.Tests.csproj | 1 - .../SmartStore.Data.Tests/GlobalSetup.cs | 2 +- .../SmartStore.Data.Tests/SchemaTests.cs | 2 +- .../SmartStore.Data.Tests.csproj | 1 - .../TestDbConfiguration.cs | 2 +- .../Payments/TestPaymentMethod.cs | 2 +- ...edRateTestShippingRateComputationMethod.cs | 2 +- .../SmartStore.Services.Tests.csproj | 1 - .../Tax/FixedRateTestTaxProvider.cs | 2 +- .../SmartStore.Tests/SmartStore.Tests.csproj | 1 - src/Tests/SmartStore.Tests/TestDbSet.cs | 2 +- .../AdminAuthorizeAttributeTests.cs | 4 +- .../Controllers/RewriteUrlAttributeTests.cs | 2 +- .../Infrastructure/RouteTestingExtensions.cs | 4 +- .../Public/Infrastructure/RoutesTestsBase.cs | 2 +- .../SmartStore.Web.MVC.Tests.csproj | 1 - 676 files changed, 2899 insertions(+), 9101 deletions(-) create mode 100644 src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old-style create mode 100644 src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old-style create mode 100644 src/MIGRATION_STATUS.md 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..3fc16ed22b 100644 --- a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs +++ b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.Caching; +using Microsoft.Extensions.Caching.Memory; using System.Threading; namespace SmartStore.Core.Async @@ -60,7 +60,7 @@ public virtual void Set(T state, string name = null, bool neverExpires = fals { // add new entry var duration = neverExpires ? TimeSpan.Zero : TimeSpan.FromMinutes(15); - var policy = new CacheItemPolicy + var policy = new MemoryCacheEntryOptions { SlidingExpiration = duration, Priority = CacheItemPriority.NotRemovable @@ -155,7 +155,7 @@ public virtual void SetCancelTokenSource(CancellationTokenSource cancelTokenS OnRemoveCancelTokenSource(key); } - var policy = new CacheItemPolicy { Priority = CacheItemPriority.NotRemovable }; + var policy = new MemoryCacheEntryOptions { Priority = CacheItemPriority.NotRemovable }; _cancelTokens.Set(key, cancelTokenSource, policy); } diff --git a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs index 332b199c61..718f45f150 100644 --- a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs +++ b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Runtime.Caching; +using Microsoft.Extensions.Caching.Memory; using System.Runtime.CompilerServices; using System.Text.RegularExpressions; using System.Threading; @@ -136,7 +136,7 @@ public async Task GetAsync(string key, Func> acquirer, TimeSpan? d public void Put(string key, object value, TimeSpan? duration = null, IEnumerable dependencies = null) { - _cache.Set(key, value ?? FakeNull, GetCacheItemPolicy(duration, dependencies)); + _cache.Set(key, value ?? FakeNull, GetMemoryCacheEntryOptions(duration, dependencies)); } public bool Contains(string key) @@ -207,7 +207,7 @@ public virtual ISet GetHashSet(string key, Func> acquirer = return result; } - private CacheItemPolicy GetCacheItemPolicy(TimeSpan? duration, IEnumerable dependencies) + private MemoryCacheEntryOptions GetMemoryCacheEntryOptions(TimeSpan? duration, IEnumerable dependencies) { var absoluteExpiration = ObjectCache.InfiniteAbsoluteExpiration; @@ -216,7 +216,7 @@ private CacheItemPolicy GetCacheItemPolicy(TimeSpan? duration, IEnumerable /// Gets the hooked entity entry /// - DbEntityEntry Entry { get; } + EntityEntry Entry { get; } /// /// Gets the hooked entity instance @@ -61,12 +61,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 +78,7 @@ public Type ContextType get; } - public DbEntityEntry Entry + public EntityEntry Entry { get; } diff --git a/src/Libraries/SmartStore.Core/Data/IDbContext.cs b/src/Libraries/SmartStore.Core/Data/IDbContext.cs index 95224e0308..5044fca160 100644 --- a/src/Libraries/SmartStore.Core/Data/IDbContext.cs +++ b/src/Libraries/SmartStore.Core/Data/IDbContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Threading.Tasks; namespace SmartStore.Core.Data diff --git a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs index 430f4eabee..789a28b615 100644 --- a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs index dc5a3eed3e..67173d80eb 100644 --- a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs index 1fefc75eb2..f8cfc5e28a 100644 --- a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Linq.Expressions; diff --git a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs index 821d502963..c433f51a65 100644 --- a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs @@ -167,7 +167,6 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// Gets or sets a language identifier for which the blog post should be displayed. /// [DataMember] - [Index] public int? LanguageId { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs index f0364da897..5d760ef767 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs @@ -173,7 +173,6 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs index 68ec18111c..22d4205361 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs @@ -109,7 +109,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// Gets or sets a value indicating whether the entity is subject to ACL. /// [DataMember] - [Index] public bool SubjectToAcl { get; set; } /// @@ -121,7 +120,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs index 06abbb9bbf..eff2b49bb4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs @@ -90,7 +90,6 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// Gets or sets the visibility level of the product. /// [DataMember] - [Index] public ProductVisibility Visibility { get; set; } /// @@ -216,7 +215,6 @@ public string Sku /// Gets or sets the manufacturer part number /// [DataMember] - [Index] public string ManufacturerPartNumber { [DebuggerStepThrough] @@ -228,7 +226,6 @@ public string ManufacturerPartNumber /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books). /// [DataMember] - [Index] public string Gtin { [DebuggerStepThrough] @@ -669,30 +666,23 @@ public decimal Height /// Gets or sets a value indicating whether the entity is published /// [DataMember] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)] public bool Published { get; set; } /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)] public bool Deleted { get; set; } /// /// Gets or sets a value indicating whether the entity is a system product. /// [DataMember] - [Index] - [Index("IX_Product_SystemName_IsSystemProduct", 2)] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)] public bool IsSystemProduct { get; set; } /// /// Gets or sets the product system name. /// [DataMember] - [Index("IX_Product_SystemName_IsSystemProduct", 1)] public string SystemName { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs index 9043816b92..271ad124f1 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs @@ -37,14 +37,12 @@ public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAli /// Gets or sets whether the attribute can be filtered /// [DataMember] - [Index] public bool AllowFiltering { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index] public int DisplayOrder { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs index 1d027e15b4..84c9c4f4e3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs @@ -25,7 +25,6 @@ public partial class ProductCategory : BaseEntity /// Gets or sets a value indicating whether the product is featured /// [DataMember] - [Index] public bool IsFeaturedProduct { get; set; } /// @@ -38,7 +37,6 @@ public partial class ProductCategory : BaseEntity /// Indicates whether the mapping is created by the user or by the system. /// [DataMember] - [Index] public bool IsSystemMapping { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs index 88babcda90..22aafb82c4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs @@ -25,7 +25,6 @@ public partial class ProductManufacturer : BaseEntity /// Gets or sets a value indicating whether the product is featured /// [DataMember] - [Index] public bool IsFeaturedProduct { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs index ace86b58ef..0c18987c40 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs @@ -23,7 +23,6 @@ public partial class ProductTag : BaseEntity, ILocalizedEntity /// Gets or sets a value indicating whether the entity is published. /// [DataMember] - [Index("IX_ProductTag_Published")] public bool Published { get; set; } = true; /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs index 44f6a4885e..3d18477b8e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs @@ -18,7 +18,6 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity /// Gets or sets the product identifier /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)] public int ProductId { get; set; } /// @@ -51,14 +50,12 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity /// Gets or sets the attribute control type identifier /// [DataMember] - [Index] public int AttributeControlTypeId { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)] public int DisplayOrder { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs index d3199afd8c..39025e8cc2 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs @@ -24,14 +24,12 @@ public partial class ProductVariantAttributeCombination : BaseEntity /// Gets or sets the stock quantity /// [DataMember] - [Index("IX_StockQuantity_AllowOutOfStockOrders", 1)] public int StockQuantity { get; set; } /// /// Gets or sets a value indicating whether to allow orders when out of stock /// [DataMember] - [Index("IX_StockQuantity_AllowOutOfStockOrders", 2)] public bool AllowOutOfStockOrders { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs index 7804a7f972..81853a7c6d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs @@ -15,7 +15,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the product variant attribute mapping identifier /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 1)] public int ProductVariantAttributeId { get; set; } /// @@ -28,7 +27,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the product variant attribute name /// [DataMember] - [Index] public string Name { get; set; } /// @@ -65,14 +63,12 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the display order /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 2)] public int DisplayOrder { get; set; } /// /// Gets or sets the type Id /// [DataMember] - [Index] public int ValueTypeId { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs index 9b3a3c6463..e30a6eb201 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs @@ -20,11 +20,9 @@ public ProductVariantAttributeCombination() public string Sku { get; set; } [DataMember] - [Index] public string Gtin { get; set; } [DataMember] - [Index] public string ManufacturerPartNumber { get; set; } [DataMember] @@ -61,7 +59,6 @@ public ProductVariantAttributeCombination() public virtual QuantityUnit QuantityUnit { get; set; } [DataMember] - [Index] public bool IsActive { get; set; } //public bool IsDefaultCombination { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs index f867f81ff7..d74ce5f850 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs @@ -43,7 +43,6 @@ public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity, ISea /// Gets or sets whether the specification attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin. /// [DataMember] - [Index] public bool AllowFiltering { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs index 90fc7610e9..01d0ac59f0 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs @@ -27,7 +27,6 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets the parent menu item identifier. 0 if the item has no parent. /// - [Index("IX_MenuItem_ParentItemId")] public int ParentItemId { get; set; } /// @@ -63,13 +62,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets a value indicating whether the menu item is published. /// - [Index("IX_MenuItem_Published")] public bool Published { get; set; } = true; /// /// Gets or sets the display order. /// - [Index("IX_MenuItem_DisplayOrder")] public int DisplayOrder { get; set; } /// @@ -125,13 +122,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores. /// - [Index("IX_MenuItem_LimitedToStores")] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. /// - [Index("IX_MenuItem_SubjectToAcl")] public bool SubjectToAcl { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs index 19dfe6e581..5e09e49181 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs @@ -35,7 +35,6 @@ public virtual ICollection 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 +58,6 @@ public virtual ICollection Items /// /// Gets or sets a value indicating whether the menu is published. /// - [Index("IX_Menu_Published")] public bool Published { get; set; } = true; /// @@ -70,13 +68,11 @@ public virtual ICollection Items /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores. /// - [Index("IX_Menu_LimitedToStores")] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. /// - [Index("IX_Menu_SubjectToAcl")] public bool SubjectToAcl { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs index c0582bce24..6616c3405a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs @@ -105,23 +105,18 @@ 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; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs index f5f8e96436..6d20871c2e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs @@ -43,23 +43,18 @@ public partial class CustomerRole : BaseEntity, IRulesContainer /// Gets or sets a value indicating whether the customer role is active /// [DataMember] - [Index] public bool Active { get; set; } /// /// Gets or sets a value indicating whether the customer role is system /// [DataMember] - [Index] - [Index("IX_CustomerRole_SystemName_IsSystemRole", 2)] public bool IsSystemRole { get; set; } /// /// Gets or sets the customer role system name /// [DataMember] - [Index] - [Index("IX_CustomerRole_SystemName_IsSystemRole", 1)] public string SystemName { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs index 18ff112076..7035fb90f3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs @@ -26,7 +26,6 @@ public partial class CustomerRoleMapping : BaseEntity /// Indicates whether the mapping is created by the user or by the system. /// [DataMember] - [Index] public bool IsSystemMapping { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs index 4befa9f0d9..fd0dd77183 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs @@ -12,7 +12,6 @@ public class WalletHistory : BaseEntity /// /// Gets or sets the store identifier. Should not be zero. /// - [Index("IX_StoreId_CreatedOn", 0)] public int StoreId { get; set; } /// @@ -43,7 +42,6 @@ public class WalletHistory : BaseEntity /// /// Gets or sets the date ehen the entry was created (in UTC). /// - [Index("IX_StoreId_CreatedOn", 1)] public DateTime CreatedOnUtc { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs index 09230db0a7..b6f31f241c 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs @@ -20,30 +20,24 @@ public SyncMapping() /// /// Gets or sets the entity identifier in SmartStore /// - [Index("IX_SyncMapping_ByEntity", 0, IsUnique = true)] [DataMember] public int EntityId { get; set; } /// /// Gets or sets the entity's key in the external application /// - [Index("IX_SyncMapping_BySource", 0, IsUnique = true)] [DataMember] public string SourceKey { get; set; } /// /// Gets or sets a name representing the entity type /// - [Index("IX_SyncMapping_ByEntity", 1, IsUnique = true)] - [Index("IX_SyncMapping_BySource", 1, IsUnique = true)] [DataMember] public string EntityName { get; set; } /// /// Gets or sets a name for the external application /// - [Index("IX_SyncMapping_ByEntity", 2, IsUnique = true)] - [Index("IX_SyncMapping_BySource", 2, IsUnique = true)] [DataMember] public string ContextName { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs index b4cedb8d01..df8c4cb64c 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/Forum.cs @@ -13,7 +13,6 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp /// /// Gets or sets the forum group identifier /// - [Index("IX_ForumGroupId_DisplayOrder", Order = 0)] public int ForumGroupId { get; set; } /// @@ -59,7 +58,6 @@ public partial class Forum : BaseEntity, IAuditable, ILocalizedEntity, ISlugSupp /// /// Gets or sets the display order /// - [Index("IX_ForumGroupId_DisplayOrder", Order = 1)] public int DisplayOrder { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs index 3b21ddda01..40d82f6dbd 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumGroup.cs @@ -28,7 +28,6 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported /// /// Gets or sets the display order /// - [Index] public int DisplayOrder { get; set; } /// @@ -44,13 +43,11 @@ public partial class ForumGroup : BaseEntity, IAuditable, IStoreMappingSupported /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores /// - [Index] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL /// - [Index] public bool SubjectToAcl { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs index 3098a9cdc0..1809ec537e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumPost.cs @@ -35,7 +35,6 @@ public partial class ForumPost : BaseEntity, IAuditable /// /// Gets or sets the date and time of instance creation /// - [Index] public DateTime CreatedOnUtc { get; set; } /// @@ -46,7 +45,6 @@ public partial class ForumPost : BaseEntity, IAuditable /// /// Gets or sets a value indicating whether the entity is published /// - [Index] public bool Published { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs index d7059778c1..feecc8ab5b 100644 --- a/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs +++ b/src/Libraries/SmartStore.Core/Domain/Forums/ForumTopic.cs @@ -12,7 +12,6 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets the forum identifier /// - [Index("IX_ForumId_Published", Order = 0)] public int ForumId { get; set; } /// @@ -23,19 +22,16 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets the topic type identifier /// - [Index("IX_TopicTypeId_LastPostTime", Order = 0)] public int TopicTypeId { get; set; } /// /// Gets or sets the subject /// - [Index] public string Subject { get; set; } /// /// Gets or sets the number of posts /// - [Index] public int NumPosts { get; set; } /// @@ -62,13 +58,11 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets the last post date and time /// - [Index("IX_TopicTypeId_LastPostTime", Order = 1)] public DateTime? LastPostTime { get; set; } /// /// Gets or sets the date and time of instance creation /// - [Index] public DateTime CreatedOnUtc { get; set; } /// @@ -79,7 +73,6 @@ public partial class ForumTopic : BaseEntity, IAuditable /// /// Gets or sets a value indicating whether the entity is published /// - [Index("IX_ForumId_Published", Order = 1)] public bool Published { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs index 521252dd36..e0bc8cd285 100644 --- a/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs +++ b/src/Libraries/SmartStore.Core/Domain/Localization/LocalizedProperty.cs @@ -13,29 +13,24 @@ public partial class LocalizedProperty : BaseEntity /// Gets or sets the entity identifier /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 1)] public int EntityId { get; set; } /// /// Gets or sets the language identifier /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 4)] public int LanguageId { get; set; } /// /// Gets or sets the locale key group /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 3)] - [Index("IX_LocalizedProperty_LocaleKeyGroup")] public string LocaleKeyGroup { get; set; } /// /// Gets or sets the locale key /// [DataMember] - [Index("IX_LocalizedProperty_Compound", Order = 2)] public string LocaleKey { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs index a907f17dfc..d255a58f54 100644 --- a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs +++ b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs @@ -15,7 +15,6 @@ public partial class Log : BaseEntity /// /// Gets or sets the log level identifier /// - [Index("IX_Log_Level", IsUnique = false)] public int LogLevelId { get; set; } /// @@ -56,7 +55,6 @@ public partial class Log : BaseEntity /// /// Gets or sets the logger name /// - [Index("IX_Log_Logger", IsUnique = false)] public string Logger { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs index 95c3a6351e..d601a526ff 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/Download.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/Download.cs @@ -15,7 +15,6 @@ public partial class Download : BaseEntity//, ITransient /// Gets or sets a GUID /// [DataMember] - [Index] public Guid DownloadGuid { get; set; } /// @@ -34,14 +33,12 @@ public partial class Download : BaseEntity//, ITransient /// Gets or sets a value indicating whether the entity transient/preliminary /// [DataMember] - [Index("IX_UpdatedOn_IsTransient", 1)] public bool IsTransient { get; set; } /// /// Gets or sets the date and time of instance update /// [DataMember] - [Index("IX_UpdatedOn_IsTransient", 0)] public DateTime UpdatedOnUtc { get; set; } /// @@ -60,14 +57,12 @@ public partial class Download : BaseEntity//, ITransient /// Gets or sets a value indicating the corresponding entity id /// [DataMember] - [Index("IX_EntityId_EntityName", 0)] public int EntityId { get; set; } /// /// Gets or sets a value indicating the corresponding entity name /// [DataMember] - [Index("IX_EntityId_EntityName", 1)] [StringLength(100)] public string EntityName { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs index 2681666518..4283ead9df 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFile.cs @@ -37,13 +37,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the associated folder identifier. /// [DataMember] - [Index("IX_Media_MediaType", 0)] - [Index("IX_Media_Extension", 0)] - [Index("IX_Media_PixelSize", 0)] - [Index("IX_Media_Name", 0)] - [Index("IX_Media_Size", 0)] - [Index("IX_Media_UpdatedOnUtc", 0)] - [Index("IX_Media_FolderId", 0)] public int? FolderId { get; set; } /// @@ -56,7 +49,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the SEO friendly name of the media file including file extension /// [DataMember] - [Index("IX_Media_Name", 1)] public string Name { get; set; } /// @@ -75,8 +67,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the (dotless) file extension /// [DataMember] - [Index("IX_Media_MediaType", 2)] - [Index("IX_Media_Extension", 1)] public string Extension { get; set; } /// @@ -89,23 +79,18 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// Gets or sets the file media type (image, video, audio, document etc.) /// [DataMember] - [Index("IX_Media_MediaType", 1)] public string MediaType { get; set; } /// /// Gets or sets the file size in bytes /// [DataMember] - [Index("IX_Media_Size", 1)] public int Size { get; set; } /// /// Gets or sets the total pixel size of an image (width * height) /// [DataMember] - [Index("IX_Media_MediaType", 3)] - [Index("IX_Media_Extension", 2)] - [Index("IX_Media_PixelSize", 1)] public int? PixelSize { get; set; } /// @@ -147,13 +132,6 @@ public static IReadOnlyCollection GetOutputAffectingPropertyNames() /// /// Gets or sets a value indicating whether the file has been soft deleted /// - [Index("IX_Media_MediaType", 4)] - [Index("IX_Media_Extension", 3)] - [Index("IX_Media_PixelSize", 2)] - [Index("IX_Media_Name", 2)] - [Index("IX_Media_Size", 2)] - [Index("IX_Media_UpdatedOnUtc", 2)] - [Index("IX_Media_FolderId", 1)] public bool Deleted { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs index 3598c1bb8d..7a025715af 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaFolder.cs @@ -14,7 +14,6 @@ public partial class MediaFolder : BaseEntity /// Gets or sets the parent folder id. /// [DataMember] - [Index("IX_NameParentId", Order = 0, IsUnique = true)] public int? ParentId { get; set; } /// @@ -26,7 +25,6 @@ public partial class MediaFolder : BaseEntity /// Gets or sets the media folder name. /// [DataMember] - [Index("IX_NameParentId", Order = 1, IsUnique = true)] public string Name { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs b/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs index 359c4c5141..526a7439bb 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs @@ -26,7 +26,6 @@ public partial class MediaTrack : BaseEntity, IEquatable /// Gets or sets the media file identifier. /// [DataMember] - [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 0)] public int MediaFileId { get => _mediaFileId; @@ -52,7 +51,6 @@ public int MediaFileId /// Gets or sets the related entity identifier. /// [DataMember] - [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 1)] public int EntityId { get => _entityId; @@ -67,7 +65,6 @@ public int EntityId /// Gets or sets the related entity set name. /// [DataMember] - [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 2)] public string EntityName { get => _entityName; @@ -82,7 +79,6 @@ public string EntityName /// Gets or sets the media file property name in the tracked entity. /// [DataMember] - [Index("IX_MediaTrack_Composite", IsUnique = true, Order = 3)] public string Property { get => _property; diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs index b15cfc8557..e1829058c8 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/MessageTemplate.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Stores; @@ -43,7 +43,6 @@ public partial class MessageTemplate : BaseEntity, ILocalizedEntity, IStoreMappi /// /// Gets or sets the body /// - [AllowHtml] public string Body { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs index 282267126a..69743f9821 100644 --- a/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs +++ b/src/Libraries/SmartStore.Core/Domain/Messages/NewsLetterSubscription.cs @@ -20,14 +20,12 @@ public partial class NewsLetterSubscription : BaseEntity /// Gets or sets the subcriber email /// [DataMember] - [Index("IX_NewsletterSubscription_Email_StoreId", 1)] public string Email { get; set; } /// /// Gets or sets a value indicating whether subscription is active /// [DataMember] - [Index] public bool Active { get; set; } /// @@ -40,7 +38,6 @@ public partial class NewsLetterSubscription : BaseEntity /// Gets or sets the store identifier /// [DataMember] - [Index("IX_NewsletterSubscription_Email_StoreId", 2)] public int StoreId { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs index 954961a9b2..0f380e95c4 100644 --- a/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs +++ b/src/Libraries/SmartStore.Core/Domain/News/NewsItem.cs @@ -130,7 +130,6 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// /// Gets or sets a language identifier for which the news item should be displayed. /// - [Index] public int? LanguageId { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs index d32337103c..0cb3324729 100644 --- a/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs +++ b/src/Libraries/SmartStore.Core/Domain/Orders/Order.cs @@ -440,7 +440,6 @@ protected virtual SortedDictionary ParseTaxRates(string taxRat /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs index aa2f64a941..ee88fdccdf 100644 --- a/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Security/PermissionRecord.cs @@ -13,7 +13,6 @@ public class PermissionRecord : BaseEntity /// /// Gets or sets the permission system name. /// - [Index] public string SystemName { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs index bf04b013c6..3edb5ec884 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs @@ -37,13 +37,11 @@ public class ScheduleTask : BaseEntity, ICloneable /// /// Gets or sets the type of appropriate ITask class /// - [Index("IX_Type")] public string Type { get; set; } /// /// Gets or sets the value indicating whether a task is enabled /// - [Index("IX_NextRun_Enabled", 1)] public bool Enabled { get; set; } /// @@ -56,7 +54,6 @@ public class ScheduleTask : BaseEntity, ICloneable /// public bool StopOnError { get; set; } - [Index("IX_NextRun_Enabled", 0)] public DateTime? NextRunUtc { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs index dbf2cbfefb..53b53b742a 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs @@ -15,25 +15,21 @@ public class ScheduleTaskHistory : BaseEntity, ICloneable /// /// Gets or sets whether the task is running. /// - [Index("IX_MachineName_IsRunning", 1)] public bool IsRunning { get; set; } /// /// Gets or sets the server machine name. /// - [Index("IX_MachineName_IsRunning", 0)] public string MachineName { get; set; } /// /// Gets or sets the date when the task was started. It is also the date when this entry was created. /// - [Index("IX_Started_Finished", 0)] public DateTime StartedOnUtc { get; set; } /// /// Gets or sets the date when the task has been finished. /// - [Index("IX_Started_Finished", 1)] public DateTime? FinishedOnUtc { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs b/src/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs index 6fd6e8d6fe..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/HtmlTextWriterExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs index df752203cd..37f9114a04 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HtmlTextWriterExtensions.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using System.Web.UI; namespace SmartStore { diff --git a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs index a2618ee834..26c5e1bcce 100644 --- a/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs @@ -6,9 +6,9 @@ using System.Net; using System.Runtime.CompilerServices; using System.Web; -using System.Web.Caching; -using System.Web.Mvc; -using System.Web.Security; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Identity; using SmartStore.Core; using SmartStore.Core.Fakes; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs index 94ad48d31e..a7b9d8fec5 100644 --- a/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs +++ b/src/Libraries/SmartStore.Core/Extensions/RouteExtensions.cs @@ -1,5 +1,5 @@ -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; // use base SmartStore Namespace to ensure the extension methods are always available namespace SmartStore diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeController.cs b/src/Libraries/SmartStore.Core/Fakes/FakeController.cs index 2e2e4ee851..90f65998d5 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeController.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeController.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Core.Fakes { diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs index 6da257d71a..410115ca3f 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpContext.cs @@ -3,7 +3,7 @@ using System.Collections.Specialized; using System.Security.Principal; using System.Web; -using System.Web.SessionState; +using Microsoft.AspNetCore.Http; namespace SmartStore.Core.Fakes { diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs index 5bc4db024a..88e77c7e0e 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpRequest.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Specialized; using System.Web; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Core.Fakes { diff --git a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs b/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs index 6d45307e06..14c2ee0b4b 100644 --- a/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs +++ b/src/Libraries/SmartStore.Core/Fakes/FakeHttpSessionState.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Specialized; using System.Web; -using System.Web.SessionState; +using Microsoft.AspNetCore.Http; namespace SmartStore.Core.Fakes { diff --git a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs index 2428d3c4aa..ffced639f3 100644 --- a/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs +++ b/src/Libraries/SmartStore.Core/Html/HtmlUtils.cs @@ -6,9 +6,9 @@ using System.Web; using AngleSharp; using AngleSharp.Dom; -using AngleSharp.Extensions; -using AngleSharp.Parser.Html; -using Ganss.XSS; +using AngleSharp.Html.Dom; +using AngleSharp.Html.Parser; +using Ganss.Xss; using SmartStore.Utilities.ObjectPools; namespace SmartStore.Core.Html diff --git a/src/Libraries/SmartStore.Core/IMergedData.cs b/src/Libraries/SmartStore.Core/IMergedData.cs index 2cf39de6dd..8f22e7f0d5 100644 --- a/src/Libraries/SmartStore.Core/IMergedData.cs +++ b/src/Libraries/SmartStore.Core/IMergedData.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs b/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs index 91e96b0ed5..df185815e4 100644 --- a/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs +++ b/src/Libraries/SmartStore.Core/IO/DirectoryHasher.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.IO; using System.Text; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core.Data; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs b/src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs index 45bb9e8c77..e3220e5ca2 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 diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs index a7eea24f4e..b9e02cb3a6 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/DefaultVirtualPathProvider.cs @@ -3,8 +3,8 @@ 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; diff --git a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs index 2a7d3717f0..752f7af654 100644 --- a/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs +++ b/src/Libraries/SmartStore.Core/IO/VirtualPath/IVirtualPathProvider.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using System.Web.Caching; +using Microsoft.Extensions.Caching.Memory; namespace SmartStore.Core.IO { diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs index 14b51e277c..9c8258213e 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs @@ -2,7 +2,7 @@ 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; diff --git a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs index ae9af5f59e..d4ec06dc43 100644 --- a/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs +++ b/src/Libraries/SmartStore.Core/Infrastructure/ContextState.cs @@ -1,5 +1,5 @@ using System; -using System.Runtime.Remoting.Messaging; +using System.Threading; using System.Web; namespace SmartStore.Core.Infrastructure 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/Logging/log4net/Log4netLoggerFactory.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs index b949429081..e31e73da4e 100644 --- a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs +++ b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs @@ -3,7 +3,7 @@ using System.Data; using System.IO; using System.Linq; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using log4net; using log4net.Appender; using log4net.Config; diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs index cbaa6e0cd0..32733ed0e5 100644 --- a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs +++ b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Linq; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using NuGet; using SmartStore.Core.Plugins; using SmartStore.Core.Themes; diff --git a/src/Libraries/SmartStore.Core/PagedList`T.cs b/src/Libraries/SmartStore.Core/PagedList`T.cs index 3796a1350a..52d95d3440 100644 --- a/src/Libraries/SmartStore.Core/PagedList`T.cs +++ b/src/Libraries/SmartStore.Core/PagedList`T.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.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..001dbbadac 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -7,8 +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; using SmartStore.Core.Infrastructure.DependencyManagement; @@ -21,7 +19,6 @@ // SEE THIS POST for full details of what this does //http://shazwazza.com/post/Developing-a-plugin-framework-in-ASPNET-with-medium-trust.aspx -[assembly: PreApplicationStartMethod(typeof(PluginManager), "Initialize")] namespace SmartStore.Core.Plugins { /// diff --git a/src/Libraries/SmartStore.Core/RouteInfo.cs b/src/Libraries/SmartStore.Core/RouteInfo.cs index e98f9d9004..5932759ce3 100644 --- a/src/Libraries/SmartStore.Core/RouteInfo.cs +++ b/src/Libraries/SmartStore.Core/RouteInfo.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json; namespace SmartStore diff --git a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs index 587be18e1f..5dc1193482 100644 --- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs +++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleEntity.cs @@ -17,7 +17,6 @@ public partial class RuleEntity : BaseEntity [DataMember] [Required, StringLength(100)] - [Index("IX_PageBuilder_RuleType")] public string RuleType { get; set; } //[DataMember] @@ -33,7 +32,6 @@ public partial class RuleEntity : BaseEntity public string Value { get; set; } [DataMember] - [Index("IX_PageBuilder_DisplayOrder")] public int DisplayOrder { get; set; } [NotMapped] diff --git a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs index 96d4bb591e..12835f0fcd 100644 --- a/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs +++ b/src/Libraries/SmartStore.Core/Rules/Domain/RuleSetEntity.cs @@ -29,18 +29,15 @@ public partial class RuleSetEntity : BaseEntity, IAuditable [StringLength(400)] public string Description { get; set; } - [Index("IX_RuleSetEntity_Scope", Order = 0)] public bool IsActive { get; set; } = true; [Required] - [Index("IX_RuleSetEntity_Scope", Order = 1)] public RuleScope Scope { get; set; } /// /// True when this set is an internal composite container for rules within another ruleset. /// - [Index] public bool IsSubGroup { get; set; } public LogicalRuleOperator LogicalOperator { get; set; } diff --git a/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs b/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs index 8b8226c2bd..57e338c77f 100644 --- a/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs +++ b/src/Libraries/SmartStore.Core/Rules/RuleStorage.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core; using SmartStore.Core.Caching; diff --git a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs index b1e4b0399c..6209758cd2 100644 --- a/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs +++ b/src/Libraries/SmartStore.Core/Security/PermissionAttribute.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Net; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Core.Security { diff --git a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs index 48d48e2d78..34cc707b96 100644 --- a/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs +++ b/src/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs @@ -1,7 +1,7 @@ using System.Security; using System.Security.Claims; using System.Security.Principal; -using System.Web.Security; +using Microsoft.AspNetCore.Identity; using SmartStore.Core.Domain.Customers; namespace SmartStore.Core diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj index cd84ae4268..1bb0008e98 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -1,810 +1,33 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {6BDA8332-939F-45B7-A25E-7A797260AE59} - Library - Properties + net8.0 SmartStore.Core SmartStore.Core - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true + false + latest + disable - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\PluginDev\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\HtmlSanitizer.4.0.205\lib\net45\HtmlSanitizer.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - True - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - True - - - - - - - - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - True - - - - ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + - - - - - - - - - \ No newline at end of file + diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old-style b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old-style new file mode 100644 index 0000000000..fa9b07ff5c --- /dev/null +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old-style @@ -0,0 +1,809 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {6BDA8332-939F-45B7-A25E-7A797260AE59} + Library + Properties + SmartStore.Core + 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 + + + + ..\..\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/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/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs index 14a332af68..faee7e6e3e 100644 --- a/src/Libraries/SmartStore.Core/WebHelper.cs +++ b/src/Libraries/SmartStore.Core/WebHelper.cs @@ -11,7 +11,6 @@ using System.Text.RegularExpressions; using System.Threading; using System.Web; -using System.Web.Configuration; using SmartStore.Collections; using SmartStore.Core.Data; using SmartStore.Core.Domain.Stores; diff --git a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs index 85c0d10238..f6c67dc422 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs @@ -1,7 +1,7 @@ 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; 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..5b701df9c1 100644 --- a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Infrastructure; using System.Diagnostics; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs index 1543a8ba41..35309b2a6e 100644 --- a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs @@ -6,9 +6,9 @@ namespace SmartStore.Data { - public static class DbEntityEntryExtensions + public static class EntityEntryExtensions { - public static void ReloadEntity(this DbEntityEntry entry) + public static void ReloadEntity(this EntityEntry entry) { try { @@ -35,7 +35,7 @@ public static void ReloadEntity(this DbEntityEntry entry) /// was attached to the context the first time) /// Returns an empty dictionary if no modification could be detected. /// - public static IDictionary GetModifiedProperties(this DbEntityEntry entry, IDbContext ctx) + public static IDictionary GetModifiedProperties(this EntityEntry entry, IDbContext ctx) { var props = GetModifiedPropertyEntries(entry, ctx).ToDictionary(k => k.Name, v => v.OriginalValue); @@ -52,13 +52,13 @@ public static IDictionary GetModifiedProperties(this DbEntityEnt /// The entry instance /// The data context /// true if any property has changed, false otherwise - public static bool HasChanges(this DbEntityEntry entry, IDbContext ctx) + public static bool HasChanges(this EntityEntry entry, IDbContext ctx) { var hasChanges = GetModifiedPropertyEntries(entry, ctx).Any(); return hasChanges; } - internal static IEnumerable GetModifiedPropertyEntries(this DbEntityEntry entry, IDbContext ctx) + internal static IEnumerable GetModifiedPropertyEntries(this EntityEntry entry, IDbContext ctx) { // Be aware of the entity state. you cannot get modified properties for detached entities. EnsureChangesDetected(entry, ctx); @@ -79,13 +79,13 @@ internal static IEnumerable GetModifiedPropertyEntries(this DbE } } - public static bool IsPropertyModified(this DbEntityEntry entry, IDbContext ctx, string propertyName) + public static bool IsPropertyModified(this EntityEntry entry, IDbContext ctx, string propertyName) { object originalValue; return TryGetModifiedProperty(entry, ctx, propertyName, out originalValue); } - public static bool TryGetModifiedProperty(this DbEntityEntry entry, IDbContext ctx, string propertyName, out object originalValue) + public static bool TryGetModifiedProperty(this EntityEntry entry, IDbContext ctx, string propertyName, out object originalValue) { Guard.NotEmpty(propertyName, nameof(propertyName)); @@ -109,7 +109,7 @@ public static bool TryGetModifiedProperty(this DbEntityEntry entry, IDbContext c return false; } - private static void EnsureChangesDetected(DbEntityEntry entry, IDbContext ctx) + private static void EnsureChangesDetected(EntityEntry entry, IDbContext ctx) { var state = entry.State; @@ -127,13 +127,13 @@ private static void EnsureChangesDetected(DbEntityEntry entry, IDbContext ctx) } } - public static void DetectChangesInProperties(this DbEntityEntry entry, IDbContext ctx) + public static void DetectChangesInProperties(this EntityEntry entry, IDbContext ctx) { ctx.DetectChanges(); #region Experimental - //// ChangeDetection for single entity: calls DbEntityEntry.InternalEntry > ObjectStateEntry._stateEntry.DetectChangesInProperties(bool) + //// ChangeDetection for single entity: calls EntityEntry.InternalEntry > ObjectStateEntry._stateEntry.DetectChangesInProperties(bool) //var invoked = false; //try diff --git a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs index 68b043a6a5..31bfd964f7 100644 --- a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Infrastructure; using System.Data.SqlClient; using System.Linq; @@ -39,7 +39,7 @@ public static T LoadOriginalCopy(this IDbContext context, T currentCopy) wher return InnerGetCopy(context, currentCopy, e => e.OriginalValues); } - public static DbEntityEntry GetEntry(this IDbContext context, T entity) where T : BaseEntity + public static EntityEntry GetEntry(this IDbContext context, T entity) where T : BaseEntity { var entry = CastOrThrow(context).Entry(entity); return entry; @@ -127,13 +127,13 @@ private static bool IsInSaveOperation(this IDbContext context) return (context as ObjectContextBase)?.IsInSaveOperation == true; } - private static T InnerGetCopy(IDbContext context, T currentCopy, Func, DbPropertyValues> func) where T : BaseEntity + private static T InnerGetCopy(IDbContext context, T currentCopy, Func, DbPropertyValues> func) where T : BaseEntity { // Get the database context var dbContext = CastOrThrow(context); // Get the entity tracking object - DbEntityEntry entry = GetEntityOrDefault(currentCopy, dbContext); + EntityEntry entry = GetEntityOrDefault(currentCopy, dbContext); // The output T output = null; @@ -158,7 +158,7 @@ private static T InnerGetCopy(IDbContext context, T currentCopy, FuncThe current copy. /// The db context. /// - private static DbEntityEntry GetEntityOrDefault(T currentCopy, DbContext dbContext) where T : BaseEntity + private static EntityEntry GetEntityOrDefault(T currentCopy, DbContext dbContext) where T : BaseEntity { return dbContext.ChangeTracker.Entries().Where(e => e.Entity == currentCopy).FirstOrDefault(); } diff --git a/src/Libraries/SmartStore.Data/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..02b7b302fd 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; 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/201908211825244_ProductTagPublished.cs b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs index b3d720ca95..68a644904f 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; 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..ba54c3e37e 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; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs index 8503451f1f..bb0ffbde19 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs @@ -27,7 +27,7 @@ private enum SaveStage PostSave } - private IEnumerable GetChangedEntries() + private IEnumerable GetChangedEntries() { return ChangeTracker.Entries().Where(x => x.State > EfState.Unchanged); } @@ -161,7 +161,7 @@ private static bool IsHookableEntityType(Type entityType) class SaveChangesOperation : IDisposable { private SaveStage _stage; - private IEnumerable _changedEntries; + private IEnumerable _changedEntries; private ObjectContextBase _ctx; private IDbHookHandler _hookHandler; @@ -171,7 +171,7 @@ public SaveChangesOperation(ObjectContextBase ctx, IDbHookHandler hookHandler) _hookHandler = hookHandler; } - public IEnumerable ChangedEntries => _changedEntries; + public IEnumerable ChangedEntries => _changedEntries; public SaveStage Stage => _stage; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.cs index 26d5a65685..694ccb1e61 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.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.Data.Entity.Infrastructure; using System.Linq; using System.Runtime.CompilerServices; @@ -417,7 +417,7 @@ public int DetachEntities(Func predicate, bool unchangedEntiti return numDetached; } - bool Match(DbEntityEntry entry) + bool Match(EntityEntry entry) { if (entry.State > EfState.Detached && predicate(entry.Entity)) { @@ -439,7 +439,7 @@ internal int DetachInternal(BaseEntity obj, ISet objSet, bool deep) return DetachInternal(this.Entry(obj), objSet, deep); } - internal int DetachInternal(DbEntityEntry entry, ISet objSet, bool deep) + internal int DetachInternal(EntityEntry entry, ISet objSet, bool deep) { var obj = entry.Entity; int numDetached = 0; diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/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/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..167f7d68d0 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Infrastructure; using System.Data.Entity.Migrations; using System.Linq; 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..2fe9eb974d 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 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..d026f0d087 100644 --- a/src/Libraries/SmartStore.Data/SmartObjectContext.cs +++ b/src/Libraries/SmartStore.Data/SmartObjectContext.cs @@ -1,6 +1,6 @@ using System; using System.Data; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.ModelConfiguration; using System.Linq; using System.Reflection; diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index fb594ed6a4..5ebfd90046 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -1,1016 +1,34 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144} - Library - Properties + net8.0 SmartStore.Data SmartStore.Data - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 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 + false latest + disable + - - ..\..\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 - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 201705281903241_MoreIndexes.cs - - - - 201706020759565_UpdateMediaPath.cs - - - - 201707190940318_V302Resources.cs - - - - 201707281452589_TierPriceCalcMethod.cs - - - - 201708251628482_SystemTopics.cs - - - - 201709141000226_V303Resources.cs - - - - 201709251538312_UpdateTrustedShopsTask.cs - - - - 201710102038287_CurrencyRounding.cs - - - - 201710252016556_IndexOptionNames.cs - - - - 201711112331162_ProductMainPictureId.cs - - - - 201711222311112_MoveFsMedia.cs - - - - 201711291017168_SyncStringResources.cs - - - - 201712081631552_Liquid.cs - - - - 201712290151517_AddressFormat.cs - - - - 201802081830029_ShippingMethodMultistore.cs - - - - 201802270844034_ExportAttributeMappings.cs - - - - 201804060721031_Wallet.cs - - - - 201804090744324_ForceSslForAllPages.cs - - - - 201804200835273_V310Resources.cs - - - - 201804252356096_TopicSlugs.cs - - - - 201805250724399_V315Resources.cs - - - - 201806051221399_RefundReturnRequests.cs - - - - 201806231547270_ScheduleTaskHistory.cs - - - - 201807051830375_MoveCustomerFields.cs - - - - 201807122120062_TopicAcl.cs - - - - 201807191020207_OrderItemDeliveryTime.cs - - - - 201807201157391_DownloadVersions.cs - - - - 201807311708428_ProductPreviewPicture.cs - - - - 201808051818238_Merge4.cs - - - - 201809171309522_NewsletterSubscriptionLanguage.cs - - - - 201809261026134_ForumGroupAcl.cs - - - - 201810011954195_ForumPostVote.cs - - - - 201810231214068_DataExchangeEnhancements.cs - - - - 201811061745204_IsSystemProductIndex.cs - - - - 201811082148279_LocalizedPropertyKeyGroupIndex.cs - - - - 201811161142587_TaskHistoryErrorLength.cs - - - - 201811202204501_ProductIndexSeekExport.cs - - - - 201902211855242_TopicHtmlIdAndBodyCss.cs - - - - 201904110735029_Menus.cs - - - - 201905020948354_WidgetTopics.cs - - - - 201905101159134_V320Resources.cs - - - - 201905271110370_V321Resources.cs - - - - 201906252008551_QuantityUnitNamePlural.cs - - - - 201907032251575_CategoryExternalLink.cs - - - - 201907250103367_RuleSystem.cs - - - - 201908050758298_MoveFurtherCustomerFields.cs - - - - 201908150749388_V322Resources.cs - - - - 201907221803421_GranularPermissions.cs - - - - 201908211821559_Merge5.cs - - - - 201908211825244_ProductTagPublished.cs - - - - 201908261226350_MenuItemMultistore.cs - - - - 201909291043284_BlogAndNewsItemPictures.cs - - - - 201910021805242_RemoveOldPermissions.cs - - - - 201910162004581_Merge6.cs - - - - 201911090805330_ProductVisibility.cs - - - - 201911120909434_Merge7.cs - - - - 201911141820264_ScheduleTaskPriority.cs - - - - 201912051209105_MessageTemplateEmailAddress.cs - - - - 201912111821362_AddNewPermissions.cs - - - - 202001141118171_SpecificationAttributeColorAndPicture.cs - - - - 202001221054109_ManufacturerBottomDescription.cs - - - - 202001301039020_DiscountRuleSets.cs - - - - 202002172101120_PictureMediaRename.cs - - - - 202002180228163_PictureMediaRename1.cs - - - - 202002280005340_MediaManager.cs - - - - 202002191252074_RemoveDiscountRequirements.cs - - - - 202002211011108_GenericMessageTemplate.cs - - - - 202002241354543_ProductCondition.cs - - - - 202002251510114_ManufacturerSubjectToAcl.cs - - - - 202002271206204_ShipmentTrackingUrl.cs - - - - 202003022018038_Merge8.cs - - - - 202003052100521_CustomerRoleMappings.cs - - - - 202003112359492_MediaManager2.cs - - - - 202003251118391_CategoryRuleSets.cs - - - - 202003171812584_CookieManager.cs - - - - 202003311314082_CookieManagerCountries.cs - - - - 202004301922188_RemoveCustomerCustomerRoles.cs - - - - 202005111006305_CampaignSubjectToAcl.cs - - - - 202005201826512_MediaManager3.cs - - - - 202006250801086_V400Resources.cs - - - - 202007160058551_MediaFileIndexReorg.cs - - - - 202007241131557_V401Resources.cs - - - - 202007291847004_NewPropertiesAndIndexes.cs - - - - 202007301117363_AddCustomerRoleOrderAmount.cs - - - - 202008181949580_RenamedCustomerRoleOrderTotal.cs - - - - 202009021705132_Merge9.cs - - - - 202009041122208_ShopIcons.cs - - - - 202009090817220_DeliveryTimeMinMaxDays.cs - - - - 202010011005387_TopicCookieType.cs - - - - 202010030939136_AttributeChoiceBehaviour.cs - - - - 202010121359446_RemoveBlogAndNewsLanguage.cs - - - - 202011091154314_V410Resources.cs - - - - 202012051645539_AddBlogAndNewsLanguage.cs - - - - 202101251149352_V411Resources.cs - - - - 202112171231491_V420Resources.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - - 201705281903241_MoreIndexes.cs - - - 201706020759565_UpdateMediaPath.cs - - - 201707190940318_V302Resources.cs - - - 201707281452589_TierPriceCalcMethod.cs - - - 201708251628482_SystemTopics.cs - - - 201709141000226_V303Resources.cs - - - 201709251538312_UpdateTrustedShopsTask.cs - - - 201710102038287_CurrencyRounding.cs - - - 201710252016556_IndexOptionNames.cs - - - 201711112331162_ProductMainPictureId.cs - - - 201711222311112_MoveFsMedia.cs - - - 201711291017168_SyncStringResources.cs - - - 201712081631552_Liquid.cs - - - 201712290151517_AddressFormat.cs - - - 201802081830029_ShippingMethodMultistore.cs - - - 201802270844034_ExportAttributeMappings.cs - - - 201804060721031_Wallet.cs - - - 201804090744324_ForceSslForAllPages.cs - - - 201804200835273_V310Resources.cs - - - 201804252356096_TopicSlugs.cs - - - 201805250724399_V315Resources.cs - - - 201806051221399_RefundReturnRequests.cs - - - 201806231547270_ScheduleTaskHistory.cs - - - 201807051830375_MoveCustomerFields.cs - - - 201807122120062_TopicAcl.cs - - - 201807191020207_OrderItemDeliveryTime.cs - - - 201807201157391_DownloadVersions.cs - - - 201807311708428_ProductPreviewPicture.cs - - - 201808051818238_Merge4.cs - - - 201809171309522_NewsletterSubscriptionLanguage.cs - - - 201809261026134_ForumGroupAcl.cs - - - 201810011954195_ForumPostVote.cs - - - 201810231214068_DataExchangeEnhancements.cs - - - 201811061745204_IsSystemProductIndex.cs - - - 201811082148279_LocalizedPropertyKeyGroupIndex.cs - - - 201811161142587_TaskHistoryErrorLength.cs - - - 201811202204501_ProductIndexSeekExport.cs - - - 201902211855242_TopicHtmlIdAndBodyCss.cs - - - 201904110735029_Menus.cs - - - 201905020948354_WidgetTopics.cs - - - 201905101159134_V320Resources.cs - - - 201905271110370_V321Resources.cs - - - 201906252008551_QuantityUnitNamePlural.cs - - - 201907032251575_CategoryExternalLink.cs - - - 201907250103367_RuleSystem.cs - - - 201907221803421_GranularPermissions.cs - - - 201908050758298_MoveFurtherCustomerFields.cs - - - 201908150749388_V322Resources.cs - - - 201908211821559_Merge5.cs - - - 201908211825244_ProductTagPublished.cs - - - 201908261226350_MenuItemMultistore.cs - - - 201909291043284_BlogAndNewsItemPictures.cs - - - 201910021805242_RemoveOldPermissions.cs - - - 201910162004581_Merge6.cs - - - 201911090805330_ProductVisibility.cs - - - 201911120909434_Merge7.cs - - - 201911141820264_ScheduleTaskPriority.cs - - - 201912051209105_MessageTemplateEmailAddress.cs - - - 201912111821362_AddNewPermissions.cs - - - 202001141118171_SpecificationAttributeColorAndPicture.cs - - - 202001221054109_ManufacturerBottomDescription.cs - - - 202001301039020_DiscountRuleSets.cs - - - 202002172101120_PictureMediaRename.cs - - - 202002180228163_PictureMediaRename1.cs - - - 202002280005340_MediaManager.cs - - - 202002191252074_RemoveDiscountRequirements.cs - - - 202002211011108_GenericMessageTemplate.cs - - - 202002241354543_ProductCondition.cs - - - 202002251510114_ManufacturerSubjectToAcl.cs - - - 202002271206204_ShipmentTrackingUrl.cs - - - 202003022018038_Merge8.cs - - - 202003052100521_CustomerRoleMappings.cs - - - 202003112359492_MediaManager2.cs - - - 202003251118391_CategoryRuleSets.cs - - - 202003171812584_CookieManager.cs - - - 202003311314082_CookieManagerCountries.cs - - - 202004301922188_RemoveCustomerCustomerRoles.cs - - - 202005111006305_CampaignSubjectToAcl.cs - - - 202005201826512_MediaManager3.cs - - - 202006250801086_V400Resources.cs - - - 202007160058551_MediaFileIndexReorg.cs - - - 202007241131557_V401Resources.cs - - - 202007291847004_NewPropertiesAndIndexes.cs - - - 202007301117363_AddCustomerRoleOrderAmount.cs - - - 202008181949580_RenamedCustomerRoleOrderTotal.cs - - - 202009021705132_Merge9.cs - - - 202009041122208_ShopIcons.cs - - - 202009090817220_DeliveryTimeMinMaxDays.cs - - - 202010011005387_TopicCookieType.cs - - - 202010030939136_AttributeChoiceBehaviour.cs - - - 202010121359446_RemoveBlogAndNewsLanguage.cs - - - 202011091154314_V410Resources.cs - - - 202012051645539_AddBlogAndNewsLanguage.cs - - - 202101251149352_V411Resources.cs - - - 202112171231491_V420Resources.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old-style b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old-style new file mode 100644 index 0000000000..99b131536b --- /dev/null +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old-style @@ -0,0 +1,1015 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144} + Library + Properties + SmartStore.Data + 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 + latest + + + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll + + + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + True + + + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + True + + + ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll + True + + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + True + ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.ConnectionInfo.dll + + + True + ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Management.Sdk.Sfc.dll + + + True + ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll + + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + + + + + True + ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + + + + + + + + + + Properties\AssemblySharedInfo.cs + + + Properties\AssemblyVersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 201705281903241_MoreIndexes.cs + + + + 201706020759565_UpdateMediaPath.cs + + + + 201707190940318_V302Resources.cs + + + + 201707281452589_TierPriceCalcMethod.cs + + + + 201708251628482_SystemTopics.cs + + + + 201709141000226_V303Resources.cs + + + + 201709251538312_UpdateTrustedShopsTask.cs + + + + 201710102038287_CurrencyRounding.cs + + + + 201710252016556_IndexOptionNames.cs + + + + 201711112331162_ProductMainPictureId.cs + + + + 201711222311112_MoveFsMedia.cs + + + + 201711291017168_SyncStringResources.cs + + + + 201712081631552_Liquid.cs + + + + 201712290151517_AddressFormat.cs + + + + 201802081830029_ShippingMethodMultistore.cs + + + + 201802270844034_ExportAttributeMappings.cs + + + + 201804060721031_Wallet.cs + + + + 201804090744324_ForceSslForAllPages.cs + + + + 201804200835273_V310Resources.cs + + + + 201804252356096_TopicSlugs.cs + + + + 201805250724399_V315Resources.cs + + + + 201806051221399_RefundReturnRequests.cs + + + + 201806231547270_ScheduleTaskHistory.cs + + + + 201807051830375_MoveCustomerFields.cs + + + + 201807122120062_TopicAcl.cs + + + + 201807191020207_OrderItemDeliveryTime.cs + + + + 201807201157391_DownloadVersions.cs + + + + 201807311708428_ProductPreviewPicture.cs + + + + 201808051818238_Merge4.cs + + + + 201809171309522_NewsletterSubscriptionLanguage.cs + + + + 201809261026134_ForumGroupAcl.cs + + + + 201810011954195_ForumPostVote.cs + + + + 201810231214068_DataExchangeEnhancements.cs + + + + 201811061745204_IsSystemProductIndex.cs + + + + 201811082148279_LocalizedPropertyKeyGroupIndex.cs + + + + 201811161142587_TaskHistoryErrorLength.cs + + + + 201811202204501_ProductIndexSeekExport.cs + + + + 201902211855242_TopicHtmlIdAndBodyCss.cs + + + + 201904110735029_Menus.cs + + + + 201905020948354_WidgetTopics.cs + + + + 201905101159134_V320Resources.cs + + + + 201905271110370_V321Resources.cs + + + + 201906252008551_QuantityUnitNamePlural.cs + + + + 201907032251575_CategoryExternalLink.cs + + + + 201907250103367_RuleSystem.cs + + + + 201908050758298_MoveFurtherCustomerFields.cs + + + + 201908150749388_V322Resources.cs + + + + 201907221803421_GranularPermissions.cs + + + + 201908211821559_Merge5.cs + + + + 201908211825244_ProductTagPublished.cs + + + + 201908261226350_MenuItemMultistore.cs + + + + 201909291043284_BlogAndNewsItemPictures.cs + + + + 201910021805242_RemoveOldPermissions.cs + + + + 201910162004581_Merge6.cs + + + + 201911090805330_ProductVisibility.cs + + + + 201911120909434_Merge7.cs + + + + 201911141820264_ScheduleTaskPriority.cs + + + + 201912051209105_MessageTemplateEmailAddress.cs + + + + 201912111821362_AddNewPermissions.cs + + + + 202001141118171_SpecificationAttributeColorAndPicture.cs + + + + 202001221054109_ManufacturerBottomDescription.cs + + + + 202001301039020_DiscountRuleSets.cs + + + + 202002172101120_PictureMediaRename.cs + + + + 202002180228163_PictureMediaRename1.cs + + + + 202002280005340_MediaManager.cs + + + + 202002191252074_RemoveDiscountRequirements.cs + + + + 202002211011108_GenericMessageTemplate.cs + + + + 202002241354543_ProductCondition.cs + + + + 202002251510114_ManufacturerSubjectToAcl.cs + + + + 202002271206204_ShipmentTrackingUrl.cs + + + + 202003022018038_Merge8.cs + + + + 202003052100521_CustomerRoleMappings.cs + + + + 202003112359492_MediaManager2.cs + + + + 202003251118391_CategoryRuleSets.cs + + + + 202003171812584_CookieManager.cs + + + + 202003311314082_CookieManagerCountries.cs + + + + 202004301922188_RemoveCustomerCustomerRoles.cs + + + + 202005111006305_CampaignSubjectToAcl.cs + + + + 202005201826512_MediaManager3.cs + + + + 202006250801086_V400Resources.cs + + + + 202007160058551_MediaFileIndexReorg.cs + + + + 202007241131557_V401Resources.cs + + + + 202007291847004_NewPropertiesAndIndexes.cs + + + + 202007301117363_AddCustomerRoleOrderAmount.cs + + + + 202008181949580_RenamedCustomerRoleOrderTotal.cs + + + + 202009021705132_Merge9.cs + + + + 202009041122208_ShopIcons.cs + + + + 202009090817220_DeliveryTimeMinMaxDays.cs + + + + 202010011005387_TopicCookieType.cs + + + + 202010030939136_AttributeChoiceBehaviour.cs + + + + 202010121359446_RemoveBlogAndNewsLanguage.cs + + + + 202011091154314_V410Resources.cs + + + + 202012051645539_AddBlogAndNewsLanguage.cs + + + + 202101251149352_V411Resources.cs + + + + 202112171231491_V420Resources.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {6bda8332-939f-45b7-a25e-7a797260ae59} + SmartStore.Core + + + + + 201705281903241_MoreIndexes.cs + + + 201706020759565_UpdateMediaPath.cs + + + 201707190940318_V302Resources.cs + + + 201707281452589_TierPriceCalcMethod.cs + + + 201708251628482_SystemTopics.cs + + + 201709141000226_V303Resources.cs + + + 201709251538312_UpdateTrustedShopsTask.cs + + + 201710102038287_CurrencyRounding.cs + + + 201710252016556_IndexOptionNames.cs + + + 201711112331162_ProductMainPictureId.cs + + + 201711222311112_MoveFsMedia.cs + + + 201711291017168_SyncStringResources.cs + + + 201712081631552_Liquid.cs + + + 201712290151517_AddressFormat.cs + + + 201802081830029_ShippingMethodMultistore.cs + + + 201802270844034_ExportAttributeMappings.cs + + + 201804060721031_Wallet.cs + + + 201804090744324_ForceSslForAllPages.cs + + + 201804200835273_V310Resources.cs + + + 201804252356096_TopicSlugs.cs + + + 201805250724399_V315Resources.cs + + + 201806051221399_RefundReturnRequests.cs + + + 201806231547270_ScheduleTaskHistory.cs + + + 201807051830375_MoveCustomerFields.cs + + + 201807122120062_TopicAcl.cs + + + 201807191020207_OrderItemDeliveryTime.cs + + + 201807201157391_DownloadVersions.cs + + + 201807311708428_ProductPreviewPicture.cs + + + 201808051818238_Merge4.cs + + + 201809171309522_NewsletterSubscriptionLanguage.cs + + + 201809261026134_ForumGroupAcl.cs + + + 201810011954195_ForumPostVote.cs + + + 201810231214068_DataExchangeEnhancements.cs + + + 201811061745204_IsSystemProductIndex.cs + + + 201811082148279_LocalizedPropertyKeyGroupIndex.cs + + + 201811161142587_TaskHistoryErrorLength.cs + + + 201811202204501_ProductIndexSeekExport.cs + + + 201902211855242_TopicHtmlIdAndBodyCss.cs + + + 201904110735029_Menus.cs + + + 201905020948354_WidgetTopics.cs + + + 201905101159134_V320Resources.cs + + + 201905271110370_V321Resources.cs + + + 201906252008551_QuantityUnitNamePlural.cs + + + 201907032251575_CategoryExternalLink.cs + + + 201907250103367_RuleSystem.cs + + + 201907221803421_GranularPermissions.cs + + + 201908050758298_MoveFurtherCustomerFields.cs + + + 201908150749388_V322Resources.cs + + + 201908211821559_Merge5.cs + + + 201908211825244_ProductTagPublished.cs + + + 201908261226350_MenuItemMultistore.cs + + + 201909291043284_BlogAndNewsItemPictures.cs + + + 201910021805242_RemoveOldPermissions.cs + + + 201910162004581_Merge6.cs + + + 201911090805330_ProductVisibility.cs + + + 201911120909434_Merge7.cs + + + 201911141820264_ScheduleTaskPriority.cs + + + 201912051209105_MessageTemplateEmailAddress.cs + + + 201912111821362_AddNewPermissions.cs + + + 202001141118171_SpecificationAttributeColorAndPicture.cs + + + 202001221054109_ManufacturerBottomDescription.cs + + + 202001301039020_DiscountRuleSets.cs + + + 202002172101120_PictureMediaRename.cs + + + 202002180228163_PictureMediaRename1.cs + + + 202002280005340_MediaManager.cs + + + 202002191252074_RemoveDiscountRequirements.cs + + + 202002211011108_GenericMessageTemplate.cs + + + 202002241354543_ProductCondition.cs + + + 202002251510114_ManufacturerSubjectToAcl.cs + + + 202002271206204_ShipmentTrackingUrl.cs + + + 202003022018038_Merge8.cs + + + 202003052100521_CustomerRoleMappings.cs + + + 202003112359492_MediaManager2.cs + + + 202003251118391_CategoryRuleSets.cs + + + 202003171812584_CookieManager.cs + + + 202003311314082_CookieManagerCountries.cs + + + 202004301922188_RemoveCustomerCustomerRoles.cs + + + 202005111006305_CampaignSubjectToAcl.cs + + + 202005201826512_MediaManager3.cs + + + 202006250801086_V400Resources.cs + + + 202007160058551_MediaFileIndexReorg.cs + + + 202007241131557_V401Resources.cs + + + 202007291847004_NewPropertiesAndIndexes.cs + + + 202007301117363_AddCustomerRoleOrderAmount.cs + + + 202008181949580_RenamedCustomerRoleOrderTotal.cs + + + 202009021705132_Merge9.cs + + + 202009041122208_ShopIcons.cs + + + 202009090817220_DeliveryTimeMinMaxDays.cs + + + 202010011005387_TopicCookieType.cs + + + 202010030939136_AttributeChoiceBehaviour.cs + + + 202010121359446_RemoveBlogAndNewsLanguage.cs + + + 202011091154314_V410Resources.cs + + + 202012051645539_AddBlogAndNewsLanguage.cs + + + 202101251149352_V411Resources.cs + + + 202112171231491_V420Resources.cs + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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.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/IExternalAuthenticationMethod.cs b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs index e7eed71acb..7212f3fe3a 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/IExternalAuthenticationMethod.cs @@ -1,6 +1,6 @@ //Contributor: Nicholas Mayne -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; namespace SmartStore.Services.Authentication.External diff --git a/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs b/src/Libraries/SmartStore.Services/Authentication/FormsAuthenticationService.cs index 626d002326..66de1e5e1f 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; diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs index 7e2d61978f..f08edde5fa 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PaidByRule.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core.Domain.Orders; using SmartStore.Rules; diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs index a4f14359d7..6b68322d4a 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedFromManufacturerRule.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core.Domain.Orders; using SmartStore.Rules; diff --git a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs index 379fa39e69..b77e26ce07 100644 --- a/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs +++ b/src/Libraries/SmartStore.Services/Cart/Rules/Impl/PurchasedProductRule.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using SmartStore.Core.Domain.Orders; using SmartStore.Rules; diff --git a/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs b/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs index b17f20784b..0c0a5e16b4 100644 --- a/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs +++ b/src/Libraries/SmartStore.Services/Cart/ValidatingCartEvent.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; diff --git a/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs b/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs index e4f1c20899..4df70a7455 100644 --- a/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs +++ b/src/Libraries/SmartStore.Services/Catalog/CategoryService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Collections; using SmartStore.Core; using SmartStore.Core.Caching; diff --git a/src/Libraries/SmartStore.Services/Catalog/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/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/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/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/IWidget.cs b/src/Libraries/SmartStore.Services/Cms/IWidget.cs index 935756d117..dcc462468a 100644 --- a/src/Libraries/SmartStore.Services/Cms/IWidget.cs +++ b/src/Libraries/SmartStore.Services/Cms/IWidget.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; namespace SmartStore.Services.Cms diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs index ae89d1d75b..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/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/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/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..9cde0b3489 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; 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/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/DynamicEntityHelper.cs b/src/Libraries/SmartStore.Services/DataExchange/Export/DynamicEntityHelper.cs index 946769b317..222cab0615 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; 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/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/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/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..3c61afedd9 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Infrastructure; using System.Drawing; using System.IO; 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/MediaSearcher.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs index ba0c18c8e4..6bd5642c97 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Dynamic.Core; using SmartStore.Linq; diff --git a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs index 0fd3e2f053..44621efd9b 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs @@ -1,6 +1,6 @@ using System; using System.Data.Common; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.Entity.Infrastructure; using System.Data.SqlClient; using System.IO; diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs index bd5b52efcf..15832d3613 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs @@ -1,7 +1,6 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; -using System.Web.UI; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Media; diff --git a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs index fae7b431e9..b80908e7f9 100644 --- a/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs +++ b/src/Libraries/SmartStore.Services/Media/Tracking/MediaTracker.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Core.Data; using SmartStore.Core.Domain.Media; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs index 0c1c48f8ab..561af5effe 100644 --- a/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs +++ b/src/Libraries/SmartStore.Services/Media/TransientMediaClearTask.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Threading.Tasks; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs b/src/Libraries/SmartStore.Services/Messages/CreateAttachmentsConsumer.cs index d3875f252d..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/MessageFactory.cs b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs index 7c2ab26c7b..7af4bce9f9 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageFactory.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using Newtonsoft.Json; diff --git a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs index 37045b041f..b315aa41da 100644 --- a/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs +++ b/src/Libraries/SmartStore.Services/Messages/MessageModelProvider.cs @@ -5,7 +5,7 @@ using System.Dynamic; using System.Linq; using System.Linq.Expressions; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Collections; using SmartStore.ComponentModel; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Services/Messages/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/OrderReportService.cs b/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs index a3e30eea97..dc3f882fd2 100644 --- a/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs +++ b/src/Libraries/SmartStore.Services/Orders/OrderReportService.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Globalization; using System.Linq; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs b/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs index 2b439f7b26..114cb406f4 100644 --- a/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs +++ b/src/Libraries/SmartStore.Services/Payments/IPaymentMethod.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Plugins; diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs b/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs index f157ef74d9..42fc4ff667 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentExtentions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Plugins; diff --git a/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs b/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs index bfa3fd2948..00919a0d21 100644 --- a/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs +++ b/src/Libraries/SmartStore.Services/Payments/PaymentMethodBase.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Localization; using SmartStore.Core.Plugins; diff --git a/src/Libraries/SmartStore.Services/Pdf/Content/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/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..8703de4cf9 100644 --- a/src/Libraries/SmartStore.Services/Security/PermissionService.cs +++ b/src/Libraries/SmartStore.Services/Security/PermissionService.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Runtime.CompilerServices; using SmartStore.Collections; diff --git a/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs b/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs index 7e75a9f4fa..9a43d2bac6 100644 --- a/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs +++ b/src/Libraries/SmartStore.Services/Seo/IXmlSitemapPublisher.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Seo; diff --git a/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs b/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs index 088ed43b75..528815157b 100644 --- a/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs +++ b/src/Libraries/SmartStore.Services/Seo/XmlSitemapGenerator.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.Linq; using System.Threading; -using System.Data.Entity; -using System.Web.Mvc; +using Microsoft.EntityFrameworkCore; +using Microsoft.AspNetCore.Mvc; using System.Xml.Linq; using System.IO; using System.Threading.Tasks; diff --git a/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs b/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs index 52f1a590fb..ee34d108f5 100644 --- a/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs +++ b/src/Libraries/SmartStore.Services/Shipping/IShippingRateComputationMethod.cs @@ -1,4 +1,4 @@ -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.Services.Shipping.Tracking; diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 377945466a..ef602bf6ee 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -1,845 +1,39 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {210541AD-F659-47DA-8763-16F36C5CD2F4} - Library - Properties + net8.0 SmartStore.Services SmartStore.Services - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 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 + false latest + disable - - - ..\..\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/MIGRATION_STATUS.md b/src/MIGRATION_STATUS.md new file mode 100644 index 0000000000..702f7bdf43 --- /dev/null +++ b/src/MIGRATION_STATUS.md @@ -0,0 +1,178 @@ +# .NET Framework to .NET 8 Migration Status + +## Completed Steps + +### 1. Global Search-and-Replace Operations ✅ +- Removed `[AllowHtml]` attributes from all files +- Removed `[Index]` attributes from all entity classes +- Removed `[assembly: PreApplicationStartMethod]` attributes +- Replaced using statements: + - `System.Web.Mvc` → `Microsoft.AspNetCore.Mvc` + - `System.Web.Routing` → `Microsoft.AspNetCore.Routing` + - `System.Web.Hosting` → `Microsoft.AspNetCore.Hosting` + - `System.Web.Caching` → `Microsoft.Extensions.Caching.Memory` + - `System.Web.SessionState` → `Microsoft.AspNetCore.Http` + - `System.Web.Security` → `Microsoft.AspNetCore.Identity` + - `System.Runtime.Caching` → `Microsoft.Extensions.Caching.Memory` + - `System.Runtime.Remoting.Messaging` → `System.Threading` + - `System.Data.Entity` → `Microsoft.EntityFrameworkCore` + - `AngleSharp.Parser.Html` → `AngleSharp.Html.Parser` + - `AngleSharp.Extensions` → `AngleSharp.Html.Dom` + - `Ganss.XSS` → `Ganss.Xss` +- Deleted obsolete using statements: + - `System.Data.SqlServerCe` + - `Microsoft.Web.Infrastructure` + - `System.Web.UI` + - `System.Web.Compilation` + - `System.Web.Configuration` +- Replaced type names: + - `DbEntityEntry` → `EntityEntry` + - `CacheItemPolicy` → `MemoryCacheEntryOptions` + +### 2. Project File Conversion ✅ +Converted all projects from old-style .csproj to SDK-style: +- SmartStore.Core +- SmartStore.Data +- SmartStore.Services +- SmartStore.Web.Framework +- SmartStore.Web +- SmartStore.Admin +- SmartStore.Tax +- SmartStore.Shipping +- SmartStore.DevTools +- SmartStore.OfflinePayment + +### 3. Package Updates ✅ +- Updated to .NET 8 compatible packages +- Fixed package version conflicts: + - HtmlSanitizer 9.0.873 + - AngleSharp 1.1.2 + - MaxMind.GeoIP2 5.3.0 (downgraded from 6.1.0 which doesn't exist) + - SixLabors.ImageSharp 3.1.7 + - System.Linq.Dynamic.Core 1.4.8 +- Removed legacy imports from .csproj files + +### 4. Target Framework ✅ +All projects now target `net8.0` + +## Remaining Compilation Errors + +### Critical Issues Requiring Manual Migration + +#### 1. System.Web Types (High Priority) +Files using these types need manual conversion: +- `HttpContextBase` → `HttpContext` +- `HttpRequestBase` → `HttpRequest` +- `HttpResponseBase` → `HttpResponse` +- `HttpSessionStateBase` → `ISession` +- `HttpCookieCollection` → `IRequestCookieCollection` / `IResponseCookies` +- `SessionStateItemCollection` → Session extensions +- `IHttpHandler` → Middleware or endpoint +- `IHttpModule` → Middleware +- `RequestContext` → `HttpContext` + +**Affected Files:** +- `/Libraries/SmartStore.Core/Caching/RequestCache.cs` +- `/Libraries/SmartStore.Core/Fakes/*.cs` (entire Fakes directory) +- `/Libraries/SmartStore.Core/Events/CommonMessages/*.cs` +- `/Libraries/SmartStore.Core/WebHelper.cs` +- `/Libraries/SmartStore.Core/IWebHelper.cs` + +#### 2. Entity Framework 6 → EF Core (High Priority) +- Remove `System.Data.Entity` references +- Update `DbContext` constructors to accept `DbContextOptions` +- Replace `DbModelBuilder` with `ModelBuilder` +- Remove `IObjectContextAdapter` usage + +**Affected Files:** +- `/Libraries/SmartStore.Core/BaseEntity.cs` +- `/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs` +- `/Libraries/SmartStore.Core/Data/IDbContext.cs` +- `/Libraries/SmartStore.Core/PagedList`T.cs` + +#### 3. NuGet.Core → NuGet.Protocol (Medium Priority) +Old NuGet v2 API needs migration to v3: +- `IPackage` → `IPackageSearchMetadata` +- `IPackageRepository` → `SourceRepository` +- `PackageRepositoryBase` → Custom implementation +- `IProjectSystem` → File system operations +- `ILogger` → `NuGet.Common.ILogger` + +**Affected Files:** +- `/Libraries/SmartStore.Core/Packaging/NuGet/*.cs` (entire directory) +- `/Libraries/SmartStore.Core/Packaging/PackageBuilder.cs` +- `/Libraries/SmartStore.Core/Packaging/PackageInstaller.cs` +- `/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs` + +#### 4. Autofac Integration (Medium Priority) +- `Autofac.Integration.Mvc` → `Autofac.Extensions.DependencyInjection` +- `ILifetimeScopeProvider` → `IServiceScopeFactory` +- `AutofacRequestLifetimeHttpModule` → Middleware + +**Affected Files:** +- `/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/AutofacRequestLifetimeHttpModule.cs` +- `/Libraries/SmartStore.Core/Infrastructure/DependencyManagement/DefaultLifetimeScopeProvider.cs` +- `/Libraries/SmartStore.Core/Infrastructure/SmartStoreEngine.cs` + +#### 5. Legacy Infrastructure (Medium Priority) +- `IRegisteredObject` → `IHostedService` +- `GlobalFilterCollection` → Remove (filters in Program.cs) +- `IAuthenticationFilter` → Remove (use middleware) +- `AuthenticationContext` → Remove +- `AuthenticationChallengeContext` → Remove + +**Affected Files:** +- `/Libraries/SmartStore.Core/Async/AsyncRunner.cs` +- `/Libraries/SmartStore.Core/Logging/log4net/Log4netLoggerFactory.cs` +- `/Libraries/SmartStore.Core/Infrastructure/ApplicationStart.cs` +- `/Libraries/SmartStore.Core/Events/CommonMessages/AppRegisterGlobalFiltersEvent.cs` + +#### 6. ASP.NET Core Identity (Low Priority) +- Add `Microsoft.AspNetCore.Identity` package +- Update authentication/authorization code + +**Affected Files:** +- `/Libraries/SmartStore.Core/Extensions/HttpExtensions.cs` +- `/Libraries/SmartStore.Core/Security/SmartStorePrincipal.cs` + +## Recommended Next Steps + +### Phase 1: Core Infrastructure (Priority 1) +1. Comment out or stub the Fakes directory classes (test helpers) +2. Comment out NuGet packaging functionality temporarily +3. Fix Entity Framework DbContext issues +4. Fix WebHelper and IWebHelper + +### Phase 2: Autofac and DI (Priority 2) +1. Update Autofac integration +2. Convert IHttpModule to middleware +3. Replace IRegisteredObject with IHostedService + +### Phase 3: Authentication and Security (Priority 3) +1. Add ASP.NET Core Identity packages +2. Update authentication code +3. Update authorization filters + +### Phase 4: Testing and Validation (Priority 4) +1. Restore test helper classes +2. Implement NuGet v3 API if needed +3. Full solution build verification + +## Build Command +```bash +cd /data/code/src +dotnet build SmartStoreNET.Minimal.sln +``` + +## Current Error Count +Approximately 100+ compilation errors remaining, primarily in: +- SmartStore.Core (majority of errors) +- SmartStore.Data (EF Core migration) +- SmartStore.Services (depends on Core) + +## Estimated Effort +- Phase 1: 4-6 hours +- Phase 2: 2-3 hours +- Phase 3: 2-3 hours +- Phase 4: 2-4 hours +**Total: 10-16 hours of focused development work** 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..4b3c52a4e4 100644 --- a/src/Plugins/SmartStore.AmazonPay/Models/ConfigurationModel.cs +++ b/src/Plugins/SmartStore.AmazonPay/Models/ConfigurationModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.AmazonPay.Services; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Plugins/SmartStore.AmazonPay/Plugin.cs b/src/Plugins/SmartStore.AmazonPay/Plugin.cs index 8b6904f964..16800a30b7 100644 --- a/src/Plugins/SmartStore.AmazonPay/Plugin.cs +++ b/src/Plugins/SmartStore.AmazonPay/Plugin.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.AmazonPay.Controllers; using SmartStore.AmazonPay.Services; using SmartStore.Core.Domain.Cms; diff --git a/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs b/src/Plugins/SmartStore.AmazonPay/RouteProvider.cs index 3cfe49b1b8..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..5fbf58fd7f 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; 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/SmartStore.AmazonPay.csproj b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj index 90e38591eb..63a3fae6ab 100644 --- a/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj +++ b/src/Plugins/SmartStore.AmazonPay/SmartStore.AmazonPay.csproj @@ -278,8 +278,6 @@ - - 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.Clickatell/SmartStore.Clickatell.csproj b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj index a7ccb144e0..e6959bd80e 100644 --- a/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj +++ b/src/Plugins/SmartStore.Clickatell/SmartStore.Clickatell.csproj @@ -201,10 +201,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - 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/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..93b6b0ba73 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -1,357 +1,24 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {542B9C12-E2A1-49BB-9134-0E3484F9D669} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.DevTools SmartStore.DevTools - v4.7.2 - 512 - - ..\..\ - true - true - - - 4.0 - true - - - - - - - + false + latest + disable - - 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 - - - - ..\..\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.DevTools/Starter.cs b/src/Plugins/SmartStore.DevTools/Starter.cs index 9a186299a8..ef2938bad2 100644 --- a/src/Plugins/SmartStore.DevTools/Starter.cs +++ b/src/Plugins/SmartStore.DevTools/Starter.cs @@ -1,5 +1,4 @@ using System; -using Microsoft.Web.Infrastructure.DynamicModuleHelper; using SmartStore.Core.Infrastructure; using SmartStore.Web.Framework; using StackExchange.Profiling; diff --git a/src/Plugins/SmartStore.FacebookAuth/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/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.FacebookAuth/SmartStore.FacebookAuth.csproj b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj index 7696d4a5f8..12877d6138 100644 --- a/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj +++ b/src/Plugins/SmartStore.FacebookAuth/SmartStore.FacebookAuth.csproj @@ -261,10 +261,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - diff --git a/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs index 86d04f21c1..61a96c1744 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs +++ b/src/Plugins/SmartStore.GoogleAnalytics/Controllers/WidgetsGoogleAnalyticsController.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Linq; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Domain.Orders; diff --git a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs index 017ce39426..ef155a7c2b 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs +++ b/src/Plugins/SmartStore.GoogleAnalytics/GoogleAnalyticPlugin.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Cms; using SmartStore.Core.Plugins; using SmartStore.GoogleAnalytics.Services; diff --git a/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs b/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs index 8796b44e6f..7c03a71ea4 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs +++ b/src/Plugins/SmartStore.GoogleAnalytics/Models/ConfigurationModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -19,20 +19,16 @@ public ConfigurationModel() [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.GoogleId")] - [AllowHtml] public string GoogleId { get; set; } [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.TrackingScript")] - [AllowHtml] //tracking code public string TrackingScript { get; set; } [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.EcommerceScript")] - [AllowHtml] public string EcommerceScript { get; set; } [SmartResourceDisplayName("Plugins.Widgets.GoogleAnalytics.EcommerceDetailScript")] - [AllowHtml] public string EcommerceDetailScript { get; set; } } diff --git a/src/Plugins/SmartStore.GoogleAnalytics/RouteProvider.cs b/src/Plugins/SmartStore.GoogleAnalytics/RouteProvider.cs index 2c37b5fe76..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.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj index 0c2de95d4b..17bafcb670 100644 --- a/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj +++ b/src/Plugins/SmartStore.GoogleAnalytics/SmartStore.GoogleAnalytics.csproj @@ -195,10 +195,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs index 1b20158c12..c8653282af 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Controllers/FeedGoogleMerchantCenterController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Common; using SmartStore.GoogleMerchantCenter.Models; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs index e4700a9642..3913521410 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Data/GoogleProductObjectContext.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Data; using SmartStore.Data.Setup; using SmartStore.GoogleMerchantCenter.Data.Migrations; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs index 46fdc6a4f9..7945306f45 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Domain/GoogleProductRecord.cs @@ -14,7 +14,6 @@ public GoogleProductRecord() Export = true; } - [Index] public int ProductId { get; set; } public string Taxonomy { get; set; } @@ -26,12 +25,10 @@ public GoogleProductRecord() public string Pattern { get; set; } public string ItemGroupId { get; set; } - [Index] public bool IsTouched { get; set; } public DateTime CreatedOnUtc { get; set; } public DateTime UpdatedOnUtc { get; set; } - [Index] public bool Export { get; set; } public int Multipack { get; set; } diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs index 19cea6a178..22cd5759f1 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/GoogleMerchantCenterFeedPlugin.cs @@ -1,5 +1,5 @@ using System.Data.Entity.Migrations; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Plugins; using SmartStore.GoogleMerchantCenter.Data.Migrations; using SmartStore.GoogleMerchantCenter.Providers; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs index 3d5f89eda8..016f9ffc21 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/ProfileConfigurationModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Xml.Serialization; using FluentValidation; using FluentValidation.Attributes; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs index 6220b658da..e8caf74457 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/Providers/GmcXmlExportProvider.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Xml; using SmartStore.Collections; using SmartStore.Core.Domain.Catalog; diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/RouteProvider.cs index 32b09e96ef..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/SmartStore.GoogleMerchantCenter.csproj b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj index b6ee05227a..900699ced1 100644 --- a/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj +++ b/src/Plugins/SmartStore.GoogleMerchantCenter/SmartStore.GoogleMerchantCenter.csproj @@ -309,10 +309,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - 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..c63c5810ed 100644 --- a/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs +++ b/src/Plugins/SmartStore.OfflinePayment/Models/PaymentInfoModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using SmartStore.Core.Localization; using SmartStore.Web.Framework; @@ -66,30 +66,24 @@ public ManualPaymentInfoModel() } [SmartResourceDisplayName("Payment.SelectCreditCard")] - [AllowHtml] public string CreditCardType { get; set; } [SmartResourceDisplayName("Payment.SelectCreditCard")] public IList CreditCardTypes { get; set; } [SmartResourceDisplayName("Payment.CardholderName")] - [AllowHtml] public string CardholderName { get; set; } [SmartResourceDisplayName("Payment.CardNumber")] - [AllowHtml] public string CardNumber { get; set; } [SmartResourceDisplayName("Payment.ExpirationDate")] - [AllowHtml] public string ExpireMonth { get; set; } [SmartResourceDisplayName("Payment.ExpirationDate")] - [AllowHtml] public string ExpireYear { get; set; } public IList ExpireMonths { get; set; } public IList ExpireYears { get; set; } [SmartResourceDisplayName("Payment.CardCode")] - [AllowHtml] public string CardCode { get; set; } } @@ -104,7 +98,6 @@ public class PrepaymentPaymentInfoModel : PaymentInfoModelBase public class PurchaseOrderNumberPaymentInfoModel : PaymentInfoModelBase { [SmartResourceDisplayName("Plugins.Payments.PurchaseOrder.PurchaseOrderNumber")] - [AllowHtml] public string PurchaseOrderNumber { get; set; } } diff --git a/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs b/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs index bfcb3744d3..235f5b310d 100644 --- a/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs +++ b/src/Plugins/SmartStore.OfflinePayment/Providers/ManualProvider.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Plugins; using SmartStore.OfflinePayment.Settings; diff --git a/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs b/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs index d5ed1a3a59..5052573d78 100644 --- a/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs +++ b/src/Plugins/SmartStore.OfflinePayment/Providers/OfflinePaymentProviderBase.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Configuration; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Payments; diff --git a/src/Plugins/SmartStore.OfflinePayment/RouteProvider.cs b/src/Plugins/SmartStore.OfflinePayment/RouteProvider.cs index 2960e936a4..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..3a9c641b68 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -1,271 +1,24 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {692E9D31-1393-47BF-B372-63F671052F89} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.OfflinePayment SmartStore.OfflinePayment - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - + false + latest + disable - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + + - - Always - - - PreserveNewest - - - Designer - Always - - - Designer - Always - + + - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51143 - / - http://localhost:56865/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalControllerBase.cs index b1722773e2..e984ee9ac6 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; 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/PayPalDirectPaymentInfoModel.cs b/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs index cd001f5558..06903dc4f6 100644 --- a/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs +++ b/src/Plugins/SmartStore.PayPal/Models/PayPalDirectPaymentInfoModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using SmartStore.Core.Localization; using SmartStore.Web.Framework; @@ -18,33 +18,27 @@ public PayPalDirectPaymentInfoModel() } [SmartResourceDisplayName("Payment.SelectCreditCard")] - [AllowHtml] public string CreditCardType { get; set; } [SmartResourceDisplayName("Payment.SelectCreditCard")] public IList CreditCardTypes { get; set; } [SmartResourceDisplayName("Payment.CardholderName")] - [AllowHtml] public string CardholderName { get; set; } [SmartResourceDisplayName("Payment.CardNumber")] - [AllowHtml] public string CardNumber { get; set; } [SmartResourceDisplayName("Payment.ExpirationDate")] - [AllowHtml] public string ExpireMonth { get; set; } [SmartResourceDisplayName("Payment.ExpirationDate")] - [AllowHtml] public string ExpireYear { get; set; } public IList ExpireMonths { get; set; } public IList ExpireYears { get; set; } [SmartResourceDisplayName("Payment.CardCode")] - [AllowHtml] public string CardCode { get; set; } } diff --git a/src/Plugins/SmartStore.PayPal/Plugin.cs b/src/Plugins/SmartStore.PayPal/Plugin.cs index 5379e80504..1428298bfe 100644 --- a/src/Plugins/SmartStore.PayPal/Plugin.cs +++ b/src/Plugins/SmartStore.PayPal/Plugin.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Logging; using SmartStore.Core.Plugins; using SmartStore.PayPal.Providers; diff --git a/src/Plugins/SmartStore.PayPal/Providers/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..aa2fde680c 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; diff --git a/src/Plugins/SmartStore.PayPal/RouteProvider.cs b/src/Plugins/SmartStore.PayPal/RouteProvider.cs index 01da8fd84d..920859cec4 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 diff --git a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj index ee1b597454..00ffcd9d35 100644 --- a/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj +++ b/src/Plugins/SmartStore.PayPal/SmartStore.PayPal.csproj @@ -542,10 +542,7 @@ bin\ - - - 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/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..8752da86b8 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -1,275 +1,20 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {ACC1E122-B2C8-4441-BDED-D4A77763331A} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Shipping SmartStore.Shipping - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - + false + latest + disable - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ - TRACE - prompt - 4 - false - - - true - ..\..\Presentation\SmartStore.Web\bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - 201403072202413_Initial.cs - - - - - - - - - - - - - - - + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + + + - - - 201403072202413_Initial.cs - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - Designer - PreserveNewest - - - Designer - PreserveNewest - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51377 - / - http://localhost:53076/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs b/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs index 3012800f78..ecdb55139c 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs +++ b/src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs @@ -1,6 +1,6 @@ using System; using System.Data.Entity.Migrations; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Domain.Tax; diff --git a/src/Plugins/SmartStore.ShippingByWeight/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/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.ShippingByWeight/SmartStore.ShippingByWeight.csproj b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj index f0c9004047..b43330ef95 100644 --- a/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj +++ b/src/Plugins/SmartStore.ShippingByWeight/SmartStore.ShippingByWeight.csproj @@ -260,10 +260,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - 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/TaxRateObjectContext.cs b/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs index 76f79510e0..5786ab1d73 100644 --- a/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs +++ b/src/Plugins/SmartStore.Tax/Data/TaxRateObjectContext.cs @@ -1,4 +1,4 @@ -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Data; using SmartStore.Data.Setup; using SmartStore.Tax.Data.Migrations; diff --git a/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs b/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs index 65e6053f46..3741198c8b 100644 --- a/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs +++ b/src/Plugins/SmartStore.Tax/Models/ByRegionTaxRateListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs b/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs index 8a2c010e64..cd7c65cc95 100644 --- a/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs +++ b/src/Plugins/SmartStore.Tax/Providers/ByRegionTaxProvider.cs @@ -1,5 +1,5 @@ using System.Linq; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Plugins; using SmartStore.Services.Configuration; diff --git a/src/Plugins/SmartStore.Tax/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/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 4f0f0c8a61..724e7b9115 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -1,277 +1,20 @@ - - - - - - False - - - False - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {94D1BEEB-64A3-4EB6-9017-D66AFAF4F2B2} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Tax SmartStore.Tax - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - 4.0 - true - - - - - - - - - + false + latest + disable - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ - TRACE - prompt - 4 - false - - - true - ..\..\Presentation\SmartStore.Web\bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - 201403112350417_Initial.cs - - - - - - - - - - - - - - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - - + - - PreserveNewest - - - Designer - Always - - - Designer - Always - + + - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + - - - 201403112350417_Initial.cs - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51143 - / - http://localhost:56865/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.WebApi/Controllers/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/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/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/SmartStore.WebApi.csproj b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj index 0c5eab97ec..6881e1b9e3 100644 --- a/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj +++ b/src/Plugins/SmartStore.WebApi/SmartStore.WebApi.csproj @@ -381,10 +381,7 @@ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - 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/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..09bee1b424 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; 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..700d0a9704 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlSelectListExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Stores; diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HtmlZoneExtensions.cs index 9677aa41a9..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..e7a95895b2 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/TelerikExtensions.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Telerik.Web.Mvc; using Telerik.Web.Mvc.Extensions; using Telerik.Web.Mvc.UI.Fluent; diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs index e88283e4f3..d363115a89 100644 --- a/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Extensions/UrlHelperExtensions.cs @@ -1,5 +1,5 @@ using System.Runtime.CompilerServices; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Infrastructure; using SmartStore.Services.Cms; using SmartStore.Services.Media; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs index ed1663b5be..c54e068d09 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CheckAffiliateAttribute.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Services.Affiliates; using SmartStore.Services.Customers; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs index 6ce3ae8ce2..4e52585358 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CompressAttribute.cs @@ -1,5 +1,5 @@ using System.IO.Compression; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.Filters { diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs index ca99c83119..72a2377832 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CookieConsentFilter.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Core.Domain.Customers; using SmartStore.Services; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs index d0ecd40b0c..b5ad83c33b 100644 --- a/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Filters/CustomerLastActivityAttribute.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Services.Customers; diff --git a/src/Presentation/SmartStore.Web.Framework/Filters/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/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..e17832e8f3 100644 --- a/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/Modelling/ModelBase.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Core.Infrastructure; diff --git a/src/Presentation/SmartStore.Web.Framework/Modelling/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/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..1810e43b00 100644 --- a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Plugins; using SmartStore.Services.Payments; using SmartStore.Web.Framework.Localization; @@ -18,11 +18,9 @@ public class ProviderModel : ModelBase, ILocalizedModel public string SystemName { get; set; } [SmartResourceDisplayName("Common.FriendlyName")] - [AllowHtml] public string FriendlyName { get; set; } [SmartResourceDisplayName("Common.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -68,11 +66,9 @@ public class ProviderLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Common.FriendlyName")] - [AllowHtml] public string FriendlyName { get; set; } [SmartResourceDisplayName("Common.Description")] - [AllowHtml] public string Description { get; set; } } diff --git a/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs b/src/Presentation/SmartStore.Web.Framework/Routing/GuidConstraint.cs index b936aaad1e..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..67215c8827 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; 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..1a38eef133 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,12 @@ namespace SmartStore.Web.Framework.Seo public interface ISeoModel : ILocalizedModel { [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] string MetaTitle { get; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] string MetaDescription { get; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] string MetaKeywords { get; } } @@ -23,15 +20,12 @@ public class SeoModelLocal : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } } } diff --git a/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs index f17ffe3e30..70b3917475 100644 --- a/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Seo/RewriteUrlAttribute.cs @@ -1,7 +1,7 @@ using System; -using System.Web.Hosting; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Security; diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs index 9ab06a0c57..c0d7f9b858 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/LoadSettingAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Configuration; using SmartStore.Services; using SmartStore.Web.Framework.Controllers; diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs b/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs index e84d13adb9..f3881ea581 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/SaveSettingAttribute.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.Settings { diff --git a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs index 9c1adb51de..19536aa6b9 100644 --- a/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs +++ b/src/Presentation/SmartStore.Web.Framework/Settings/StoreDependingSettingHelper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core.Infrastructure; using SmartStore.Services.Configuration; diff --git a/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs b/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs index a38bedbe52..315c9f8324 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs +++ b/src/Presentation/SmartStore.Web.Framework/SmartDependencyResolver.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Infrastructure; namespace SmartStore.Web.Framework diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj index 3af5f9ff89..8cfdfb2770 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -1,521 +1,35 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {75FD4163-333C-4DD5-854D-2EF294E45D94} - Library - Properties + net8.0 SmartStore.Web.Framework SmartStore.Web.Framework - v4.7.2 - 512 - - - - - - - - - - ..\..\ - true - - - - - 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 + false + latest + disable + - - ..\..\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..730bcf64a8 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Text; using System.Web; -using System.Web.Caching; -using System.Web.Hosting; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.AspNetCore.Hosting; using System.Web.Optimization; using SmartStore.Core; using SmartStore.Core.Domain.Themes; 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/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..1834212326 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; 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/ThemeHtmlExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs index 2933507b6a..1dd4624584 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeHtmlExtensions.cs @@ -1,7 +1,7 @@ using System.IO; using System.Linq; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; using SmartStore.Core; using SmartStore.Core.Infrastructure; diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/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/Choices/ChoiceModel.cs b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs index a2b7832a02..912209b575 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Choices/ChoiceModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs index c983dee479..66e7271bde 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Component.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentBuilder.cs index e6029660ad..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..dc2e8502e6 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs @@ -1,8 +1,7 @@ using System; using System.IO; using System.Web; -using System.Web.Mvc; -using System.Web.UI; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs index 842771f5d5..b440b3bcb5 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/EntityPicker/EntityPickerBuilder.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs index e2d5dfb4a6..f0bdcc1e12 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/FileUploader/FileUploaderBuilder.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Infrastructure; using SmartStore.Services.Media; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/HtmlHelperExtensions.cs index 21a87bc743..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/MenuRenderer.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs index 668233de1d..a351dc2081 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Menu/MenuRenderer.cs @@ -1,5 +1,4 @@ using System.Web.Mvc.Html; -using System.Web.UI; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/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..3d87e2a777 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; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/Components/NavigationItemBuilder.cs index 7242fec0a5..65cf2795f8 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; 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..e4bfa3af92 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; -using System.Web.UI; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/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..3bd1b2e375 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Window/WindowRenderer.cs @@ -1,4 +1,3 @@ -using System.Web.UI; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/DataListExtensions.cs index edf98c825f..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..23d2205bc8 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; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs index a6265fed86..e8434a81e0 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/RouteValueDictionaryExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs index 4528787f3a..6fc60ff988 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Extensions/ScaffoldExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.WebPages; using SmartStore.Core.Infrastructure; using SmartStore.Core.Localization; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs b/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs index 2b25a4990f..7d6a7c1415 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/INavigatable.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs index 34275c7e53..c181defa0c 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/IPageAssetsBuilder.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs b/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs index 5c5c3bed07..e9e122a8dd 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/IWidgetProvider.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; namespace SmartStore.Web.Framework.UI { diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs index b1f392bfd0..04efcc2553 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/DatabaseMenu.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Collections; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs index c0c8b54525..9dc50d20c7 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/IMenu.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Collections; namespace SmartStore.Web.Framework.UI diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs index 1b96e73908..aac1bc8ab0 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuBase.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Collections; using SmartStore.Core.Logging; using SmartStore.Services; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuFilter.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuFilter.cs index 71a066ead8..8d35fc08a6 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuFilter.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/MenuFilter.cs @@ -1,4 +1,4 @@ -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Collections; using SmartStore.Services.Cms; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs index 84d4ee3c9a..22a1c69383 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Menus/Providers/CatalogMenuInvalidator.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Threading.Tasks; using SmartStore.Core.Caching; diff --git a/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs b/src/Presentation/SmartStore.Web.Framework/UI/PageAssetsBuilder.cs index a80b0957b2..80f798c953 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 Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using System.Web.Optimization; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using SmartStore.Core; using SmartStore.Core.Domain.Seo; 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/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/Administration/Controllers/ActivityLogController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs index 72d300503a..6b171ec176 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ActivityLogController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Logging; using SmartStore.Core.Domain.Common; using SmartStore.Core.Logging; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs index 30ca59f8d1..6fd7ae2546 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/AdminModelHelper.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Tasks; using SmartStore.Core.Domain.Tasks; using SmartStore.Core.Localization; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs index 9bc3eb4767..0610bc2c5d 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/AffiliateController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Affiliates; using SmartStore.Core; using SmartStore.Core.Domain.Affiliates; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs index c667c02534..f0a4db2a7a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/BlogController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Blogs; using SmartStore.Core; using SmartStore.Core.Domain.Blogs; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs index b191665c68..9df1939d2b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CampaignController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Messages; using SmartStore.Core.Domain.Messages; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs index 97ae996019..552644fbac 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CategoryController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Catalog; using SmartStore.Collections; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs index 26dbe34655..f236382ab3 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CheckoutAttributeController.cs @@ -1,5 +1,5 @@ using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Orders; using SmartStore.Core; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CommonController.cs index 88b2d90188..d81d83e066 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; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs index 005c2da204..8baeebd24e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CountryController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Directory; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs index 1af8691b17..15b9439cea 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CurrencyController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Directory; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Stores; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs index de3b8b4ea6..028b23db94 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerController.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.Linq; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Admin.Models.Common; using SmartStore.Admin.Models.Customers; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs index 301385d5ef..ff31bec95d 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/CustomerRoleController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Customers; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs index 7389e35ab2..46e427f247 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DeliveryTimeController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Directory; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs index 5774588a6a..a26505d907 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DiscountController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Discounts; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Discounts; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs index 10bd3ba9a0..e6a50cb53c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/DownloadController.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; using SmartStore.Services.Media; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs index 9920ce7aaf..d331b7c479 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/EmailAccountController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Messages; using SmartStore.Core; using SmartStore.Core.Domain.Messages; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs index 66b1a53782..966d56f5ca 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ExportController.cs @@ -5,7 +5,7 @@ using System.Net; using System.Net.Mime; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.DataExchange; using SmartStore.Admin.Models.Tasks; using SmartStore.ComponentModel; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs index ea0763504a..137763760f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ExternalAuthenticationController.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.ExternalAuthentication; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs index 2a653819b3..516595e531 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ForumController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Forums; using SmartStore.Core.Domain.Forums; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs index deb1953217..d00fb22aff 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/GiftCardController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Orders; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Localization; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs index f3ff837d51..01a185f900 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/HomeController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Net; using System.ServiceModel.Syndication; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Xml; using SmartStore.Admin.Models.Common; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs index 545329ad23..f3c96b0563 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ImportController.cs @@ -5,7 +5,7 @@ using System.Net; using System.Net.Mime; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.DataExchange; using SmartStore.Admin.Models.Tasks; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs index 5d2e461e6d..2743eb76d5 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/LanguageController.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Globalization; using System.IO; using System.Linq; @@ -10,7 +10,7 @@ using System.Net.Mime; using System.Threading; using System.Threading.Tasks; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Xml; using Autofac; using Newtonsoft.Json; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs index 85ad040de2..6919524d20 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/LogController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Logging; using SmartStore.Core; using SmartStore.Core.Logging; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs index adf4288a47..946eac2e64 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Catalog; using SmartStore.Collections; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs index e6766f0357..83055a5bfb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MeasureController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Directory; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs index 3fb02881b6..558001dec3 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MediaController.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using SmartStore.Core.Domain.Media; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs index 8901d0677f..472adf4afb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MenuController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Menus; using SmartStore.ComponentModel; using SmartStore.Core.Data; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs index a93f275fa9..c255e8ff1f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/MessageTemplateController.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using System.Web.Caching; -using System.Web.Mvc; +using Microsoft.Extensions.Caching.Memory; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Messages; using SmartStore.Core.Domain.Messages; using SmartStore.Core.Email; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs index 5425aac503..8a30f431dc 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.News; using SmartStore.Core; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs index b67c10dfc5..c1a9680fbb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/NewsLetterSubscriptionController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Messages; using SmartStore.Core.Domain.Common; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs index ea18245aa0..b91c721d33 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/OnlineCustomerController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Customers; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs index 29d384242a..39efd15ea1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/OrderController.cs @@ -3,8 +3,8 @@ using System.ComponentModel; using System.Linq; using System.Text; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Admin.Models.Dashboard; using SmartStore.Admin.Models.Orders; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs index 25cbafede9..6e1d6f3502 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PackagingController.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Logging; using SmartStore.Core.Packaging; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs index db21122082..b9675b1dfa 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PaymentController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Payments; using SmartStore.Core.Domain.Payments; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs index e372a69409..c4611e4dc4 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PluginController.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Admin.Models.Plugins; using SmartStore.Core.Html; using SmartStore.Core.Logging; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs index d28705cab5..051d7363ed 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/PollController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Polls; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs index f9d17b5cf5..4cf122ef5a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductAttributeController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Catalog; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs index 4128b0ef51..9aeea6d8f7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductController.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq; using System.Text; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Autofac; using NuGet; using SmartStore.Admin.Models.Catalog; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs index 3369e76bb7..33125c8017 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ProductReviewController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Catalog; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Html; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs index 2ac8990137..33ad9d8cc4 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/QuantityUnitController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Directory; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/QueuedEmailController.cs index 15e0d85bb1..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..f294f51782 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/RoxyFileManagerController.cs @@ -7,7 +7,7 @@ using System.Runtime.CompilerServices; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Core.IO; using SmartStore.Core.Localization; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs index a1f86c5b35..5913142cfb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/RuleController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Admin.Models.Catalog; using SmartStore.Admin.Models.Customers; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs index 119d3c59af..acd9bd89cf 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ScheduleTaskController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Tasks; using SmartStore.Core.Async; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs index d8bc16bc4d..f684149cfb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SecurityController.cs @@ -1,5 +1,5 @@ using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Logging; using SmartStore.Services.Customers; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs index 348079b7e2..03c65fa6dd 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using SmartStore.Admin.Models.Common; using SmartStore.Admin.Models.Settings; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs index 564c6d0652..cc6006af72 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ShippingController.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Shipping; using SmartStore.Core.Domain.Shipping; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs index 6f9549f5ae..a6b695822e 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ShoppingCartController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.ShoppingCart; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Orders; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs index 7f8be3c231..b32c6bfa8a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/SpecificationAttributeController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Catalog; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs index 87034f5e4a..935a0e9136 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/StoreController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Store; using SmartStore.Admin.Models.Stores; using SmartStore.Core.Domain.Stores; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs index aeb2b63e16..686a2e7644 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TaxController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Tax; using SmartStore.Core.Domain.Tax; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs index c6dc7e2442..8d69364045 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Hosting; -using System.Web.Mvc; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Themes; using SmartStore.Collections; using SmartStore.Core.Domain.Themes; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs index 43fb8f9300..53914acd50 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Topics; using SmartStore.Core; using SmartStore.Core.Domain.Cms; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs index d3d10c2397..1779b1dfad 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/UrlRecordController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.UrlRecord; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Seo; diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs index 30c75e3fcf..d1af476ed9 100644 --- a/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs +++ b/src/Presentation/SmartStore.Web/Administration/Controllers/WidgetController.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Cms; using SmartStore.Core.Domain.Cms; using SmartStore.Core.Security; diff --git a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs index a1774b5340..84be87178f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs +++ b/src/Presentation/SmartStore.Web/Administration/Extensions/HtmlHelperExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Mvc.Html; using SmartStore.Admin.Models.Plugins; using SmartStore.Web.Framework.Plugins; diff --git a/src/Presentation/SmartStore.Web/Administration/Infrastructure/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/Models/Blogs/BlogCommentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs index 05ea69c98b..86c64f417c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogCommentModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -10,7 +10,6 @@ public class BlogCommentModel : EntityModelBase [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.BlogPost")] public int BlogPostId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.BlogPost")] - [AllowHtml] public string BlogPostTitle { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.Customer")] @@ -20,7 +19,6 @@ public class BlogCommentModel : EntityModelBase [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.IPAddress")] public string IpAddress { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ContentManagement.Blog.Comments.Fields.Comment")] public string Comment { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs index 6649b5c257..64faae33eb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogListModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs index 4852e66825..3e3ddc6b2c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Blogs/BlogPostModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -25,19 +25,15 @@ public BlogPostModel() public bool IsPublished { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Title")] - [AllowHtml] public string Title { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Intro")] - [AllowHtml] public string Intro { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.PreviewDisplayType")] @@ -77,15 +73,12 @@ public BlogPostModel() public DateTime? EndDate { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Common.CreatedOn")] @@ -117,31 +110,24 @@ public class BlogPostLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Title")] - [AllowHtml] public string Title { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Intro")] - [AllowHtml] public string Intro { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Blog.BlogPosts.Fields.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs index dda855bc60..3433aa7df5 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -16,7 +16,6 @@ public BulkEditListModel() } [SmartResourceDisplayName("Admin.Catalog.BulkEdit.List.SearchProductName")] - [AllowHtml] public string SearchProductName { get; set; } [SmartResourceDisplayName("Admin.Catalog.BulkEdit.List.SearchCategory")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/BulkEditProductModel.cs index 4cdb39ce80..70fe2a3b78 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,12 @@ namespace SmartStore.Admin.Models.Catalog public class BulkEditProductModel : EntityModelBase { [SmartResourceDisplayName("Admin.Catalog.BulkEdit.Fields.Name")] - [AllowHtml] public string Name { get; set; } public string ProductTypeName { get; set; } public string ProductTypeLabelHint { get; set; } [SmartResourceDisplayName("Admin.Catalog.BulkEdit.Fields.SKU")] - [AllowHtml] public string Sku { get; set; } [SmartResourceDisplayName("Admin.Catalog.BulkEdit.Fields.Price")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs index 6f59a7cf50..a741d58280 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryListModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -8,7 +8,6 @@ namespace SmartStore.Admin.Models.Catalog public class CategoryListModel : ModelBase { [SmartResourceDisplayName("Admin.Catalog.Categories.List.SearchCategoryName")] - [AllowHtml] public string SearchCategoryName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.List.SearchAlias")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CategoryModel.cs index 6d049fefa0..ad5ab2138d 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,15 @@ 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 +45,6 @@ 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 +55,19 @@ public CategoryModel() public string Alias { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.CategoryTemplate")] - [AllowHtml] public int CategoryTemplateId { get; set; } public IList AvailableCategoryTemplates { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Parent")] @@ -196,38 +187,30 @@ public class CategoryLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.FullName")] public string FullName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BottomDescription")] - [AllowHtml] public string BottomDescription { get; set; } [SmartResourceDisplayName("Admin.Catalog.Categories.Fields.BadgeText")] - [AllowHtml] public string BadgeText { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/CopyProductModel.cs index 7e2884914f..776ca53303 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,6 @@ public CopyProductModel() public int NumberOfCopies { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Copy.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Copy.Published")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs index 053268a0fa..c143afec52 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerListModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -8,7 +8,6 @@ namespace SmartStore.Admin.Models.Catalog public class ManufacturerListModel : ModelBase { [SmartResourceDisplayName("Admin.Catalog.Manufacturers.List.SearchManufacturerName")] - [AllowHtml] public string SearchManufacturerName { get; set; } [UIHint("Stores")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs index 09d40dfccf..2b675e2244 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ManufacturerModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -26,36 +26,28 @@ public ManufacturerModel() public int GridPageSize { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.BottomDescription")] - [AllowHtml] public string BottomDescription { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.ManufacturerTemplate")] - [AllowHtml] public int ManufacturerTemplateId { get; set; } public IList AvailableManufacturerTemplates { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [UIHint("Media"), AdditionalMetadata("album", "catalog")] @@ -151,31 +143,24 @@ public class ManufacturerLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.Catalog.Manufacturers.Fields.BottomDescription")] - [AllowHtml] public string BottomDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductAttributeModel.cs index fec73ef90c..cccfa5d937 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,9 @@ 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 +52,9 @@ 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..93b749aeb7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductBundleItemModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductBundleItemModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Localization; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs index a53a7f199c..75ee1e5ff0 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductListModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; using Telerik.Web.Mvc; @@ -19,7 +19,6 @@ public ProductListModel() public GridModel Products { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")] - [AllowHtml] public string SearchProductName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")] @@ -48,7 +47,6 @@ public ProductListModel() public bool? SearchHomePageProducts { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.List.GoDirectlyToSku")] - [AllowHtml] public string GoDirectlyToSku { get; set; } public bool DisplayProductPictures { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs index a14dedc49f..d044aefebe 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -64,24 +64,19 @@ public ProductModel() public ProductCondition Condition { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ProductTemplate")] - [AllowHtml] public int ProductTemplateId { get; set; } public IList AvailableProductTemplates { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ShortDescription")] - [AllowHtml] public string ShortDescription { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.FullDescription")] - [AllowHtml] public string FullDescription { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.AdminComment")] - [AllowHtml] public string AdminComment { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ShowOnHomePage")] @@ -91,19 +86,15 @@ public ProductModel() public int HomePageDisplayOrder { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.AllowCustomerReviews")] @@ -114,15 +105,12 @@ public ProductModel() public MultiSelectList AvailableProductTags { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.Sku")] - [AllowHtml] public string Sku { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ManufacturerPartNumber")] - [AllowHtml] public string ManufacturerPartNumber { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.GTIN")] - [AllowHtml] public string Gtin { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.CustomsTariffNumber")] @@ -193,10 +181,8 @@ public ProductModel() public bool HasUserAgreement { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.UserAgreementText")] - [AllowHtml] public string UserAgreementText { get; set; } - [AllowHtml] public string AddChangelog { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.IsRecurring")] @@ -643,11 +629,9 @@ public class ProductVariantAttributeModel : EntityModelBase public string ProductAttribute { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Fields.TextPrompt")] - [AllowHtml] public string TextPrompt { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Fields.CustomData")] - [AllowHtml] public string CustomData { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Fields.IsRequired")] @@ -697,7 +681,6 @@ 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 +737,6 @@ public class ProductVariantAttributeValueLocalizedModel : ILocalizedModelLocal public string Alias { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.Attributes.Values.Fields.Name")] - [AllowHtml] public string Name { get; set; } } @@ -766,31 +748,24 @@ public class ProductLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.ShortDescription")] - [AllowHtml] public string ShortDescription { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.FullDescription")] - [AllowHtml] public string FullDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.Fields.BundleTitleText")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs index e0322ae87b..cf051538fd 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductReviewModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -25,11 +25,9 @@ public class ProductReviewModel : EntityModelBase [SmartResourceDisplayName("Admin.Catalog.ProductReviews.Fields.IPAddress")] public string IpAddress { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.Catalog.ProductReviews.Fields.Title")] public string Title { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.Catalog.ProductReviews.Fields.ReviewText")] public string ReviewText { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs index 6df680a2ff..f93ebe46c1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductSpecificationAttributeModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -13,7 +13,6 @@ public ProductSpecificationAttributeModel() } [SmartResourceDisplayName("Admin.Catalog.Products.SpecificationAttributes.Fields.SpecificationAttribute")] - [AllowHtml] public string SpecificationAttributeName { get; set; } public int SpecificationAttributeId { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs index 90b37241ac..c4c1b68cb4 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductTagModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -17,7 +17,6 @@ public ProductTagModel() } [SmartResourceDisplayName("Admin.Catalog.ProductTags.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.ProductTags.Published")] @@ -34,7 +33,6 @@ public class ProductTagLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Catalog.ProductTags.Fields.Name")] - [AllowHtml] public string Name { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs index f6b8739322..11944d332f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/ProductVariantAttributeCombinationModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core.Domain.Catalog; using SmartStore.Services.Catalog.Modelling; @@ -68,14 +68,12 @@ public ProductVariantAttributeCombinationModel() public IList ProductVariantAttributes { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.ProductVariantAttributes.AttributeCombinations.Fields.Attributes")] - [AllowHtml] public string AttributesXml { get; set; } [SmartResourceDisplayName("Common.Product")] public string ProductUrl { get; set; } public string ProductUrlTitle { get; set; } - [AllowHtml] public IList Warnings { get; set; } public int ProductId { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Catalog/SpecificationAttributeModel.cs index b436e1030c..56cbe99ed6 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,6 @@ 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 +51,6 @@ 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..98b936f25c 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,6 @@ 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 +53,6 @@ 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..2f6377971c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Common/AddressModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -24,61 +24,48 @@ public AddressModel() public string Title { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.FirstName")] - [AllowHtml] public string FirstName { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.LastName")] - [AllowHtml] public string LastName { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.Email")] - [AllowHtml] public string Email { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.EmailMatch")] - [AllowHtml] public string EmailMatch { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.Company")] - [AllowHtml] public string Company { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.Country")] public int? CountryId { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.Country")] - [AllowHtml] public string CountryName { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.StateProvince")] public int? StateProvinceId { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.StateProvince")] - [AllowHtml] public string StateProvinceName { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.City")] - [AllowHtml] public string City { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.Address1")] - [AllowHtml] public string Address1 { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.Address2")] - [AllowHtml] public string Address2 { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.ZipPostalCode")] - [AllowHtml] public string ZipPostalCode { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.PhoneNumber")] - [AllowHtml] public string PhoneNumber { get; set; } [SmartResourceDisplayName("Admin.Address.Fields.FaxNumber")] - [AllowHtml] public string FaxNumber { get; set; } public IList AvailableCountries { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Common/GenericAttributeModel.cs index fbd669bddc..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..88ae72d7a6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerListModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -15,36 +15,29 @@ public class CustomerListModel : ModelBase public int[] SearchCustomerRoleIds { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchEmail")] - [AllowHtml] public string SearchEmail { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchUsername")] - [AllowHtml] public string SearchUsername { get; set; } public bool UsernamesEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchTerm")] - [AllowHtml] public string SearchTerm { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchDateOfBirth")] - [AllowHtml] public string SearchDayOfBirth { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchDateOfBirth")] - [AllowHtml] public string SearchMonthOfBirth { get; set; } public bool DateOfBirthEnabled { get; set; } public bool CompanyEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchPhone")] - [AllowHtml] public string SearchPhone { get; set; } public bool PhoneEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.List.SearchZipCode")] - [AllowHtml] public string SearchZipPostalCode { get; set; } public bool ZipPostalCodeEnabled { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs index 039acc9718..677628dc57 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Admin.Models.Common; @@ -31,15 +31,12 @@ public CustomerModel() public int GridPageSize { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Username")] - [AllowHtml] public string Username { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Email")] - [AllowHtml] public string Email { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Password")] - [AllowHtml] [DataType(DataType.Password)] public string Password { get; set; } @@ -52,10 +49,8 @@ public CustomerModel() public string Gender { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.FirstName")] - [AllowHtml] public string FirstName { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.LastName")] - [AllowHtml] public string LastName { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.FullName")] public string FullName { get; set; } @@ -66,33 +61,27 @@ public CustomerModel() public bool CompanyEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Company")] - [AllowHtml] public string Company { get; set; } public bool CustomerNumberEnabled { get; set; } [SmartResourceDisplayName("Account.Fields.CustomerNumber")] - [AllowHtml] public string CustomerNumber { get; set; } public bool StreetAddressEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.StreetAddress")] - [AllowHtml] public string StreetAddress { get; set; } public bool StreetAddress2Enabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.StreetAddress2")] - [AllowHtml] public string StreetAddress2 { get; set; } public bool ZipPostalCodeEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.ZipPostalCode")] - [AllowHtml] public string ZipPostalCode { get; set; } public bool CityEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.City")] - [AllowHtml] public string City { get; set; } public bool CountryEnabled { get; set; } @@ -107,16 +96,13 @@ public CustomerModel() public bool PhoneEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Phone")] - [AllowHtml] public string Phone { get; set; } public bool FaxEnabled { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.Fax")] - [AllowHtml] public string Fax { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.AdminComment")] - [AllowHtml] public string AdminComment { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.IsTaxExempt")] @@ -130,7 +116,6 @@ public CustomerModel() public string AffiliateFullName { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.TimeZoneId")] - [AllowHtml] public string TimeZoneId { get; set; } public bool AllowCustomersToSetTimeZone { get; set; } @@ -138,7 +123,6 @@ public CustomerModel() public IList AvailableTimeZones { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.Fields.VatNumber")] - [AllowHtml] public string VatNumber { get; set; } public string VatNumberStatusNote { get; set; } @@ -172,7 +156,6 @@ public CustomerModel() public int AddRewardPointsValue { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.RewardPoints.Fields.AddRewardPointsMessage")] - [AllowHtml] public string AddRewardPointsMessage { get; set; } public SendEmailModel SendEmail { get; set; } @@ -209,7 +192,6 @@ public class RewardPointsHistoryModel : EntityModelBase public int PointsBalance { get; set; } [SmartResourceDisplayName("Admin.Customers.Customers.RewardPoints.Fields.Message")] - [AllowHtml] public string Message { get; set; } [SmartResourceDisplayName("Common.CreatedOn")] @@ -218,12 +200,10 @@ public class RewardPointsHistoryModel : EntityModelBase public class SendEmailModel : ModelBase { - [AllowHtml] [Required] [SmartResourceDisplayName("Admin.Customers.Customers.SendEmail.Subject")] public string Subject { get; set; } - [AllowHtml] [Required] [SmartResourceDisplayName("Admin.Customers.Customers.SendEmail.Body")] public string Body { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs index b5e1c893b0..7f899dfbac 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/CustomerRoleModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Collections; @@ -21,11 +21,9 @@ public CustomerRoleModel() } [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.FreeShipping")] - [AllowHtml] public bool FreeShipping { get; set; } [SmartResourceDisplayName("Admin.Customers.CustomerRoles.Fields.TaxExempt")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs index ee18791f58..56bfe6eb3c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Customers/TopCustomersReportModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs index 64d68ef6eb..da220a6ed4 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportDeploymentModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.DataExchange; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs index 9da8dfd484..0b0d6ada52 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportFilterModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Web.Framework; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProfileModel.cs index 7d69c56a12..1c8b2c4708 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,6 @@ public class ProviderModel public string Version { get; set; } [SmartResourceDisplayName("Common.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.DataExchange.Export.EntityType")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs index 85ba2c7d0d..dd6510a04a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ExportProjectionModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Web.Framework; @@ -36,7 +36,6 @@ public class ExportProjectionModel public bool DescriptionToPlainText { get; set; } [SmartResourceDisplayName("Admin.DataExchange.Export.Projection.AppendDescriptionText")] - [AllowHtml] public string[] AppendDescriptionText { get; set; } public MultiSelectList AvailableAppendDescriptionTexts { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs index 4533bdd5bb..6bf8d2a9f6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.DataExchange; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs index ccf8211865..d35429e916 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/DataExchange/ImportProfileModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Admin.Models.Tasks; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs index 3cd86bdca0..72f47165d1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CountryModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -20,7 +20,6 @@ public CountryModel() } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.AllowsBilling")] @@ -30,11 +29,9 @@ public CountryModel() public bool AllowsShipping { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.TwoLetterIsoCode")] - [AllowHtml] public string TwoLetterIsoCode { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.ThreeLetterIsoCode")] - [AllowHtml] public string ThreeLetterIsoCode { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.NumericIsoCode")] @@ -79,7 +76,6 @@ public class CountryLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.Fields.Name")] - [AllowHtml] public string Name { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs index 8fe01f7ae8..91f8647884 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/CurrencyModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Globalization; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Directory; @@ -31,22 +31,18 @@ public CurrencyModel() }; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.CurrencyCode")] - [AllowHtml] public string CurrencyCode { get; set; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.DisplayLocale")] - [AllowHtml] public string DisplayLocale { get; set; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Rate")] public decimal Rate { get; set; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.CustomFormatting")] - [AllowHtml] public string CustomFormatting { get; set; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Published")] @@ -110,7 +106,6 @@ public class CurrencyLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Currencies.Fields.Name")] - [AllowHtml] public string Name { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs index dc59e0084e..e84204b957 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/DeliveryTimeModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Globalization; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Localization; @@ -19,16 +19,13 @@ public DeliveryTimeModel() } [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Name")] - [AllowHtml] public string Name { get; set; } public string DeliveryInfo { get; set; } [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.DisplayLocale")] - [AllowHtml] public string DisplayLocale { get; set; } [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Color")] - [AllowHtml] public string ColorHexValue { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -51,7 +48,6 @@ public class DeliveryTimeLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.DeliveryTimes.Fields.Name")] - [AllowHtml] public string Name { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs index 94190bb3c7..90e2f76f18 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureDimensionModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -20,11 +20,9 @@ public MeasureDimensionModel() public IList Locales { get; set; } [SmartResourceDisplayName("Admin.Configuration.Measures.Dimensions.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Measures.Dimensions.Fields.SystemKeyword")] - [AllowHtml] public string SystemKeyword { get; set; } [SmartResourceDisplayName("Admin.Configuration.Measures.Dimensions.Fields.Ratio")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs index 3dbf5741fc..f25c08735b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/MeasureWeightModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -20,11 +20,9 @@ public MeasureWeightModel() public IList Locales { get; set; } [SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.SystemKeyword")] - [AllowHtml] public string SystemKeyword { get; set; } [SmartResourceDisplayName("Admin.Configuration.Measures.Weights.Fields.Ratio")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs index 7f7bfbfaf2..33773bc658 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/QuantityUnitModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -23,7 +23,6 @@ public QuantityUnitModel() public string NamePlural { get; set; } [SmartResourceDisplayName("Common.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs index 419b5b7ee3..e2a5f9331b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Directory/StateProvinceModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -19,11 +19,9 @@ public StateProvinceModel() public int CountryId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Abbreviation")] - [AllowHtml] public string Abbreviation { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Published")] @@ -40,7 +38,6 @@ public class StateProvinceLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Countries.States.Fields.Name")] - [AllowHtml] public string Name { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs index 194f1c1787..7ddbb23757 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Discounts/DiscountModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Rules; @@ -23,7 +23,6 @@ public DiscountModel() public int GridPageSize { get; set; } [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.DiscountType")] @@ -67,7 +66,6 @@ public string FormattedDiscountPercentage public bool RequiresCouponCode { get; set; } [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.CouponCode")] - [AllowHtml] public string CouponCode { get; set; } [SmartResourceDisplayName("Admin.Promotions.Discounts.Fields.DiscountLimitation")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs index d78f9cd994..f80cb0bc94 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumGroupModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -23,15 +23,12 @@ public ForumGroupModel() } [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -67,15 +64,12 @@ public class ForumGroupLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.ForumGroup.Fields.Description")] - [AllowHtml] public string Description { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs index 2606a1a533..0e0d4b2c82 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Forums/ForumModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -25,15 +25,12 @@ public ForumModel() public int ForumGroupId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -52,15 +49,12 @@ public class ForumLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Forums.Forum.Fields.Description")] - [AllowHtml] public string Description { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs index f6dee2db8f..60c5677e61 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Globalization; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Localization; @@ -21,21 +21,17 @@ public LanguageModel() } [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.LanguageCulture")] - [AllowHtml] public string LanguageCulture { get; set; } public List AvailableCultures { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.UniqueSeoCode")] - [AllowHtml] public string UniqueSeoCode { get; set; } public List AvailableTwoLetterLanguageCodes { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Fields.FlagImageFileName")] - [AllowHtml] public string FlagImageFileName { get; set; } public IList FlagFileNames { get; set; } public List AvailableFlags { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Localization/LanguageResourceModel.cs index a0c2d5aca5..60a818129c 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,12 @@ namespace SmartStore.Admin.Models.Localization public class LanguageResourceModel : EntityModelBase { [SmartResourceDisplayName("Admin.Configuration.Languages.Resources.Fields.Name")] - [AllowHtml] public string ResourceName { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Resources.Fields.Value")] - [AllowHtml] public string ResourceValue { get; set; } [SmartResourceDisplayName("Admin.Configuration.Languages.Resources.Fields.LanguageName")] - [AllowHtml] public string LanguageName { get; set; } public int LanguageId { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs index e3c8e69d1c..32fc307e80 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Logging/ActivityLogSearchModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -21,7 +21,6 @@ public class ActivityLogSearchModel : ModelBase public DateTime? CreatedOnTo { get; set; } [SmartResourceDisplayName("Admin.Configuration.ActivityLog.ActivityLog.Fields.CustomerEmail")] - [AllowHtml] public string CustomerEmail { get; set; } [SmartResourceDisplayName("Admin.Configuration.ActivityLog.ActivityLog.Fields.CustomerSystemAccount")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs index 2d5ca0c635..d6d23561df 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogListModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -20,7 +20,6 @@ public LogListModel() public DateTime? CreatedOnTo { get; set; } [SmartResourceDisplayName("Admin.System.Log.List.Message")] - [AllowHtml] public string Message { get; set; } [SmartResourceDisplayName("Admin.System.Log.List.LogLevel")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs index 931999c1d6..ceed6e66c1 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Logging/LogModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -13,15 +13,12 @@ public class LogModel : EntityModelBase public string LogLevel { get; set; } [SmartResourceDisplayName("Admin.System.Log.Fields.ShortMessage")] - [AllowHtml] public string ShortMessage { get; set; } [SmartResourceDisplayName("Admin.System.Log.Fields.FullMessage")] - [AllowHtml] public string FullMessage { get; set; } [SmartResourceDisplayName("Admin.System.Log.Fields.IPAddress")] - [AllowHtml] public string IpAddress { get; set; } [SmartResourceDisplayName("Admin.System.Log.Fields.Customer")] @@ -30,11 +27,9 @@ public class LogModel : EntityModelBase public string CustomerEmail { get; set; } [SmartResourceDisplayName("Admin.System.Log.Fields.PageURL")] - [AllowHtml] public string PageUrl { get; set; } [SmartResourceDisplayName("Admin.System.Log.Fields.ReferrerURL")] - [AllowHtml] public string ReferrerUrl { get; set; } [SmartResourceDisplayName("Common.CreatedOn")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuItemRecordModel.cs index ea76f5ae59..f31e4768f9 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; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs index cfb9520676..9fb11aa57b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs index 07d698a126..3067f9c5fe 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Menus/MenuRecordModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Collections; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs index 01be797a68..28ed257820 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/CampaignModel.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Collections; @@ -14,15 +14,12 @@ namespace SmartStore.Admin.Models.Messages public class CampaignModel : EntityModelBase { [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.Subject")] - [AllowHtml] public string Subject { get; set; } [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Common.CreatedOn")] @@ -32,7 +29,6 @@ public class CampaignModel : EntityModelBase public TreeNode LastModelTree { get; set; } [SmartResourceDisplayName("Admin.Promotions.Campaigns.Fields.TestEmail")] - [AllowHtml] public string TestEmail { get; set; } // ACL. diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs index 76aaa4eeee..9bbe7004ac 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/EmailAccountModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -11,26 +11,21 @@ namespace SmartStore.Admin.Models.Messages public class EmailAccountModel : EntityModelBase { [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Email")] - [AllowHtml] public string Email { get; set; } [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.DisplayName")] - [AllowHtml] public string DisplayName { get; set; } [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Host")] - [AllowHtml] public string Host { get; set; } [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Port")] public int Port { get; set; } [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Username")] - [AllowHtml] public string Username { get; set; } [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.Password")] - [AllowHtml] [DataType(DataType.Password)] public string Password { get; set; } @@ -45,7 +40,6 @@ public class EmailAccountModel : EntityModelBase [SmartResourceDisplayName("Admin.Configuration.EmailAccounts.Fields.SendTestEmailTo")] - [AllowHtml] public string SendTestEmailTo { get; set; } public string TestEmailShortErrorMessage { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs index 49f44c710b..9ae8661f18 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs index a576538e80..854f3d280f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/MessageTemplateModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Script.Serialization; using FluentValidation; using FluentValidation.Attributes; @@ -26,15 +26,12 @@ public MessageTemplateModel() public TreeNode TokensTree { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.To")] - [AllowHtml] public string To { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.ReplyTo")] - [AllowHtml] public string ReplyTo { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.AllowedTokens")] @@ -42,15 +39,12 @@ public MessageTemplateModel() public string LastModelTree { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.BccEmailAddresses")] - [AllowHtml] public string BccEmailAddresses { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Subject")] - [AllowHtml] public string Subject { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Common.Active")] @@ -92,23 +86,18 @@ public class MessageTemplateLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.To")] - [AllowHtml] public string To { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.ReplyTo")] - [AllowHtml] public string ReplyTo { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.BccEmailAddresses")] - [AllowHtml] public string BccEmailAddresses { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Subject")] - [AllowHtml] public string Subject { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.MessageTemplates.Fields.EmailAccount")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs index cb4660d07d..ea39dadd74 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionListModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; using Telerik.Web.Mvc; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs index 0ee6ae06f7..85651813f7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/NewsLetterSubscriptionModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -11,7 +11,6 @@ namespace SmartStore.Admin.Models.Messages public class NewsLetterSubscriptionModel : EntityModelBase { [SmartResourceDisplayName("Admin.Promotions.NewsLetterSubscriptions.Fields.Email")] - [AllowHtml] public string Email { get; set; } [SmartResourceDisplayName("Admin.Promotions.NewsLetterSubscriptions.Fields.Active")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs index a0168ab522..aba4a9b175 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailListModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -20,11 +20,9 @@ public QueuedEmailListModel() public DateTime? SearchEndDate { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.List.FromEmail")] - [AllowHtml] public string SearchFromEmail { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.List.ToEmail")] - [AllowHtml] public string SearchToEmail { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.List.LoadNotSent")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs index ac52d10c7f..73127d9e3f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Messages/QueuedEmailModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -27,27 +27,21 @@ public QueuedEmailModel() public int Priority { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.From")] - [AllowHtml] public string From { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.To")] - [AllowHtml] public string To { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.CC")] - [AllowHtml] public string CC { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.Bcc")] - [AllowHtml] public string Bcc { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.Subject")] - [AllowHtml] public string Subject { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Common.CreatedOn")] @@ -61,7 +55,6 @@ public QueuedEmailModel() public DateTime? SentOn { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.EmailAccountName")] - [AllowHtml] public string EmailAccountName { get; set; } [SmartResourceDisplayName("Admin.System.QueuedEmails.Fields.SendManually")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs index 4c302803e9..decfbd7376 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsCommentModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -11,7 +11,6 @@ public class NewsCommentModel : EntityModelBase public int NewsItemId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.NewsItem")] - [AllowHtml] public string NewsItemTitle { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.Customer")] @@ -21,11 +20,9 @@ public class NewsCommentModel : EntityModelBase [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.IPAddress")] public string IpAddress { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.CommentTitle")] public string CommentTitle { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ContentManagement.News.Comments.Fields.CommentText")] public string CommentText { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs index abd51ca1fe..f996fcf0f4 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemListModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs index f48c5c8843..ca23028d96 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/News/NewsItemModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -22,19 +22,15 @@ public NewsItemModel() } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Title")] - [AllowHtml] public string Title { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Short")] - [AllowHtml] public string Short { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Full")] - [AllowHtml] public string Full { get; set; } [UIHint("Media"), AdditionalMetadata("album", "content")] @@ -55,15 +51,12 @@ public NewsItemModel() public DateTime? EndDate { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Published")] @@ -101,31 +94,24 @@ public class NewsItemLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Title")] - [AllowHtml] public string Title { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Short")] - [AllowHtml] public string Short { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.News.NewsItems.Fields.Full")] - [AllowHtml] public string Full { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs index e1876a87d8..c9c1163f3f 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/BestsellersReportModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs index d4314fef1f..a5a198ed1a 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Admin.Models.Orders diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs index 7a47e88370..27aaaeaab9 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -22,11 +22,9 @@ public CheckoutAttributeModel() public bool IsActive { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.TextPrompt")] - [AllowHtml] public string TextPrompt { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.IsRequired")] @@ -45,7 +43,6 @@ public CheckoutAttributeModel() [SmartResourceDisplayName("Admin.Catalog.Attributes.AttributeControlType")] public int AttributeControlTypeId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.AttributeControlType")] - [AllowHtml] public string AttributeControlTypeName { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -67,11 +64,9 @@ public class CheckoutAttributeLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Fields.TextPrompt")] - [AllowHtml] public string TextPrompt { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs index ac09dbdca0..86a8570a17 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/CheckoutAttributeValueModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -20,7 +20,6 @@ public CheckoutAttributeValueModel() public int CheckoutAttributeId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Values.Fields.Name")] - [AllowHtml] public string Name { get; set; } public string NameString { get; set; } @@ -55,7 +54,6 @@ public class CheckoutAttributeValueLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Catalog.Attributes.CheckoutAttributes.Values.Fields.Name")] - [AllowHtml] public string Name { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs index 2451a82251..a10cfb90a2 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -15,7 +15,6 @@ public GiftCardListModel() public int GridPageSize { get; set; } [SmartResourceDisplayName("Admin.GiftCards.List.CouponCode")] - [AllowHtml] public string CouponCode { get; set; } [SmartResourceDisplayName("Admin.GiftCards.List.Activated")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs index 624d2d0202..74621d8b73 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/GiftCardModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -26,27 +26,21 @@ public class GiftCardModel : EntityModelBase public bool IsGiftCardActivated { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.GiftCardCouponCode")] - [AllowHtml] public string GiftCardCouponCode { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.RecipientName")] - [AllowHtml] public string RecipientName { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.RecipientEmail")] - [AllowHtml] public string RecipientEmail { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.SenderName")] - [AllowHtml] public string SenderName { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.SenderEmail")] - [AllowHtml] public string SenderEmail { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.Message")] - [AllowHtml] public string Message { get; set; } [SmartResourceDisplayName("Admin.GiftCards.Fields.IsRecipientNotified")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs index da54b75e99..c21049f5be 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderListModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -24,7 +24,6 @@ public OrderListModel() public DateTime? EndDate { get; set; } [SmartResourceDisplayName("Admin.Orders.List.CustomerEmail")] - [AllowHtml] public string CustomerEmail { get; set; } [SmartResourceDisplayName("Admin.Orders.List.CustomerName")] @@ -46,15 +45,12 @@ public OrderListModel() public string PaymentMethods { get; set; } [SmartResourceDisplayName("Admin.Orders.List.OrderGuid")] - [AllowHtml] public string OrderGuid { get; set; } [SmartResourceDisplayName("Admin.Orders.List.OrderNumber")] - [AllowHtml] public string OrderNumber { get; set; } [SmartResourceDisplayName("Admin.Orders.List.GoDirectlyToNumber")] - [AllowHtml] public string GoDirectlyToNumber { get; set; } public int GridPageSize { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs index fe536fdf03..b303860934 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/OrderModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Common; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Orders; @@ -202,51 +202,38 @@ public string PaymentStatusLabelClass //credit card info public bool AllowStoringCreditCardNumber { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.CardType")] - [AllowHtml] public string CardType { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.CardName")] - [AllowHtml] public string CardName { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.CardNumber")] - [AllowHtml] public string CardNumber { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.CardCVV2")] - [AllowHtml] public string CardCvv2 { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.CardExpirationMonth")] - [AllowHtml] public string CardExpirationMonth { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.CardExpirationYear")] - [AllowHtml] public string CardExpirationYear { get; set; } public bool AllowStoringDirectDebit { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitAccountHolder")] - [AllowHtml] public string DirectDebitAccountHolder { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitAccountNumber")] - [AllowHtml] public string DirectDebitAccountNumber { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitBankCode")] - [AllowHtml] public string DirectDebitBankCode { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitBankName")] - [AllowHtml] public string DirectDebitBankName { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitBIC")] - [AllowHtml] public string DirectDebitBIC { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitCountry")] - [AllowHtml] public string DirectDebitCountry { get; set; } [SmartResourceDisplayName("Admin.Orders.Fields.DirectDebitIban")] - [AllowHtml] public string DirectDebitIban { get; set; } //misc payment info @@ -342,7 +329,6 @@ public string ShippingStatusLabelClass [SmartResourceDisplayName("Admin.Orders.OrderNotes.Fields.AddOrderNoteDisplayToCustomer")] public bool AddOrderNoteDisplayToCustomer { get; set; } [SmartResourceDisplayName("Admin.Orders.OrderNotes.Fields.AddOrderNoteMessage")] - [AllowHtml] public string AddOrderNoteMessage { get; set; } public bool DisplayPdfInvoice { get; set; } @@ -525,7 +511,6 @@ public AddOrderProductModel() } [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchProductName")] - [AllowHtml] public string SearchProductName { get; set; } [SmartResourceDisplayName("Admin.Catalog.Products.List.SearchCategory")] public int SearchCategoryId { get; set; } @@ -545,11 +530,9 @@ public AddOrderProductModel() public class ProductModel : EntityModelBase { [SmartResourceDisplayName("Admin.Orders.Products.AddNew.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Orders.Products.AddNew.SKU")] - [AllowHtml] public string Sku { get; set; } public string ProductTypeName { get; set; } @@ -645,19 +628,14 @@ public class GiftCardModel : ModelBase public bool IsGiftCard { get; set; } [SmartResourceDisplayName("Products.GiftCard.RecipientName")] - [AllowHtml] public string RecipientName { get; set; } [SmartResourceDisplayName("Products.GiftCard.RecipientEmail")] - [AllowHtml] public string RecipientEmail { get; set; } [SmartResourceDisplayName("Products.GiftCard.SenderName")] - [AllowHtml] public string SenderName { get; set; } [SmartResourceDisplayName("Products.GiftCard.SenderEmail")] - [AllowHtml] public string SenderEmail { get; set; } [SmartResourceDisplayName("Products.GiftCard.Message")] - [AllowHtml] public string Message { get; set; } public GiftCardType GiftCardType { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs index 9b8348f3b2..78f0563aeb 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Orders; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs index 7ef963d26b..436c43c506 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ReturnRequestModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Orders; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -46,12 +46,10 @@ public ReturnRequestModel() [SmartResourceDisplayName("Admin.ReturnRequests.Fields.Quantity")] public int Quantity { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ReturnRequests.Fields.ReasonForReturn")] public string ReasonForReturn { get; set; } public IList AvailableReasonForReturn { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ReturnRequests.Fields.RequestedAction")] public string RequestedAction { get; set; } public IList AvailableRequestedAction { get; set; } @@ -59,11 +57,9 @@ public ReturnRequestModel() [SmartResourceDisplayName("Admin.ReturnRequests.Fields.RequestedActionUpdatedOnUtc")] public DateTime? RequestedActionUpdated { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ReturnRequests.Fields.CustomerComments")] public string CustomerComments { get; set; } - [AllowHtml] [SmartResourceDisplayName("Admin.ReturnRequests.Fields.StaffNotes")] public string StaffNotes { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs index e482cec467..2c86c00bb2 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Orders/ShipmentListModel.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -14,7 +14,6 @@ public class ShipmentListModel : ModelBase public DateTime? EndDate { get; set; } [SmartResourceDisplayName("Admin.Orders.Shipments.List.TrackingNumber")] - [AllowHtml] public string TrackingNumber { get; set; } public bool DisplayPdfPackagingSlip { get; set; } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs index 58165e5635..e42d69a905 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Payments/PaymentMethodEditModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Rules; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Localization; @@ -25,11 +25,9 @@ public PaymentMethodEditModel() public string FriendlyName { get; set; } [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.ShortDescription")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.FullDescription")] - [AllowHtml] public string FullDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.RoundOrderTotalEnabled")] @@ -60,11 +58,9 @@ public class PaymentMethodLocalizedModel : ILocalizedModelLocal public string FriendlyName { get; set; } [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.ShortDescription")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.Configuration.Payment.Methods.FullDescription")] - [AllowHtml] public string FullDescription { get; set; } } } \ No newline at end of file diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs index 0094d97af9..5c77d36492 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Plugins/PluginModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -18,27 +18,21 @@ public PluginModel() } [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.Group")] - [AllowHtml] public string Group { get; set; } [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.FriendlyName")] - [AllowHtml] public string FriendlyName { get; set; } [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.SystemName")] - [AllowHtml] public string SystemName { get; set; } [SmartResourceDisplayName("Common.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.Version")] - [AllowHtml] public string Version { get; set; } [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.Author")] - [AllowHtml] public string Author { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -71,11 +65,9 @@ public class PluginLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Plugins.Fields.FriendlyName")] - [AllowHtml] public string FriendlyName { get; set; } [SmartResourceDisplayName("Common.Description")] - [AllowHtml] public string Description { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollAnswerModel.cs index 0c6192f710..1745a65812 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,6 @@ public class PollAnswerModel : EntityModelBase public int PollId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Polls.Answers.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Polls.Answers.Fields.NumberOfVotes")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs index 056a4fa370..c080075868 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Polls/PollModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -20,15 +20,12 @@ public class PollModel : EntityModelBase public List AvailableLanguages { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.Language")] - [AllowHtml] public string LanguageName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.SystemKeyword")] - [AllowHtml] public string SystemKeyword { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Polls.Fields.Published")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs index 0004322dea..45d1b8940b 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CatalogSettingsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Catalog; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs index 1e55a4ce33..1c0fe1c6d0 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs index 72797cc87c..cd3a2751be 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ForumSearchSettingsModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using SmartStore.Core.Domain.Forums; using SmartStore.Core.Localization; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs index 1dadc0d5c2..bc01fd17a6 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/GeneralCommonSettingsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Localization; @@ -106,7 +106,6 @@ public SeoSettingsModel() } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeparator")] - [AllowHtml] public string PageTitleSeparator { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PageTitleSeoAdjustment")] @@ -175,11 +174,9 @@ public SeoSettingsModel() public partial class SecuritySettingsModel { [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.EncryptionKey")] - [AllowHtml] public string EncryptionKey { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.AdminAreaAllowedIpAddresses")] - [AllowHtml] public string AdminAreaAllowedIpAddresses { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.HideAdminMenuItemsBasedOnPermissions")] @@ -225,11 +222,9 @@ public partial class CaptchaSettingsModel public bool ShowOnProductReviewPage { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.reCaptchaPublicKey")] - [AllowHtml] public string ReCaptchaPublicKey { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.reCaptchaPrivateKey")] - [AllowHtml] public string ReCaptchaPrivateKey { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.UseInvisibleReCaptcha")] @@ -327,7 +322,6 @@ public CompanyInformationSettingsModel() public int? CountryId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.CompanyInformationSettings.Country")] - [AllowHtml] public string CountryName { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.CompanyInformationSettings.State")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs index d66ee9a14f..d524141129 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/MediaSettingsModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs index f07b423597..e3207092f0 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/OrderSettingsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Orders; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs index 7147160843..79ed2c7261 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/PaymentSettingsModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Payments; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs index 180647e420..ecd1934aef 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Localization; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SettingModel.cs index 3a3318684a..f4ccc84881 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,9 @@ namespace SmartStore.Admin.Models.Settings public class SettingModel : EntityModelBase { [SmartResourceDisplayName("Admin.Configuration.Settings.AllSettings.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.AllSettings.Fields.Value")] - [AllowHtml] public string Value { get; set; } [SmartResourceDisplayName("Admin.Configuration.Settings.AllSettings.Fields.StoreName")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs index a20c6b3149..fc8e4ef119 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShippingSettingsModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Common; using SmartStore.Web.Framework; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs index fca9556d03..d2b5519d45 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/ShoppingCartSettingsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Directory; using SmartStore.Core.Domain.Orders; using SmartStore.Web.Framework; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs index 4eed795322..57333baf78 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/StoreScopeConfigurationModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework.Modelling; namespace SmartStore.Admin.Models.Settings diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs index 67a5f799c7..d85425ce81 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Settings/TaxSettingsModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Admin.Models.Common; using SmartStore.Core.Domain.Tax; using SmartStore.Web.Framework; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs index 099202217c..581c03f472 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Shipping/ShippingMethodModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Rules; @@ -19,11 +19,9 @@ public ShippingMethodModel() } [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Description")] - [AllowHtml] public string Description { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] @@ -58,11 +56,9 @@ public class ShippingMethodLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Shipping.Methods.Fields.Description")] - [AllowHtml] public string Description { get; set; } } diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs index e86fca9c7e..6fe5e5c518 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Stores/StoreModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Localization; @@ -14,25 +14,21 @@ namespace SmartStore.Admin.Models.Stores public partial class StoreModel : EntityModelBase { [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.Url")] - [AllowHtml] public string Url { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.SslEnabled")] public virtual bool SslEnabled { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.SecureUrl")] - [AllowHtml] public virtual string SecureUrl { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.ForceSslForAllPages")] public bool ForceSslForAllPages { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.Hosts")] - [AllowHtml] public string Hosts { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.StoreLogo")] @@ -67,7 +63,6 @@ public partial class StoreModel : EntityModelBase public string HtmlBodyId { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.ContentDeliveryNetwork")] - [AllowHtml] public string ContentDeliveryNetwork { get; set; } [SmartResourceDisplayName("Admin.Configuration.Stores.Fields.PrimaryStoreCurrencyId")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs index ef82ca8ec6..c5e7ccf4ff 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Tasks/ScheduleTaskModel.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Tasks; @@ -15,7 +15,6 @@ namespace SmartStore.Admin.Models.Tasks public partial class ScheduleTaskModel : EntityModelBase { [SmartResourceDisplayName("Admin.System.ScheduleTasks.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Admin.System.ScheduleTasks.CronExpression")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Tax/TaxCategoryModel.cs index f6a80738d3..49de8c70bc 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,6 @@ namespace SmartStore.Admin.Models.Tax public class TaxCategoryModel : EntityModelBase { [SmartResourceDisplayName("Admin.Configuration.Tax.Categories.Fields.Name")] - [AllowHtml] public string Name { get; set; } [SmartResourceDisplayName("Common.DisplayOrder")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs index 7f1be3caad..24fcd4bbd7 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ConfigureThemeModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs index 093dee07c1..4c3a8ade14 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs index 07ad1c55ab..014160a8de 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs index fe9bb3cb4b..c8049507dc 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/Topics/TopicModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.ComponentModel; @@ -57,7 +57,6 @@ public TopicModel() public IList AvailableCookieTypes { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.SystemName")] - [AllowHtml] public string SystemName { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.HtmlId")] @@ -77,35 +76,27 @@ public TopicModel() public string Password { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.URL")] - [AllowHtml] public string Url { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.ShortTitle")] - [AllowHtml] public string ShortTitle { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Title")] - [AllowHtml] public string Title { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Intro")] - [AllowHtml] public string Intro { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] @@ -151,31 +142,24 @@ public class TopicLocalizedModel : ILocalizedModelLocal public int LanguageId { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.ShortTitle")] - [AllowHtml] public string ShortTitle { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Title")] - [AllowHtml] public string Title { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Intro")] - [AllowHtml] public string Intro { get; set; } [SmartResourceDisplayName("Admin.ContentManagement.Topics.Fields.Body")] - [AllowHtml] public string Body { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaKeywords")] - [AllowHtml] public string MetaKeywords { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaDescription")] - [AllowHtml] public string MetaDescription { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.MetaTitle")] - [AllowHtml] public string MetaTitle { get; set; } [SmartResourceDisplayName("Admin.Configuration.Seo.SeName")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs index 4d3aa2638b..c534af5ee5 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordListModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; @@ -10,7 +10,6 @@ public partial class UrlRecordListModel : ModelBase public int GridPageSize { get; set; } [SmartResourceDisplayName("Admin.System.SeNames.Name")] - [AllowHtml] public string SeName { get; set; } [SmartResourceDisplayName("Admin.System.SeNames.EntityName")] diff --git a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs index f53aa35645..8261eed59c 100644 --- a/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs +++ b/src/Presentation/SmartStore.Web/Administration/Models/UrlRecord/UrlRecordModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 27cf819bdf..ae75279189 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -1,1390 +1,21 @@ - - - + - Debug - AnyCPU - - - 2.0 - {152C761A-DD2E-4C1F-AF89-DFB2547A3BCA} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Admin SmartStore.Admin - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - - - - - ..\..\..\ - true - true - 1e5b888b - - + false + latest + disable - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - false - - - - False - ..\..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - False - - - ..\..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - False - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - False - ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - - - False - ..\..\..\..\lib\SmartStore.Licensing\SmartStore.Licensing.dll - True - - - - - - - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - False - ..\..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - False - - - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - ..\..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - - False - ..\..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - False - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - False - - - {CCD7F2C9-6A2C-4CF0-8E89-076B8FC0F144} - SmartStore.Data - False - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - False - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - False - - - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - 0 - - - - - - - - - - - - - False - True - 43797 - / - - - False - True - http://www.smartstore.net - False - - - - - - - - - - - \ No newline at end of file + diff --git a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs index a059c6c674..ee799615fe 100644 --- a/src/Presentation/SmartStore.Web/Controllers/BlogController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/BlogController.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.Linq; using System.ServiceModel.Syndication; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Caching; diff --git a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs index 0606d9ffb3..1001bebcad 100644 --- a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.ServiceModel.Syndication; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Forums; diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs index 0ae9ce3ac0..c58db4f1d0 100644 --- a/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/CatalogController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.ServiceModel.Syndication; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Caching; using SmartStore.Core.Domain.Catalog; diff --git a/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs b/src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs index 2db4cb1ce5..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..00fc6fccdd 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; 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..1a6c7b1f9e 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; diff --git a/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs b/src/Presentation/SmartStore.Web/Controllers/DownloadController.cs index e696904d29..90b4e08111 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; 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..c6ab0c8496 100644 --- a/src/Presentation/SmartStore.Web/Controllers/InstallController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/InstallController.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Data.SqlClient; using System.Linq; using System.Security.Principal; using System.Threading; using System.Threading.Tasks; -using System.Web.Hosting; -using System.Web.Mvc; -using System.Web.SessionState; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; using Autofac; using SmartStore.Core; using SmartStore.Core.Async; diff --git a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs index 06ae833f85..2463a87c0d 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MediaController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MediaController.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Net; using System.Threading.Tasks; -using System.Web.Mvc; -using System.Web.Routing; -using System.Web.SessionState; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Http; using SmartStore.Core; using SmartStore.Core.Domain.Media; using SmartStore.Core.Domain.Seo; diff --git a/src/Presentation/SmartStore.Web/Controllers/MenuController.cs b/src/Presentation/SmartStore.Web/Controllers/MenuController.cs index 4716336d17..faae17dbe8 100644 --- a/src/Presentation/SmartStore.Web/Controllers/MenuController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/MenuController.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Security; using SmartStore.Web.Framework.Controllers; diff --git a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs index 3469d72ba2..21db99f8f6 100644 --- a/src/Presentation/SmartStore.Web/Controllers/NewsController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/NewsController.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.ServiceModel.Syndication; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.ComponentModel; using SmartStore.Core; using SmartStore.Core.Caching; diff --git a/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs b/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs index 69ae16af9c..1ae7e9665d 100644 --- a/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/NewsletterController.cs @@ -1,5 +1,5 @@ using System; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Messages; diff --git a/src/Presentation/SmartStore.Web/Controllers/OrderController.cs b/src/Presentation/SmartStore.Web/Controllers/OrderController.cs index 88fc181453..109d7e0af1 100644 --- a/src/Presentation/SmartStore.Web/Controllers/OrderController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/OrderController.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Controllers/PollController.cs b/src/Presentation/SmartStore.Web/Controllers/PollController.cs index fad1aa7624..647fa4c9b7 100644 --- a/src/Presentation/SmartStore.Web/Controllers/PollController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/PollController.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Caching; using SmartStore.Core.Domain.Polls; diff --git a/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs b/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs index f445eb41de..d43ff1d057 100644 --- a/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/PrivateMessagesController.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Forums; diff --git a/src/Presentation/SmartStore.Web/Controllers/ProductController.cs b/src/Presentation/SmartStore.Web/Controllers/ProductController.cs index 3562704be7..1f71856dc4 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ProductController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ProductController.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web.Mvc; -using System.Web.Routing; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Routing; using SmartStore; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; diff --git a/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs b/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs index 46fc6a200f..1d612b8355 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ProfileController.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Forums; using SmartStore.Core.Domain.Media; diff --git a/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs b/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs index ea55b25588..ead3a37445 100644 --- a/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/ReturnRequestController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Orders; using SmartStore.Core.Domain.Tax; diff --git a/src/Presentation/SmartStore.Web/Controllers/SearchController.cs b/src/Presentation/SmartStore.Web/Controllers/SearchController.cs index 38bd94e582..e091fbe80b 100644 --- a/src/Presentation/SmartStore.Web/Controllers/SearchController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/SearchController.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Media; diff --git a/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs b/src/Presentation/SmartStore.Web/Controllers/ShoppingCartController.cs index d88a441095..4c53880d00 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; diff --git a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs index 8b820e73ae..d99c16fc26 100644 --- a/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs +++ b/src/Presentation/SmartStore.Web/Controllers/TaskSchedulerController.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -using System.Web.Mvc; -using System.Web.SessionState; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Http; using SmartStore.Collections; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Domain.Stores; 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..47df091ea1 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 Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; using System.Web.Optimization; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.WebPages; using FluentValidation; using FluentValidation.Mvc; 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/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..e4859e67ef 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; 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..117f843374 100644 --- a/src/Presentation/SmartStore.Web/Models/Customer/CustomerInfoModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Customer/CustomerInfoModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web/Models/Customer/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..471b8c6420 100644 --- a/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Customer/PaswordRecoveryModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework; @@ -10,7 +10,6 @@ namespace SmartStore.Web.Models.Customer [Validator(typeof(PasswordRecoveryValidator))] public partial class PasswordRecoveryModel : ModelBase { - [AllowHtml] [SmartResourceDisplayName("Account.PasswordRecovery.Email")] [DataType(DataType.EmailAddress)] public string Email { get; set; } diff --git a/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs b/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs index e6ff527d3e..0e7a793559 100644 --- a/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Customer/RegisterModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Core.Domain.Customers; diff --git a/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs b/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs index a4c383469a..0dd9029563 100644 --- a/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Install/InstallModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using FluentValidation; using FluentValidation.Attributes; using SmartStore.Web.Framework.Modelling; @@ -24,18 +24,14 @@ public InstallModel() [DataType(DataType.Password)] public string ConfirmPassword { get; set; } - [AllowHtml] public string DatabaseConnectionString { get; set; } public string DataProvider { get; set; } //SQL Server properties public string SqlConnectionInfo { get; set; } - [AllowHtml] public string SqlServerName { get; set; } public string SqlDatabaseName { get; set; } - [AllowHtml] public string SqlServerUsername { get; set; } - [AllowHtml] public string SqlServerPassword { get; set; } public string SqlAuthenticationType { get; set; } public bool SqlServerCreateDatabase { get; set; } diff --git a/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs b/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs index 09b85a691f..7d7563bb88 100644 --- a/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs +++ b/src/Presentation/SmartStore.Web/Models/Order/SubmitReturnRequestModel.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using SmartStore.Services.Localization; using SmartStore.Web.Framework; using SmartStore.Web.Framework.Modelling; diff --git a/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs b/src/Presentation/SmartStore.Web/Models/Search/ISearchResultModel.cs index 57b8bb8c21..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..be63ef2030 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1,2170 +1,25 @@ - - - - - - - - + - Debug - AnyCPU - - - 2.0 - {4F1F649C-1020-45BE-A487-F416D9297FF3} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Web SmartStore.Web - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - ..\..\ - true - - - - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - latest - false - AnyCPU - AllFilesInProjectFolder - - - pdbonly - true - bin\ - TRACE - prompt - 4 + false latest - false - AllFilesInProjectFolder - false - false - AnyCPU + disable + - - ..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll - - - False - ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll - - - ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll - - - ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll - - - ..\..\packages\BundleTransformer.JsMin.1.12.6\lib\net40\BundleTransformer.JsMin.dll - - - ..\..\packages\BundleTransformer.NUglify.1.12.16\lib\net40\BundleTransformer.NUglify.dll - - - ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\ClearScript.dll - - - ..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll - True - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Msie.3.4.3\lib\net45\JavaScriptEngineSwitcher.Msie.dll - - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\JavaScriptEngineSwitcher.V8.dll - - - ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\MsieJavaScriptEngine.3.0.7\lib\net45\MsieJavaScriptEngine.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - True - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - - ..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll - - - - ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - False - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - True - - - False - ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - True - True - EditorLocalization.de.resx - - - True - True - EditorLocalization.resx - - - True - True - GridLocalization.de.resx - - - True - True - GridLocalization.resx - - - True - True - MvcLocalization.resx - - - True - True - MvcLocalization.de.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Global.asax - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - Designer - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - MvcLocalization.de.Designer.cs - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - Designer - - - - - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - Web.config - Designer - - - Web.config - Designer - - - - - - True - True - .\output - True - True - Nested - False - - - Designer - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web.config - - - Web.config - + + - - + + + + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + - - - - Designer - - - - - Designer - - - - - GlobalResourceProxyGenerator - EditorLocalization.de.designer.cs - - - GlobalResourceProxyGenerator - EditorLocalization.designer.cs - - - GlobalResourceProxyGenerator - GridLocalization.de.designer.cs - Designer - - - GlobalResourceProxyGenerator - GridLocalization.designer.cs - Designer - - - - - GlobalResourceProxyGenerator - MvcLocalization.Designer.cs - - - - - Config\log4net.config - False - $(TransformWebConfigIntermediateLocation)\original - Config\log4net.$(Configuration).config - $(TransformWebConfigIntermediateLocation)\original - $(TransformWebConfigIntermediateLocation)\original\%(DestinationRelativePath) - $(TransformWebConfigIntermediateLocation)\transformed\%(DestinationRelativePath) - $(_PackageTempDir)\%(DestinationRelativePath) - Designer - - - log4net.config - - - log4net.config - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - false - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - True - - - - - - - - **\*.cs; - **\*.orig; - **\*.bak; - **\*.log; - **\*.csproj; - **\*.csproj.user; - **\*.DotSettings.user; - **\packages.config; - **\*.Debug.config; - **\*.Release.config; - **\*.PluginDev.config; - **\*.EFMigrations.config; - **\obj\**; - **\bin\*.xml; - App_Data\Licenses.lic; - App_Data\Settings.txt; - App_Data\InstalledPlugins.txt; - App_Data\SmartStore.Db.sdf; - Plugins\*\bin\**; - Themes\*\Content\compiled\**; - - - x64; - x86; - roslyn; - bin\da; bin\fi; bin\ja; bin\ko; bin\mk; bin\nl; bin\pt; bin\no; bin\pl; bin\pl; bin\ru-ru; bin\sv; bin\tr; bin\uk; bin\zh-CHS; bin\zh-Hans; bin\zh-Hant; - Exchange; - Media; - Properties; - App_Data\_Backup; - App_Data\_temp; - App_Data\Tenants; - App_Data\Migrations; - App_Data\Logs; - bin\HostRestart; - Administration\bin; - Content\Images\Thumbs; - - - - - - - Project - false - - - - - - - - - - - - - - - - - - - - $(ProjectDir)bin\roslyn\ - - - - - - - - $(ProjectDir)Content\placeholder.txt - - - - - - - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - - - - - \ No newline at end of file + diff --git a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs index ac1fcd17c4..ecfcfccd46 100644 --- a/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs +++ b/src/Tests/SmartStore.Core.Tests/Data/Hooks/HookedEntityMock.cs @@ -19,7 +19,7 @@ public HookedEntityMock(BaseEntity entity, EntityState state) public Type ContextType => typeof(IDbContext); - public DbEntityEntry Entry => null; + public EntityEntry Entry => null; public BaseEntity Entity => _entity; diff --git a/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs b/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs index 6a560d6b46..bc26d02a4c 100644 --- a/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs +++ b/src/Tests/SmartStore.Core.Tests/PerformanceTests.cs @@ -1,6 +1,6 @@ //using System; //using System.Collections.Generic; -//using System.Runtime.Caching; +//using Microsoft.Extensions.Caching.Memory; //using System.Threading; //using NUnit.Framework; //using System.Linq; @@ -168,7 +168,7 @@ // absoluteExpiration = DateTime.UtcNow + duration.Value; // } -// var cacheItemPolicy = new CacheItemPolicy +// var cacheItemPolicy = new MemoryCacheEntryOptions // { // AbsoluteExpiration = absoluteExpiration, // SlidingExpiration = ObjectCache.NoSlidingExpiration diff --git a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj index 2570481131..05ec115cf6 100644 --- a/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj +++ b/src/Tests/SmartStore.Core.Tests/SmartStore.Core.Tests.csproj @@ -155,7 +155,6 @@ -