From f8cd73573e62a3c030fb9bfb8c70011498abd74a Mon Sep 17 00:00:00 2001 From: Version Upgrade Date: Fri, 31 Oct 2025 09:11:56 +0000 Subject: [PATCH] Upgrade to .NET 8 on Iteration 43 --- .../SmartStore.Core/Async/AsyncRunner.cs | 2 +- .../SmartStore.Core/Async/LocalAsyncState.cs | 2 +- .../Caching/MemoryCacheManager.cs | 2 +- .../IOutputCacheInvalidationObserver.cs | 1 - .../TypeConversion/DictionaryConverter.cs | 2 +- .../TypeConversion/TypeConverterFactory.cs | 2 +- .../Data/Hooks/HookedEntity.cs | 2 +- .../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 | 6 +- .../Domain/Common/GenericAttribute.cs | 2 +- .../Domain/Customers/Customer.cs | 19 +- .../Domain/Customers/CustomerRole.cs | 5 - .../Domain/Customers/CustomerRoleMapping.cs | 1 - .../Domain/Customers/WalletHistory.cs | 2 - .../Domain/DataExchange/SyncMapping.cs | 8 - .../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 | 4 - .../SmartStore.Core/Domain/Media/Download.cs | 5 - .../SmartStore.Core/Domain/Media/MediaFile.cs | 22 - .../Domain/Media/MediaFolder.cs | 2 - .../Domain/Media/MediaTrack.cs | 6 - .../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 | 5 - .../Domain/Tasks/ScheduleTaskHistory.cs | 6 - .../AppRegisterGlobalFiltersEvent.cs | 2 +- .../Extensions/HttpExtensions.cs | 6 +- .../Extensions/RouteExtensions.cs | 4 +- .../SmartStore.Core/Fakes/FakeController.cs | 2 +- .../SmartStore.Core/Fakes/FakeHttpRequest.cs | 4 +- 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/SmartStoreEngine.cs | 2 +- .../Infrastructure/WebAppTypeFinder.cs | 2 +- .../Logging/log4net/Log4netLoggerFactory.cs | 2 +- .../Packaging/PackagingUtils.cs | 2 +- src/Libraries/SmartStore.Core/PagedList`T.cs | 4 +- .../SmartStore.Core/Plugins/IConfigurable.cs | 2 +- .../SmartStore.Core/Plugins/PluginManager.cs | 6 +- 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 | 876 +------ .../SmartStore.Core.csproj.old | 809 ++++++ .../SmartStore.Core/Utilities/CommonHelper.cs | 4 +- .../Caching/CacheTransactionInterceptor.cs | 2 +- .../Caching/CachingCommandDefinition.cs | 4 +- .../Caching/CachingProviderServices.cs | 8 +- .../Caching/CommandTreeFacts.cs | 6 +- .../Caching/DbCacheExtensions.cs | 2 +- .../SmartStore.Data/Caching/DbCacheUtil.cs | 8 +- .../Caching/DbCachingPolicy.cs | 2 +- .../SmartStore.Data/Caching/EfDbModelStore.cs | 2 +- .../Caching/EfMappingViewCache.cs | 4 +- .../Caching/EfMappingViewCacheFactory.cs | 10 +- .../SmartStore.Data/Caching/QueryRegistrar.cs | 2 +- .../Caching/SingletonQueries.cs | 2 +- src/Libraries/SmartStore.Data/EfRepository.cs | 4 +- .../Extensions/DbContextExtensions.cs | 4 +- .../Extensions/DbEntityEntryExtensions.cs | 2 +- .../Extensions/ExceptionExtensions.cs | 4 +- .../Extensions/IDbContextExtensions.cs | 4 +- .../SmartStore.Data/IEfDataProvider.cs | 2 +- .../Mapping/Affiliates/AffiliateMap.cs | 2 +- .../Mapping/Blogs/BlogCommentMap.cs | 2 +- .../Mapping/Blogs/BlogPostMap.cs | 2 +- .../Catalog/BackInStockSubscriptionMap.cs | 2 +- .../Mapping/Catalog/CategoryMap.cs | 2 +- .../Mapping/Catalog/CategoryTemplateMap.cs | 2 +- .../Mapping/Catalog/CrossSellProductMap.cs | 2 +- .../Mapping/Catalog/ManufacturerMap.cs | 2 +- .../Catalog/ManufacturerTemplateMap.cs | 2 +- .../Mapping/Catalog/ProductAttributeMap.cs | 2 +- .../Catalog/ProductAttributeOptionMap.cs | 2 +- .../Catalog/ProductAttributeOptionsSetMap.cs | 2 +- .../ProductBundleItemAttributeFilterMap.cs | 2 +- .../Mapping/Catalog/ProductBundleItemMap.cs | 2 +- .../Mapping/Catalog/ProductCategoryMap.cs | 2 +- .../Mapping/Catalog/ProductManufacturerMap.cs | 2 +- .../Mapping/Catalog/ProductMap.cs | 2 +- .../Mapping/Catalog/ProductMediaFileMap.cs | 2 +- .../Catalog/ProductReviewHelpfulnessMap.cs | 2 +- .../Mapping/Catalog/ProductReviewMap.cs | 2 +- .../ProductSpecificationAttributeMap.cs | 2 +- .../Mapping/Catalog/ProductTagMap.cs | 2 +- .../Mapping/Catalog/ProductTemplateMap.cs | 2 +- .../ProductVariantAttributeCombinationMap.cs | 2 +- .../Catalog/ProductVariantAttributeMap.cs | 2 +- .../ProductVariantAttributeValueMap.cs | 2 +- .../Mapping/Catalog/RelatedProductMap.cs | 2 +- .../Catalog/SpecificationAttributeMap.cs | 2 +- .../SpecificationAttributeOptionMap.cs | 2 +- .../Mapping/Catalog/TierPriceMap.cs | 2 +- .../Mapping/Common/AddressMap.cs | 2 +- .../Mapping/Common/GenericAttributeMap.cs | 2 +- .../Mapping/Configuration/SettingMap.cs | 2 +- .../Mapping/Customers/CustomerContentMap.cs | 2 +- .../Mapping/Customers/CustomerMap.cs | 2 +- .../Mapping/Customers/CustomerRoleMap.cs | 2 +- .../ExternalAuthenticationRecordMap.cs | 2 +- .../Customers/RewardPointsHistoryMap.cs | 2 +- .../Mapping/Customers/WalletHistoryMap.cs | 2 +- .../DataExchange/ExportDeploymentMap.cs | 2 +- .../Mapping/DataExchange/ExportProfileMap.cs | 2 +- .../Mapping/DataExchange/ImportProfileMap.cs | 2 +- .../Mapping/DataExchange/SyncMappingMap.cs | 2 +- .../Mapping/Directory/CountryMap.cs | 2 +- .../Mapping/Directory/CurrencyMap.cs | 2 +- .../Mapping/Directory/DeliveryTimeMap.cs | 2 +- .../Mapping/Directory/MeasureDimensionMap.cs | 2 +- .../Mapping/Directory/MeasureWeightMap.cs | 2 +- .../Mapping/Directory/QuantityUnitMap.cs | 2 +- .../Mapping/Directory/StateProvinceMap.cs | 2 +- .../Mapping/Discounts/DiscountMap.cs | 2 +- .../Discounts/DiscountUsageHistoryMap.cs | 2 +- .../Mapping/Forums/ForumGroupMap.cs | 2 +- .../Mapping/Forums/ForumMap.cs | 2 +- .../Mapping/Forums/ForumPostMap.cs | 2 +- .../Mapping/Forums/ForumPostVoteMap.cs | 2 +- .../Mapping/Forums/ForumSubscriptionMap.cs | 2 +- .../Mapping/Forums/ForumTopicMap.cs | 2 +- .../Mapping/Forums/PrivateMessageMap.cs | 2 +- .../Mapping/Localization/LanguageMap.cs | 2 +- .../Localization/LocaleStringResourceMap.cs | 2 +- .../Localization/LocalizedPropertyMap.cs | 2 +- .../Mapping/Logging/ActivityLogMap.cs | 2 +- .../Mapping/Logging/ActivityLogTypeMap.cs | 2 +- .../SmartStore.Data/Mapping/Logging/LogMap.cs | 2 +- .../Mapping/Media/DownloadMap.cs | 2 +- .../Mapping/Media/MediaFileMap.cs | 2 +- .../Mapping/Media/MediaFolderMap.cs | 2 +- .../Mapping/Media/MediaStorageMap.cs | 2 +- .../Mapping/Media/MediaTagMap.cs | 2 +- .../Mapping/Media/MediaTrackMap.cs | 2 +- .../Mapping/Messages/CampaignMap.cs | 2 +- .../Mapping/Messages/EmailAccountMap.cs | 2 +- .../Mapping/Messages/MessageTemplateMap.cs | 2 +- .../Messages/NewsLetterSubscriptionMap.cs | 2 +- .../Messages/QueuedEmailAttachmentMap.cs | 2 +- .../Mapping/Messages/QueuedEmailMap.cs | 2 +- .../Mapping/News/NewsCommentMap.cs | 2 +- .../Mapping/News/NewsItemMap.cs | 2 +- .../Mapping/Orders/CheckoutAttributeMap.cs | 2 +- .../Orders/CheckoutAttributeValueMap.cs | 2 +- .../Mapping/Orders/GiftCardMap.cs | 2 +- .../Mapping/Orders/GiftCardUsageHistoryMap.cs | 2 +- .../Mapping/Orders/OrderItemMap.cs | 2 +- .../Mapping/Orders/OrderMap.cs | 2 +- .../Mapping/Orders/OrderNoteMap.cs | 2 +- .../Orders/RecurringPaymentHistoryMap.cs | 2 +- .../Mapping/Orders/RecurringPaymentMap.cs | 2 +- .../Mapping/Orders/ReturnRequestMap.cs | 2 +- .../Mapping/Orders/ShoppingCartItemMap.cs | 2 +- .../Mapping/Payments/PaymentMethodMap.cs | 2 +- .../Mapping/Polls/PollAnswerMap.cs | 2 +- .../SmartStore.Data/Mapping/Polls/PollMap.cs | 2 +- .../Mapping/Polls/PollVotingRecordMap.cs | 2 +- .../Mapping/Rules/RuleEntityMap.cs | 2 +- .../Mapping/Security/AclRecordMap.cs | 2 +- .../Mapping/Security/PermissionRecordMap.cs | 2 +- .../Mapping/Seo/UrlRecordMap.cs | 2 +- .../Mapping/Shipping/ShipmentItemMap.cs | 2 +- .../Mapping/Shipping/ShipmentMap.cs | 2 +- .../Mapping/Shipping/ShippingMethodMap.cs | 2 +- .../Mapping/Stores/StoreMap.cs | 2 +- .../Mapping/Stores/StoreMappingMap.cs | 2 +- .../Mapping/Tasks/ScheduleTaskHistoryMap.cs | 2 +- .../Mapping/Tasks/ScheduleTaskMap.cs | 2 +- .../Mapping/Tax/TaxCategoryMap.cs | 2 +- .../Mapping/Themes/ThemeVariableMap.cs | 2 +- .../Mapping/Topics/TopicMap.cs | 2 +- .../201705281903241_MoreIndexes.Designer.cs | 4 +- .../Migrations/201705281903241_MoreIndexes.cs | 2 +- ...01706020759565_UpdateMediaPath.Designer.cs | 4 +- .../201706020759565_UpdateMediaPath.cs | 2 +- .../201707190940318_V302Resources.Designer.cs | 4 +- .../201707190940318_V302Resources.cs | 2 +- ...7281452589_TierPriceCalcMethod.Designer.cs | 4 +- .../201707281452589_TierPriceCalcMethod.cs | 2 +- .../201708251628482_SystemTopics.Designer.cs | 4 +- .../201708251628482_SystemTopics.cs | 2 +- .../201709141000226_V303Resources.Designer.cs | 4 +- .../201709141000226_V303Resources.cs | 2 +- ...1538312_UpdateTrustedShopsTask.Designer.cs | 4 +- .../201709251538312_UpdateTrustedShopsTask.cs | 2 +- ...1710102038287_CurrencyRounding.Designer.cs | 4 +- .../201710102038287_CurrencyRounding.cs | 2 +- ...1710252016556_IndexOptionNames.Designer.cs | 4 +- .../201710252016556_IndexOptionNames.cs | 2 +- ...112331162_ProductMainPictureId.Designer.cs | 4 +- .../201711112331162_ProductMainPictureId.cs | 2 +- .../201711222311112_MoveFsMedia.Designer.cs | 4 +- .../Migrations/201711222311112_MoveFsMedia.cs | 2 +- ...1291017168_SyncStringResources.Designer.cs | 4 +- .../201711291017168_SyncStringResources.cs | 2 +- .../201712081631552_Liquid.Designer.cs | 4 +- .../Migrations/201712081631552_Liquid.cs | 2 +- .../201712290151517_AddressFormat.Designer.cs | 4 +- .../201712290151517_AddressFormat.cs | 2 +- ...30029_ShippingMethodMultistore.Designer.cs | 4 +- ...01802081830029_ShippingMethodMultistore.cs | 2 +- ...844034_ExportAttributeMappings.Designer.cs | 4 +- ...201802270844034_ExportAttributeMappings.cs | 2 +- .../201804060721031_Wallet.Designer.cs | 4 +- .../Migrations/201804060721031_Wallet.cs | 2 +- ...4090744324_ForceSslForAllPages.Designer.cs | 4 +- .../201804090744324_ForceSslForAllPages.cs | 2 +- .../201804200835273_V310Resources.Designer.cs | 4 +- .../201804200835273_V310Resources.cs | 2 +- .../201804252356096_TopicSlugs.Designer.cs | 4 +- .../Migrations/201804252356096_TopicSlugs.cs | 2 +- .../201805250724399_V315Resources.Designer.cs | 4 +- .../201805250724399_V315Resources.cs | 2 +- ...051221399_RefundReturnRequests.Designer.cs | 4 +- .../201806051221399_RefundReturnRequests.cs | 2 +- ...6231547270_ScheduleTaskHistory.Designer.cs | 4 +- .../201806231547270_ScheduleTaskHistory.cs | 2 +- ...07051830375_MoveCustomerFields.Designer.cs | 4 +- .../201807051830375_MoveCustomerFields.cs | 2 +- .../201807122120062_TopicAcl.Designer.cs | 4 +- .../Migrations/201807122120062_TopicAcl.cs | 2 +- ...91020207_OrderItemDeliveryTime.Designer.cs | 4 +- .../201807191020207_OrderItemDeliveryTime.cs | 2 +- ...1807201157391_DownloadVersions.Designer.cs | 4 +- .../201807201157391_DownloadVersions.cs | 2 +- ...11708428_ProductPreviewPicture.Designer.cs | 4 +- .../201807311708428_ProductPreviewPicture.cs | 2 +- .../201808051818238_Merge4.Designer.cs | 4 +- .../Migrations/201808051818238_Merge4.cs | 2 +- ...NewsletterSubscriptionLanguage.Designer.cs | 4 +- ...71309522_NewsletterSubscriptionLanguage.cs | 2 +- .../201809261026134_ForumGroupAcl.Designer.cs | 4 +- .../201809261026134_ForumGroupAcl.cs | 2 +- .../201810011954195_ForumPostVote.Designer.cs | 4 +- .../201810011954195_ForumPostVote.cs | 2 +- ...14068_DataExchangeEnhancements.Designer.cs | 4 +- ...01810231214068_DataExchangeEnhancements.cs | 2 +- ...061745204_IsSystemProductIndex.Designer.cs | 4 +- .../201811061745204_IsSystemProductIndex.cs | 2 +- ...LocalizedPropertyKeyGroupIndex.Designer.cs | 4 +- ...82148279_LocalizedPropertyKeyGroupIndex.cs | 2 +- ...1142587_TaskHistoryErrorLength.Designer.cs | 4 +- .../201811161142587_TaskHistoryErrorLength.cs | 2 +- ...2204501_ProductIndexSeekExport.Designer.cs | 4 +- .../201811202204501_ProductIndexSeekExport.cs | 2 +- ...11855242_TopicHtmlIdAndBodyCss.Designer.cs | 4 +- .../201902211855242_TopicHtmlIdAndBodyCss.cs | 2 +- .../201904110735029_Menus.Designer.cs | 4 +- .../Migrations/201904110735029_Menus.cs | 2 +- .../201905020948354_WidgetTopics.Designer.cs | 4 +- .../201905020948354_WidgetTopics.cs | 2 +- .../201905101159134_V320Resources.Designer.cs | 4 +- .../201905101159134_V320Resources.cs | 2 +- .../201905271110370_V321Resources.Designer.cs | 4 +- .../201905271110370_V321Resources.cs | 2 +- ...2008551_QuantityUnitNamePlural.Designer.cs | 4 +- .../201906252008551_QuantityUnitNamePlural.cs | 2 +- ...032251575_CategoryExternalLink.Designer.cs | 4 +- .../201907032251575_CategoryExternalLink.cs | 2 +- ...7221803421_GranularPermissions.Designer.cs | 4 +- .../201907221803421_GranularPermissions.cs | 2 +- .../201907250103367_RuleSystem.Designer.cs | 4 +- .../Migrations/201907250103367_RuleSystem.cs | 2 +- ...8298_MoveFurtherCustomerFields.Designer.cs | 4 +- ...1908050758298_MoveFurtherCustomerFields.cs | 2 +- .../201908150749388_V322Resources.Designer.cs | 4 +- .../201908150749388_V322Resources.cs | 2 +- .../201908211821559_Merge5.Designer.cs | 4 +- .../Migrations/201908211821559_Merge5.cs | 2 +- ...8211825244_ProductTagPublished.Designer.cs | 4 +- .../201908211825244_ProductTagPublished.cs | 2 +- ...08261226350_MenuItemMultistore.Designer.cs | 4 +- .../201908261226350_MenuItemMultistore.cs | 2 +- ...043284_BlogAndNewsItemPictures.Designer.cs | 4 +- ...201909291043284_BlogAndNewsItemPictures.cs | 2 +- ...021805242_RemoveOldPermissions.Designer.cs | 4 +- .../201910021805242_RemoveOldPermissions.cs | 2 +- .../201910162004581_Merge6.Designer.cs | 4 +- .../Migrations/201910162004581_Merge6.cs | 2 +- ...911090805330_ProductVisibility.Designer.cs | 4 +- .../201911090805330_ProductVisibility.cs | 2 +- .../201911120909434_Merge7.Designer.cs | 4 +- .../Migrations/201911120909434_Merge7.cs | 2 +- ...141820264_ScheduleTaskPriority.Designer.cs | 4 +- .../201911141820264_ScheduleTaskPriority.cs | 2 +- ...05_MessageTemplateEmailAddress.Designer.cs | 4 +- ...12051209105_MessageTemplateEmailAddress.cs | 2 +- ...912111821362_AddNewPermissions.Designer.cs | 4 +- .../201912111821362_AddNewPermissions.cs | 2 +- ...cationAttributeColorAndPicture.Designer.cs | 4 +- ...1_SpecificationAttributeColorAndPicture.cs | 2 +- ..._ManufacturerBottomDescription.Designer.cs | 4 +- ...221054109_ManufacturerBottomDescription.cs | 2 +- ...2001301039020_DiscountRuleSets.Designer.cs | 4 +- .../202001301039020_DiscountRuleSets.cs | 2 +- ...02172101120_PictureMediaRename.Designer.cs | 4 +- .../202002172101120_PictureMediaRename.cs | 6 +- ...2180228163_PictureMediaRename1.Designer.cs | 4 +- .../202002180228163_PictureMediaRename1.cs | 2 +- ...074_RemoveDiscountRequirements.Designer.cs | 4 +- ...002191252074_RemoveDiscountRequirements.cs | 2 +- ...1011108_GenericMessageTemplate.Designer.cs | 4 +- .../202002211011108_GenericMessageTemplate.cs | 2 +- ...2002241354543_ProductCondition.Designer.cs | 4 +- .../202002241354543_ProductCondition.cs | 2 +- ...10114_ManufacturerSubjectToAcl.Designer.cs | 4 +- ...02002251510114_ManufacturerSubjectToAcl.cs | 2 +- ...2271206204_ShipmentTrackingUrl.Designer.cs | 4 +- .../202002271206204_ShipmentTrackingUrl.cs | 2 +- .../202002280005340_MediaManager.Designer.cs | 4 +- .../202002280005340_MediaManager.cs | 2 +- .../202003022018038_Merge8.Designer.cs | 4 +- .../Migrations/202003022018038_Merge8.cs | 2 +- ...052100521_CustomerRoleMappings.Designer.cs | 4 +- .../202003052100521_CustomerRoleMappings.cs | 2 +- .../202003112359492_MediaManager2.Designer.cs | 4 +- .../202003112359492_MediaManager2.cs | 2 +- .../202003171812584_CookieManager.Designer.cs | 4 +- .../202003171812584_CookieManager.cs | 2 +- ...2003251118391_CategoryRuleSets.Designer.cs | 4 +- .../202003251118391_CategoryRuleSets.cs | 2 +- ...1314082_CookieManagerCountries.Designer.cs | 4 +- .../202003311314082_CookieManagerCountries.cs | 2 +- ...88_RemoveCustomerCustomerRoles.Designer.cs | 4 +- ...04301922188_RemoveCustomerCustomerRoles.cs | 2 +- ...111006305_CampaignSubjectToAcl.Designer.cs | 4 +- .../202005111006305_CampaignSubjectToAcl.cs | 2 +- .../202005201826512_MediaManager3.Designer.cs | 4 +- .../202005201826512_MediaManager3.cs | 2 +- .../202006250801086_V400Resources.Designer.cs | 4 +- .../202006250801086_V400Resources.cs | 2 +- ...7160058551_MediaFileIndexReorg.Designer.cs | 4 +- .../202007160058551_MediaFileIndexReorg.cs | 2 +- .../202007241131557_V401Resources.Designer.cs | 4 +- .../202007241131557_V401Resources.cs | 2 +- ...847004_NewPropertiesAndIndexes.Designer.cs | 4 +- ...202007291847004_NewPropertiesAndIndexes.cs | 2 +- ...363_AddCustomerRoleOrderAmount.Designer.cs | 4 +- ...007301117363_AddCustomerRoleOrderAmount.cs | 2 +- ..._RenamedCustomerRoleOrderTotal.Designer.cs | 4 +- ...181949580_RenamedCustomerRoleOrderTotal.cs | 2 +- .../202009021705132_Merge9.Designer.cs | 4 +- .../Migrations/202009021705132_Merge9.cs | 2 +- .../202009041122208_ShopIcons.Designer.cs | 4 +- .../Migrations/202009041122208_ShopIcons.cs | 2 +- ...0817220_DeliveryTimeMinMaxDays.Designer.cs | 4 +- .../202009090817220_DeliveryTimeMinMaxDays.cs | 2 +- ...02010011005387_TopicCookieType.Designer.cs | 4 +- .../202010011005387_TopicCookieType.cs | 2 +- ...39136_AttributeChoiceBehaviour.Designer.cs | 4 +- ...02010030939136_AttributeChoiceBehaviour.cs | 2 +- ...9446_RemoveBlogAndNewsLanguage.Designer.cs | 4 +- ...2010121359446_RemoveBlogAndNewsLanguage.cs | 2 +- .../202011091154314_V410Resources.Designer.cs | 4 +- .../202011091154314_V410Resources.cs | 2 +- ...1645539_AddBlogAndNewsLanguage.Designer.cs | 4 +- .../202012051645539_AddBlogAndNewsLanguage.cs | 2 +- .../202101251149352_V411Resources.Designer.cs | 4 +- .../202101251149352_V411Resources.cs | 2 +- .../202112171231491_V420Resources.Designer.cs | 4 +- .../202112171231491_V420Resources.cs | 2 +- .../Migrations/MigrationsConfiguration.cs | 2 +- .../ObjectContextBase.SaveChanges.cs | 4 +- .../SmartStore.Data/ObjectContextBase.cs | 4 +- .../Setup/Builder/ActivityLogTypeMigrator.cs | 2 +- .../Setup/Builder/LocaleResourcesMigrator.cs | 2 +- .../Setup/Builder/SettingsMigrator.cs | 2 +- .../Setup/DbMigrationContext.cs | 2 +- .../Setup/DbSeedingMigrator.cs | 6 +- .../SmartStore.Data/Setup/IDataSeeder.cs | 2 +- .../Setup/IDbMigrationExtensions.cs | 4 +- .../Setup/InstallDatabaseInitializer.cs | 4 +- .../Setup/MigrateDatabaseInitializer.cs | 6 +- .../SmartStore.Data/Setup/MigratorUtils.cs | 2 +- .../Setup/SeedDbMigrationEvent.cs | 2 +- .../SmartStore.Data/SmartDbConfiguration.cs | 8 +- .../SmartStore.Data/SmartObjectContext.cs | 4 +- .../SmartStore.Data/SmartStore.Data.csproj | 1029 +------- .../SmartStore.Data.csproj.old | 1015 ++++++++ .../SmartStore.Data/SqlCeDataProvider.cs | 2 +- .../SmartStore.Data/SqlServerDataProvider.cs | 2 +- .../SmartStore.Data/Utilities/DataMigrator.cs | 2 +- .../SmartStore.Data/Utilities/FastPager.cs | 2 +- .../Utilities/SqlBlobStream.cs | 2 +- .../Authentication/External/AuthorizeState.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 | 2 +- .../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 | 2 +- .../Cms/Blocks/IBindableBlockHandler.cs | 2 +- .../Cms/Blocks/IBlockHandler.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 +- .../Import/ImportProfileService.cs | 4 +- .../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 | 4 +- .../Media/MediaUrlGenerator.cs | 2 +- .../Media/Search/MediaSearcher.cs | 2 +- .../Storage/DatabaseMediaStorageProvider.cs | 4 +- .../Media/Storage/MediaMover.cs | 2 +- .../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 +- .../Rules/DefaultRuleOptionsProvider.cs | 2 +- .../Search/Catalog/CatalogSearchService.cs | 4 +- .../Catalog/LinqCatalogSearchService.cs | 2 +- .../CatalogSearchQueryModelBinder.cs | 2 +- .../Search/Extensions/UrlHelperExtensions.cs | 2 +- .../Search/Forum/ForumSearchService.cs | 2 +- .../Search/Forum/LinqForumSearchService.cs | 2 +- .../Modelling/ForumSearchQueryModelBinder.cs | 2 +- .../Search/SearchServiceBase.cs | 2 +- .../Security/PermissionService.cs | 2 +- .../Seo/IXmlSitemapPublisher.cs | 2 +- .../Seo/XmlSitemapGenerator.cs | 4 +- .../SmartStore.Services.csproj | 870 +------ .../SmartStore.Services.csproj.old | 844 +++++++ .../Tasks/ScheduleTaskService.cs | 4 +- .../Tasks/TaskScheduler.cs | 2 +- .../SmartStore.DevTools.csproj | 367 +-- .../SmartStore.DevTools.csproj.old | 348 +++ .../SmartStore.OfflinePayment.csproj | 281 +-- .../SmartStore.OfflinePayment.csproj.old | 269 ++ .../SmartStore.Shipping.csproj | 287 +-- .../SmartStore.Shipping.csproj.old | 272 ++ .../SmartStore.Tax/SmartStore.Tax.csproj | 290 +-- .../SmartStore.Tax/SmartStore.Tax.csproj.old | 275 ++ .../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 | 2 +- .../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 +- .../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 | 2 +- .../Seo/RewriteUrlAttribute.cs | 6 +- .../Settings/LoadSettingAttribute.cs | 2 +- .../Settings/SaveSettingAttribute.cs | 2 +- .../Settings/StoreDependingSettingHelper.cs | 2 +- .../SmartDependencyResolver.cs | 2 +- .../SmartStore.Web.Framework.csproj | 534 +--- .../SmartStore.Web.Framework.csproj.old | 520 ++++ .../SmartUrlRoutingModule.cs | 4 +- .../Templating/Liquid/LiquidTemplate.cs | 2 +- .../Theming/AdminThemedAttribute.cs | 2 +- .../Assets/BundlingVirtualPathProvider.cs | 2 +- .../Theming/Assets/DefaultAssetCache.cs | 2 +- .../Assets/ModuleImportsVirtualFile.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 | 2 +- .../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 | 2 +- .../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/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 | 2 +- .../UI/Components/TabStrip/TabBuilder.cs | 2 +- .../UI/Components/TabStrip/TabFactory.cs | 2 +- .../UI/Components/TabStrip/TabStripBuilder.cs | 2 +- .../Components/TabStrip/TabStripRenderer.cs | 2 +- .../UI/Components/Window/Window.cs | 2 +- .../UI/Components/Window/WindowBuilder.cs | 2 +- .../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 +- .../WebApiConfigurationBroadcaster.cs | 2 +- .../Extensions/ApiControllerExtensions.cs | 2 +- .../HttpRequestMessageExtensions.cs | 2 +- .../WebApi/OData/WebApiEntityController.cs | 4 +- .../WebApi/OData/WebApiQueryableAttribute.cs | 2 +- .../Security/WebApiAuthenticateAttribute.cs | 2 +- .../WebApi/WebApiStartupTask.cs | 2 +- .../Administration/SmartStore.Admin.csproj | 1398 +---------- .../SmartStore.Admin.csproj.old2 | 1388 +++++++++++ .../SmartStore.Web/SmartStore.Web.csproj | 2208 +---------------- .../SmartStore.Web/SmartStore.Web.csproj.old2 | 2168 ++++++++++++++++ 631 files changed, 8951 insertions(+), 8734 deletions(-) create mode 100644 src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old create mode 100644 src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old create mode 100644 src/Libraries/SmartStore.Services/SmartStore.Services.csproj.old create mode 100644 src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj.old create mode 100644 src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj.old create mode 100644 src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj.old create mode 100644 src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj.old create mode 100644 src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj.old create mode 100644 src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj.old2 create mode 100644 src/Presentation/SmartStore.Web/SmartStore.Web.csproj.old2 diff --git a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs index 91ffb0db95..734c69159e 100644 --- a/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs +++ b/src/Libraries/SmartStore.Core/Async/AsyncRunner.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Threading; using System.Threading.Tasks; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using Autofac; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs index ba66c15bf0..026978c927 100644 --- a/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs +++ b/src/Libraries/SmartStore.Core/Async/LocalAsyncState.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.Caching; +using Microsoft.Extensions.Caching.Memory; using System.Threading; namespace SmartStore.Core.Async diff --git a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs index 332b199c61..69046e5ba0 100644 --- a/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs +++ b/src/Libraries/SmartStore.Core/Caching/MemoryCacheManager.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Runtime.Caching; +using Microsoft.Extensions.Caching.Memory; using System.Runtime.CompilerServices; using System.Text.RegularExpressions; using System.Threading; diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs index 069a0bd62c..ab0c0dada6 100644 --- a/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs +++ b/src/Libraries/SmartStore.Core/Caching/OutputCache/IOutputCacheInvalidationObserver.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Linq.Expressions; using SmartStore.Core.Configuration; -using SmartStore.Core.Data.Hooks; using SmartStore.Core.Infrastructure.DependencyManagement; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs index d94b7933e7..c0d97937dd 100644 --- a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs +++ b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/DictionaryConverter.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Dynamic; using System.Globalization; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using SmartStore.Utilities; namespace SmartStore.ComponentModel diff --git a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs index 4db9fd8d90..a0fdbd9e9d 100644 --- a/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs +++ b/src/Libraries/SmartStore.Core/ComponentModel/TypeConversion/TypeConverterFactory.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Dynamic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using Newtonsoft.Json.Linq; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Shipping; diff --git a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs index 11a9944a32..f0ef11fcd4 100644 --- a/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs +++ b/src/Libraries/SmartStore.Core/Data/Hooks/HookedEntity.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.ChangeTracking; using EfState = System.Data.Entity.EntityState; namespace SmartStore.Core.Data.Hooks diff --git a/src/Libraries/SmartStore.Core/Data/IDbContext.cs b/src/Libraries/SmartStore.Core/Data/IDbContext.cs index 95224e0308..5044fca160 100644 --- a/src/Libraries/SmartStore.Core/Data/IDbContext.cs +++ b/src/Libraries/SmartStore.Core/Data/IDbContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Threading.Tasks; namespace SmartStore.Core.Data diff --git a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs index 430f4eabee..789a28b615 100644 --- a/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/IDbContextExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs index dc5a3eed3e..67173d80eb 100644 --- a/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/IQueryableExtensions.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs index 1fefc75eb2..f8cfc5e28a 100644 --- a/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs +++ b/src/Libraries/SmartStore.Core/Data/RepositoryExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Linq.Expressions; diff --git a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs index 821d502963..c433f51a65 100644 --- a/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs +++ b/src/Libraries/SmartStore.Core/Domain/Blogs/BlogPost.cs @@ -167,7 +167,6 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// Gets or sets a language identifier for which the blog post should be displayed. /// [DataMember] - [Index] public int? LanguageId { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs index f0364da897..5d760ef767 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Category.cs @@ -173,7 +173,6 @@ public partial class Category : BaseEntity, ICategoryNode, IAuditable, ISoftDele /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs index 68ec18111c..22d4205361 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Manufacturer.cs @@ -109,7 +109,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// Gets or sets a value indicating whether the entity is subject to ACL. /// [DataMember] - [Index] public bool SubjectToAcl { get; set; } /// @@ -121,7 +120,6 @@ public partial class Manufacturer : BaseEntity, IAuditable, ISoftDeletable, ILoc /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] public bool Deleted { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs index 06abbb9bbf..eff2b49bb4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/Product.cs @@ -90,7 +90,6 @@ public static IReadOnlyCollection GetVisibilityAffectingPropertyNames() /// Gets or sets the visibility level of the product. /// [DataMember] - [Index] public ProductVisibility Visibility { get; set; } /// @@ -216,7 +215,6 @@ public string Sku /// Gets or sets the manufacturer part number /// [DataMember] - [Index] public string ManufacturerPartNumber { [DebuggerStepThrough] @@ -228,7 +226,6 @@ public string ManufacturerPartNumber /// Gets or sets the Global Trade Item Number (GTIN). These identifiers include UPC (in North America), EAN (in Europe), JAN (in Japan), and ISBN (for books). /// [DataMember] - [Index] public string Gtin { [DebuggerStepThrough] @@ -669,30 +666,23 @@ public decimal Height /// Gets or sets a value indicating whether the entity is published /// [DataMember] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 1)] public bool Published { get; set; } /// /// Gets or sets a value indicating whether the entity has been deleted /// - [Index] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 2)] public bool Deleted { get; set; } /// /// Gets or sets a value indicating whether the entity is a system product. /// [DataMember] - [Index] - [Index("IX_Product_SystemName_IsSystemProduct", 2)] - [Index("IX_Product_Published_Deleted_IsSystemProduct", 3)] public bool IsSystemProduct { get; set; } /// /// Gets or sets the product system name. /// [DataMember] - [Index("IX_Product_SystemName_IsSystemProduct", 1)] public string SystemName { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs index 9043816b92..271ad124f1 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductAttribute.cs @@ -37,14 +37,12 @@ public partial class ProductAttribute : BaseEntity, ILocalizedEntity, ISearchAli /// Gets or sets whether the attribute can be filtered /// [DataMember] - [Index] public bool AllowFiltering { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index] public int DisplayOrder { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs index 1d027e15b4..84c9c4f4e3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductCategory.cs @@ -25,7 +25,6 @@ public partial class ProductCategory : BaseEntity /// Gets or sets a value indicating whether the product is featured /// [DataMember] - [Index] public bool IsFeaturedProduct { get; set; } /// @@ -38,7 +37,6 @@ public partial class ProductCategory : BaseEntity /// Indicates whether the mapping is created by the user or by the system. /// [DataMember] - [Index] public bool IsSystemMapping { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs index 88babcda90..22aafb82c4 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductManufacturer.cs @@ -25,7 +25,6 @@ public partial class ProductManufacturer : BaseEntity /// Gets or sets a value indicating whether the product is featured /// [DataMember] - [Index] public bool IsFeaturedProduct { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs index ace86b58ef..0c18987c40 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductTag.cs @@ -23,7 +23,6 @@ public partial class ProductTag : BaseEntity, ILocalizedEntity /// Gets or sets a value indicating whether the entity is published. /// [DataMember] - [Index("IX_ProductTag_Published")] public bool Published { get; set; } = true; /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs index 44f6a4885e..3d18477b8e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttribute.cs @@ -18,7 +18,6 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity /// Gets or sets the product identifier /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 1)] public int ProductId { get; set; } /// @@ -51,14 +50,12 @@ public partial class ProductVariantAttribute : BaseEntity, ILocalizedEntity /// Gets or sets the attribute control type identifier /// [DataMember] - [Index] public int AttributeControlTypeId { get; set; } /// /// Gets or sets the display order /// [DataMember] - [Index("IX_Product_ProductAttribute_Mapping_ProductId_DisplayOrder", 2)] public int DisplayOrder { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs index d3199afd8c..39025e8cc2 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeCombination.cs @@ -24,14 +24,12 @@ public partial class ProductVariantAttributeCombination : BaseEntity /// Gets or sets the stock quantity /// [DataMember] - [Index("IX_StockQuantity_AllowOutOfStockOrders", 1)] public int StockQuantity { get; set; } /// /// Gets or sets a value indicating whether to allow orders when out of stock /// [DataMember] - [Index("IX_StockQuantity_AllowOutOfStockOrders", 2)] public bool AllowOutOfStockOrders { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs index 7804a7f972..81853a7c6d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/ProductVariantAttributeValue.cs @@ -15,7 +15,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the product variant attribute mapping identifier /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 1)] public int ProductVariantAttributeId { get; set; } /// @@ -28,7 +27,6 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the product variant attribute name /// [DataMember] - [Index] public string Name { get; set; } /// @@ -65,14 +63,12 @@ public partial class ProductVariantAttributeValue : BaseEntity, ILocalizedEntity /// Gets or sets the display order /// [DataMember] - [Index("IX_ProductVariantAttributeValue_ProductVariantAttributeId_DisplayOrder", 2)] public int DisplayOrder { get; set; } /// /// Gets or sets the type Id /// [DataMember] - [Index] public int ValueTypeId { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs index 9b3a3c6463..e30a6eb201 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SmartStoreProductVariantAttributeCombination.cs @@ -20,11 +20,9 @@ public ProductVariantAttributeCombination() public string Sku { get; set; } [DataMember] - [Index] public string Gtin { get; set; } [DataMember] - [Index] public string ManufacturerPartNumber { get; set; } [DataMember] @@ -61,7 +59,6 @@ public ProductVariantAttributeCombination() public virtual QuantityUnit QuantityUnit { get; set; } [DataMember] - [Index] public bool IsActive { get; set; } //public bool IsDefaultCombination { get; set; } diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs index f867f81ff7..d74ce5f850 100644 --- a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs @@ -43,7 +43,6 @@ public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity, ISea /// Gets or sets whether the specification attribute can be filtered. Only effective in accordance with MegaSearchPlus plugin. /// [DataMember] - [Index] public bool AllowFiltering { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs index 90fc7610e9..01d0ac59f0 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuItemRecord.cs @@ -27,7 +27,6 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets the parent menu item identifier. 0 if the item has no parent. /// - [Index("IX_MenuItem_ParentItemId")] public int ParentItemId { get; set; } /// @@ -63,13 +62,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets a value indicating whether the menu item is published. /// - [Index("IX_MenuItem_Published")] public bool Published { get; set; } = true; /// /// Gets or sets the display order. /// - [Index("IX_MenuItem_DisplayOrder")] public int DisplayOrder { get; set; } /// @@ -125,13 +122,11 @@ public class MenuItemRecord : BaseEntity, ILocalizedEntity, IStoreMappingSupport /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores. /// - [Index("IX_MenuItem_LimitedToStores")] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. /// - [Index("IX_MenuItem_SubjectToAcl")] public bool SubjectToAcl { get; set; } } } diff --git a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs index 19dfe6e581..a1e9746774 100644 --- a/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs +++ b/src/Libraries/SmartStore.Core/Domain/Cms/MenuRecord.cs @@ -29,13 +29,12 @@ public virtual ICollection Items /// /// Gets or sets the system name. It identifies the menu. /// - [Required, StringLength(400), Index("IX_Menu_SystemName_IsSystemMenu", Order = 0)] + [Required, StringLength(400)] public string SystemName { get; set; } /// /// Gets or sets the value indicating whether this menu is deleteable by a user. /// - [Index("IX_Menu_SystemName_IsSystemMenu", Order = 1)] public bool IsSystemMenu { get; set; } /// @@ -59,7 +58,6 @@ public virtual ICollection Items /// /// Gets or sets a value indicating whether the menu is published. /// - [Index("IX_Menu_Published")] public bool Published { get; set; } = true; /// @@ -70,13 +68,11 @@ public virtual ICollection Items /// /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores. /// - [Index("IX_Menu_LimitedToStores")] public bool LimitedToStores { get; set; } /// /// Gets or sets a value indicating whether the entity is subject to ACL. /// - [Index("IX_Menu_SubjectToAcl")] public bool SubjectToAcl { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs index 4a8e6d5723..b7a4de20e3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs +++ b/src/Libraries/SmartStore.Core/Domain/Common/GenericAttribute.cs @@ -23,7 +23,7 @@ public partial class GenericAttribute : BaseEntity /// /// Gets or sets the key /// - [DataMember, Index("IX_GenericAttribute_Key")] + [DataMember] public string Key { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs index c0582bce24..b5dbd9b4eb 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/Customer.cs @@ -105,35 +105,30 @@ public PasswordFormat PasswordFormat /// /// Gets or sets a value indicating whether the customer has been deleted /// - [Index] - [Index("IX_Customer_Deleted_IsSystemAccount", 1)] public bool Deleted { get; set; } /// /// Gets or sets a value indicating whether the customer account is system /// [DataMember] - [Index] - [Index("IX_Customer_Deleted_IsSystemAccount", 2)] public bool IsSystemAccount { get; set; } /// /// Gets or sets the customer system name /// [DataMember] - [Index] public string SystemName { get; set; } /// /// Gets or sets the last IP address /// - [DataMember, Index("IX_Customer_LastIpAddress")] + [DataMember] public string LastIpAddress { get; set; } /// /// Gets or sets the date and time of entity creation /// - [DataMember, Index("IX_Customer_CreatedOn")] + [DataMember] public DateTime CreatedOnUtc { get; set; } /// @@ -145,7 +140,7 @@ public PasswordFormat PasswordFormat /// /// Gets or sets the date and time of last activity /// - [DataMember, Index("IX_Customer_LastActivity")] + [DataMember] public DateTime LastActivityDateUtc { get; set; } /// @@ -162,16 +157,16 @@ public PasswordFormat PasswordFormat [DataMember] public string LastName { get; set; } - [DataMember, Index("IX_Customer_FullName")] + [DataMember] public string FullName { get; set; } - [DataMember, Index("IX_Customer_Company")] + [DataMember] public string Company { get; set; } - [DataMember, Index("IX_Customer_CustomerNumber")] + [DataMember] public string CustomerNumber { get; set; } - [DataMember, Index("IX_Customer_BirthDate")] + [DataMember] public DateTime? BirthDate { get; set; } [DataMember] diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs index f5f8e96436..6d20871c2e 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRole.cs @@ -43,23 +43,18 @@ public partial class CustomerRole : BaseEntity, IRulesContainer /// Gets or sets a value indicating whether the customer role is active /// [DataMember] - [Index] public bool Active { get; set; } /// /// Gets or sets a value indicating whether the customer role is system /// [DataMember] - [Index] - [Index("IX_CustomerRole_SystemName_IsSystemRole", 2)] public bool IsSystemRole { get; set; } /// /// Gets or sets the customer role system name /// [DataMember] - [Index] - [Index("IX_CustomerRole_SystemName_IsSystemRole", 1)] public string SystemName { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs index 18ff112076..7035fb90f3 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/CustomerRoleMapping.cs @@ -26,7 +26,6 @@ public partial class CustomerRoleMapping : BaseEntity /// Indicates whether the mapping is created by the user or by the system. /// [DataMember] - [Index] public bool IsSystemMapping { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs index 4befa9f0d9..fd0dd77183 100644 --- a/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Customers/WalletHistory.cs @@ -12,7 +12,6 @@ public class WalletHistory : BaseEntity /// /// Gets or sets the store identifier. Should not be zero. /// - [Index("IX_StoreId_CreatedOn", 0)] public int StoreId { get; set; } /// @@ -43,7 +42,6 @@ public class WalletHistory : BaseEntity /// /// Gets or sets the date ehen the entry was created (in UTC). /// - [Index("IX_StoreId_CreatedOn", 1)] public DateTime CreatedOnUtc { get; set; } /// diff --git a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs index 09230db0a7..3b10e948e1 100644 --- a/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs +++ b/src/Libraries/SmartStore.Core/Domain/DataExchange/SyncMapping.cs @@ -1,7 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; -using SmartStore.Core.Data.Hooks; namespace SmartStore.Core.Domain.DataExchange { @@ -9,7 +8,6 @@ namespace SmartStore.Core.Domain.DataExchange /// Holds info about a synchronization operation with an external system /// [DataContract] - [Hookable(false)] public partial class SyncMapping : BaseEntity { public SyncMapping() @@ -20,30 +18,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..3a136efd5f 100644 --- a/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs +++ b/src/Libraries/SmartStore.Core/Domain/Logging/Log.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using SmartStore.Core.Data.Hooks; using SmartStore.Core.Domain.Customers; using SmartStore.Core.Logging; @@ -9,13 +8,11 @@ namespace SmartStore.Core.Domain.Logging /// /// Represents a log record /// - [Hookable(false)] 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 +53,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..db47583208 100644 --- a/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs +++ b/src/Libraries/SmartStore.Core/Domain/Media/MediaTrack.cs @@ -1,7 +1,6 @@ using System; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; -using SmartStore.Core.Data.Hooks; using SmartStore.Utilities; namespace SmartStore.Core.Domain.Media @@ -13,7 +12,6 @@ public enum MediaTrackOperation } [DataContract] - [Hookable(false)] public partial class MediaTrack : BaseEntity, IEquatable { private int _mediaFileId; @@ -26,7 +24,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 +49,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 +63,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 +77,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..a5b1fd360d 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTask.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Diagnostics; -using SmartStore.Core.Data.Hooks; namespace SmartStore.Core.Domain.Tasks { @@ -14,7 +13,6 @@ public enum TaskPriority } [DebuggerDisplay("{Name} (Type: {Type})")] - [Hookable(false)] public class ScheduleTask : BaseEntity, ICloneable { private ICollection _scheduleTaskHistory; @@ -37,13 +35,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 +52,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..7a8b45abcf 100644 --- a/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs +++ b/src/Libraries/SmartStore.Core/Domain/Tasks/ScheduleTaskHistory.cs @@ -1,10 +1,8 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -using SmartStore.Core.Data.Hooks; namespace SmartStore.Core.Domain.Tasks { - [Hookable(false)] public class ScheduleTaskHistory : BaseEntity, ICloneable { /// @@ -15,25 +13,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/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/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/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/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..7a6d462848 100644 --- a/src/Libraries/SmartStore.Core/PagedList`T.cs +++ b/src/Libraries/SmartStore.Core/PagedList`T.cs @@ -2,8 +2,8 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.ChangeTracking; 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..1bd3d618c7 100644 --- a/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs +++ b/src/Libraries/SmartStore.Core/Plugins/PluginManager.cs @@ -6,9 +6,7 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; -using System.Web; -using System.Web.Compilation; -using Microsoft.Web.Infrastructure.DynamicModuleHelper; +using Microsoft.AspNetCore.Http; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; using SmartStore.Core.Infrastructure.DependencyManagement; @@ -21,7 +19,7 @@ // SEE THIS POST for full details of what this does //http://shazwazza.com/post/Developing-a-plugin-framework-in-ASPNET-with-medium-trust.aspx -[assembly: PreApplicationStartMethod(typeof(PluginManager), "Initialize")] +// TODO: PreApplicationStartMethod removed - initialize in Program.cs startup 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..d2ed3cf523 100644 --- a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj @@ -1,810 +1,90 @@ - - + - 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 - - - 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 + disable + disable + latest + false + - - ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\HtmlSanitizer.4.0.205\lib\net45\HtmlSanitizer.dll - - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - True - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - True - - - - - - - - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - True - - - - ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + PreserveNewest + + - + + - - - - - - - - - \ No newline at end of file + diff --git a/src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old new file mode 100644 index 0000000000..fa9b07ff5c --- /dev/null +++ b/src/Libraries/SmartStore.Core/SmartStore.Core.csproj.old @@ -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.Data/Caching/CacheTransactionInterceptor.cs b/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs index 6cea03e354..9e3cbdea7a 100644 --- a/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs +++ b/src/Libraries/SmartStore.Data/Caching/CacheTransactionInterceptor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.Entity.Infrastructure.Interception; +using Microsoft.EntityFrameworkCore.Infrastructure.Interception; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs b/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs index 0f9e2754c5..10d311ecd6 100644 --- a/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs +++ b/src/Libraries/SmartStore.Data/Caching/CachingCommandDefinition.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.Data.Common; -using System.Data.Entity.Core.Common; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Common; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs b/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs index 06085ea2c7..75a5bae641 100644 --- a/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs +++ b/src/Libraries/SmartStore.Data/Caching/CachingProviderServices.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.Entity.Core.Common; -using System.Data.Entity.Core.Common.CommandTrees; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Spatial; +using Microsoft.EntityFrameworkCore.Core.Common; +using Microsoft.EntityFrameworkCore.Core.Common.CommandTrees; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Spatial; using SmartStore.Data.Setup; using SmartStore.Utilities; diff --git a/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs b/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs index 37e4bba8d6..5c2f981b5b 100644 --- a/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs +++ b/src/Libraries/SmartStore.Data/Caching/CommandTreeFacts.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.Entity.Core.Common.CommandTrees; -using System.Data.Entity.Core.Mapping; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Common.CommandTrees; +using Microsoft.EntityFrameworkCore.Core.Mapping; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; using System.Diagnostics; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs b/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs index b25df7670f..6bf709fda7 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCacheExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.Entity.Core.Objects; +using Microsoft.EntityFrameworkCore.Core.Objects; using System.Linq; using System.Text; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs index aa426e1762..7a9d433f21 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCacheUtil.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.Entity.Core.EntityClient; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Core.Objects; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Core.EntityClient; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Objects; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using System.Reflection; using SmartStore.ComponentModel; diff --git a/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs b/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs index 7223f8d33a..4daf106289 100644 --- a/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs +++ b/src/Libraries/SmartStore.Data/Caching/DbCachingPolicy.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; using System.Linq; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Directory; diff --git a/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs b/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs index 83fe2f2d99..54ac45dab1 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfDbModelStore.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Diagnostics; using System.IO; using System.Reflection; diff --git a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs index 02b105b920..604b35aed5 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCache.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure.MappingViews; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Infrastructure.MappingViews; using System.Linq; namespace SmartStore.Data.Caching diff --git a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs index 85c0d10238..4f1209ed87 100644 --- a/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs +++ b/src/Libraries/SmartStore.Data/Caching/EfMappingViewCacheFactory.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Core.Mapping; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Infrastructure.MappingViews; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Core.Mapping; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure.MappingViews; using System.IO; using System.Linq; using Newtonsoft.Json; diff --git a/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs b/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs index 3421c4651e..dbfe2380f7 100644 --- a/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs +++ b/src/Libraries/SmartStore.Data/Caching/QueryRegistrar.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs b/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs index 07c742e82d..c06469a074 100644 --- a/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs +++ b/src/Libraries/SmartStore.Data/Caching/SingletonQueries.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; namespace SmartStore.Data.Caching { diff --git a/src/Libraries/SmartStore.Data/EfRepository.cs b/src/Libraries/SmartStore.Data/EfRepository.cs index 04934f60d3..5b87008577 100644 --- a/src/Libraries/SmartStore.Data/EfRepository.cs +++ b/src/Libraries/SmartStore.Data/EfRepository.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Validation; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Validation; using System.Linq; using System.Linq.Expressions; using System.Runtime.CompilerServices; diff --git a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs index 1dace89f64..044345cf3c 100644 --- a/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/DbContextExtensions.cs @@ -1,5 +1,5 @@ -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Diagnostics; using System.Linq; using SmartStore.Core; diff --git a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs index 1543a8ba41..1b012f4c07 100644 --- a/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/DbEntityEntryExtensions.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using SmartStore.Core.Data; using EfState = System.Data.Entity.EntityState; diff --git a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs index 6f685642a4..636da9722f 100644 --- a/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/ExceptionExtensions.cs @@ -1,6 +1,6 @@ using System; -using System.Data.Entity.Core; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Core; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; namespace SmartStore diff --git a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs index 68b043a6a5..724433ab44 100644 --- a/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs +++ b/src/Libraries/SmartStore.Data/Extensions/IDbContextExtensions.cs @@ -1,6 +1,6 @@ using System; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; using System.Linq; using System.Linq.Expressions; diff --git a/src/Libraries/SmartStore.Data/IEfDataProvider.cs b/src/Libraries/SmartStore.Data/IEfDataProvider.cs index f6fc6e8cc7..a54a63cb3c 100644 --- a/src/Libraries/SmartStore.Data/IEfDataProvider.cs +++ b/src/Libraries/SmartStore.Data/IEfDataProvider.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using SmartStore.Core.Data; namespace SmartStore.Data diff --git a/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs index 339a99b51b..55dac2f886 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Affiliates/AffiliateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Affiliates; namespace SmartStore.Data.Mapping.Affiliates diff --git a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs index 99f73ff900..e864ea1aa0 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogCommentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Blogs; namespace SmartStore.Data.Mapping.Blogs diff --git a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs index bca23be8d1..23c96c768d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Blogs/BlogPostMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Blogs; namespace SmartStore.Data.Mapping.Blogs diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs index 3767cac539..a85c1bc505 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/BackInStockSubscriptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs index 21705b06ae..72f5042c14 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs index bc7e36b94c..e58d6f1e54 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CategoryTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs index 1dd181d475..f5d1654ad6 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/CrossSellProductMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs index f74f5cd16d..73f7811039 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs index 2cd85a86b6..7dd412293a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ManufacturerTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs index fafd737864..d1ba5697a1 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs index 5580f04f00..56fb0b3244 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs index e33b6081a5..c63e191386 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductAttributeOptionsSetMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs index 7da5ef6420..9347d6f56b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemAttributeFilterMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs index 0e4022315c..a9d9183d6c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductBundleItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs index d4d26e1ff8..13e53e90f6 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductCategoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs index a707bed719..33fa3f5058 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductManufacturerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs index 387c86a13a..3ede8b15a4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs index 7996718c6c..c5f3751dd4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductMediaFileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs index d49b4f18b0..7a8d93cb6c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewHelpfulnessMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs index ce61d806b7..629aa07b6b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductReviewMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs index 4daffdc1d7..bd9583fc77 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductSpecificationAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs index 77e82b37ca..2094ffe615 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTagMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs index d596e09131..4db31fb842 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs index 7e91dbe2a0..a64e5c9c2c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeCombinationMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs index 8bc170faa6..40aaf93b0c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs index 5bc9a202ff..cc036168b2 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/ProductVariantAttributeValueMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs index 06b9acf7fd..9a79e9016a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/RelatedProductMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs index ed57c5b86d..11bd5dcb3a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs index a7f7d5a2f5..ce051fee13 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs index 9f3b5d80d2..a073f48433 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Catalog/TierPriceMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Catalog; namespace SmartStore.Data.Mapping.Catalog diff --git a/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs b/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs index 08618ac9b8..f6462d355f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Common/AddressMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Common; namespace SmartStore.Data.Mapping.Common diff --git a/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs index d9394809fb..87f84ce0a8 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Common/GenericAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Common; namespace SmartStore.Data.Mapping.Common diff --git a/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs b/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs index 0892840b65..bb1ae1a2f7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Configuration/SettingMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Configuration; namespace SmartStore.Data.Mapping.Configuration diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs index fc7466ca9c..c9531e816d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerContentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs index 817228436a..cb2e34d17b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Common; using SmartStore.Core.Domain.Customers; diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs index 35a76ed019..5db6084217 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/CustomerRoleMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs index 90359ba9c9..b6221d08f7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/ExternalAuthenticationRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs index 81fc8dd484..f9c8e2514b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/RewardPointsHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs index 336620879c..53272a1573 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Customers/WalletHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Customers; namespace SmartStore.Data.Mapping.Customers diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs index a850cb8fc6..8629a42d38 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportDeploymentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs index 87574080f1..7d558a965d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ExportProfileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs index d2402d6303..bda9a67c86 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/ImportProfileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs b/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs index 498a39be7d..489e65d7fc 100644 --- a/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/DataExchange/SyncMappingMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.DataExchange; namespace SmartStore.Data.Mapping.DataExchange diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs index ba4ce8536b..8e2aa01b39 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/CountryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs index 32a9ef1701..223f1f1ae4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/CurrencyMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs index 7672cd962a..c603f6b65e 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/DeliveryTimeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs index 019a3a8cbb..f2ffd42a31 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureDimensionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs index 3291d5ae30..63c8f49154 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/MeasureWeightMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs index a840571e67..7a25bd047f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/QuantityUnitMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs index fd2e6c52c2..b3faa910fd 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Directory/StateProvinceMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Directory; namespace SmartStore.Data.Mapping.Directory diff --git a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs index 0136595340..8d9399066a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Discounts; namespace SmartStore.Data.Mapping.Discounts diff --git a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs index 2ef6b8b368..3808f9a68d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Discounts/DiscountUsageHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Discounts; namespace SmartStore.Data.Mapping.Discounts diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs index c838c6d893..360bfafb89 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumGroupMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs index 92ed155ac8..10a33a2c2b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs index 25d01eece4..7ca5e3d088 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs index 40d9e9d8bb..b339d8469c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumPostVoteMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs index 0fad931f0d..1b32ff4ff9 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumSubscriptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs index 1a8b46113b..a08b80b03f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/ForumTopicMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs index c43e5635ab..720f8a9929 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Forums/PrivateMessageMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Forums; namespace SmartStore.Data.Mapping.Forums diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs index ee9b04ec9a..676fffbacd 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LanguageMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs index 077168007a..b2cf851a97 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LocaleStringResourceMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization diff --git a/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs b/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs index 0caaa0f2cd..e4270ef062 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Localization/LocalizedPropertyMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Localization; namespace SmartStore.Data.Mapping.Localization diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs index b68c55ae20..d22d8f04c7 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Logging; namespace SmartStore.Data.Mapping.Logging diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs index c7c667ce48..32d5f37d03 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Logging/ActivityLogTypeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Logging; namespace SmartStore.Data.Mapping.Logging diff --git a/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs b/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs index 54c139fe45..cf098091f4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Logging/LogMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Logging; namespace SmartStore.Data.Mapping.Logging diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs index 2b94e64c0c..2f182f5b5b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/DownloadMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs index e95f99ddeb..13a4aaaad2 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFileMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs index 3873f15a54..6aa4caf428 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaFolderMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs index eaa13b5aac..f554e14861 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaStorageMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs index 8a3faf1072..8a5ca069e2 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTagMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs index ec2f551d08..8e39a0cb1c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Media/MediaTrackMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Media; namespace SmartStore.Data.Mapping.Media diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs index bc5a713680..ca6ef7554b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/CampaignMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs index e2109fbc89..1e1b58173a 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/EmailAccountMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs index 67d301bc0c..7864fb7010 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/MessageTemplateMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs index a9dc296150..2f6602342b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/NewsLetterSubscriptionMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs index 8ac9b15950..a9cc82c184 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailAttachmentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs index 9ef6a7ebe2..251638db92 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Messages/QueuedEmailMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Messages; namespace SmartStore.Data.Mapping.Messages diff --git a/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs b/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs index 13317df3ff..1687e94a7b 100644 --- a/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/News/NewsCommentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.News; namespace SmartStore.Data.Mapping.News diff --git a/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs index 5e99db7272..cfad62ccc3 100644 --- a/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/News/NewsItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.News; namespace SmartStore.Data.Mapping.News diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs index dd2511ce59..9b84d6460d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs index bab207962c..ac30b1c49f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/CheckoutAttributeValueMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs index 40201e3105..5d20411686 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs index bb054850df..a4a78834a0 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/GiftCardUsageHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs index f07ec73c2b..1f6a031c39 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs index 43d7722631..bfb0a0e182 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs index f05a9e653f..88938edabc 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/OrderNoteMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs index 2e2a9d2bda..feac4e9d1e 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs index 9160cead42..33edbaf1e3 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/RecurringPaymentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs index 67776065ba..18856ec34f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/ReturnRequestMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs index 661c658e1d..1a2dc6dc83 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Orders/ShoppingCartItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Orders; namespace SmartStore.Data.Mapping.Orders diff --git a/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs b/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs index 01675e8f87..02dd506b9e 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Payments/PaymentMethodMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Payments; namespace SmartStore.Data.Mapping.Payments diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs index 925bf98e8e..e084325fc0 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollAnswerMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Polls; namespace SmartStore.Data.Mapping.Polls diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs index 1f2eaf2e54..f2c131c217 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Polls; namespace SmartStore.Data.Mapping.Polls diff --git a/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs index 8e6ff8b3e2..7eaac16c2c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Polls/PollVotingRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Polls; namespace SmartStore.Data.Mapping.Polls diff --git a/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs b/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs index 74f4f452f2..fb28b0f18c 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Rules/RuleEntityMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Rules.Domain; namespace SmartStore.Data.Mapping.Rules diff --git a/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs index 7c3f705d9a..75826f4184 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Security/AclRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Security; namespace SmartStore.Data.Mapping.Seo diff --git a/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs index 145234dee3..a079ace867 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Security/PermissionRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Security; namespace SmartStore.Data.Mapping.Security diff --git a/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs b/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs index 21bbc06a50..a82f69823d 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Seo/UrlRecordMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Seo; namespace SmartStore.Data.Mapping.Seo diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs index e8108ae002..e8fa9057a8 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentItemMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs index 056cd938de..f0e7cc5cd8 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShipmentMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs index 457c769e63..1dc768f87f 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Shipping/ShippingMethodMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Shipping; namespace SmartStore.Data.Mapping.Shipping diff --git a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs index 8691c9755d..0fa8779cbe 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Stores; namespace SmartStore.Data.Mapping.Stores diff --git a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs index 9d98b89f75..fef9cb8a41 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Stores/StoreMappingMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Stores; namespace SmartStore.Data.Mapping.Stores diff --git a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs index c582f53566..ed822deeb9 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskHistoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Tasks; namespace SmartStore.Data.Mapping.Tasks diff --git a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs index 1e3c8f8818..6f8036b2c8 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Tasks/ScheduleTaskMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Tasks; namespace SmartStore.Data.Mapping.Tasks diff --git a/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs b/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs index 66a8032821..5fc6a17311 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Tax/TaxCategoryMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Tax; namespace SmartStore.Data.Mapping.Tax diff --git a/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs b/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs index bab6575777..7bf3a55743 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Themes/ThemeVariableMap.cs @@ -1,5 +1,5 @@  -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Themes; namespace SmartStore.Data.Mapping.Themes diff --git a/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs b/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs index acc15e4e16..0e363d72d4 100644 --- a/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs +++ b/src/Libraries/SmartStore.Data/Mapping/Topics/TopicMap.cs @@ -1,4 +1,4 @@ -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using SmartStore.Core.Domain.Topics; namespace SmartStore.Data.Mapping.Topics diff --git a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs index 596e5ef91b..0ffa473b5c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs index 5f2db2e10f..e4a256aaf2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201705281903241_MoreIndexes.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs index 2071542cd7..9cbd787f51 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs index 0cbb97ef49..340551ce73 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201706020759565_UpdateMediaPath.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using Core.Data; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs index 37942deb8d..2f722e4936 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs index c858380a1f..f3aafb584c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707190940318_V302Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class V302Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs index 8fb78dc364..8b81d55251 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs index c4c696c686..6fe9cfe134 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201707281452589_TierPriceCalcMethod.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class TierPriceCalcMethod : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs index f2bedc3ccf..22a09cbdba 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs index fae5395bdf..4ad92897c3 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201708251628482_SystemTopics.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using Core.Domain.Topics; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs index 17d5c9a425..bf6da04fdd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs index 2142dca719..76633a55b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709141000226_V303Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class V303Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs index d955362e1c..c0b5b1fd83 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs index b7984d1b2b..e97e0d9a09 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201709251538312_UpdateTrustedShopsTask.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using Core.Domain.Tasks; using Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs index a07392cfe4..df4f15dfbd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs index cf6805e1cf..de02db86e4 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710102038287_CurrencyRounding.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class CurrencyRounding : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs index 2024642a96..70fcfb1be0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs index 5020d69b3d..12d54fb9ef 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201710252016556_IndexOptionNames.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class IndexOptionNames : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs index 794345d94f..0e0920f8b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs index 8b6f013735..225faa88cc 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711112331162_ProductMainPictureId.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; using Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs index 1a420850cf..97c497dc50 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs index cd4527c919..ce957a67d7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711222311112_MoveFsMedia.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.IO; using System.Web.Hosting; using Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs index 4f5a89531e..41a2cb3d64 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs index 7613251157..6fdc4f2d21 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201711291017168_SyncStringResources.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System; using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Collections; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs index a4efc6b562..0771999499 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs index cb8df2f1fb..8d95f3d2c1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712081631552_Liquid.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs index d3db49312f..3b7e87a86c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs index 8dd8239740..72620e4b88 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201712290151517_AddressFormat.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs index 2323322d13..802e83a857 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs index fa8929783e..5a43cff381 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802081830029_ShippingMethodMultistore.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ShippingMethodMultistore : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs index 665cb9c0b9..db79150058 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs index 38f873aac7..d2888d8e2b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201802270844034_ExportAttributeMappings.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ExportAttributeMappings : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs index 35a2953735..36bb0f18f9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs index 5b15b5ed48..4190548986 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804060721031_Wallet.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using Setup; public partial class Wallet : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs index b6bd4f6aae..9335f87d07 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs index 9d98c90284..a6409a6053 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804090744324_ForceSslForAllPages.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Stores; diff --git a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs index fc477fb5ce..a50be6a7aa 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs index 346a3c8e6c..482370b817 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804200835273_V310Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Customers; diff --git a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs index c285369161..159e6c446b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs index dfb772e099..4bd9cd4710 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201804252356096_TopicSlugs.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Domain.Topics; diff --git a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs index 6516923338..786272c9ef 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs index f42a572047..73866443d6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201805250724399_V315Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Configuration; diff --git a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs index f041a2400e..8e7a309c7e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs index e74f179a68..458fc1d07c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806051221399_RefundReturnRequests.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class RefundReturnRequests : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs index 4bc2296375..1d1a83cea2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs index f2d93452c9..55721951e8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201806231547270_ScheduleTaskHistory.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Tasks; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs index dbfaf98582..8336c4428f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs index 0b211b6e2c..f66dde852a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807051830375_MoveCustomerFields.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System; using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs index a646dea18f..34104f9d7b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs index a525ea429a..66daa5f1b7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807122120062_TopicAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class TopicAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs index a3154b6e73..67be54ed55 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs index 341a2322b7..2cb7760af7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807191020207_OrderItemDeliveryTime.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class OrderItemDeliveryTime : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs index 923d368911..ab88e5271e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs index caadf9da72..fdeaf05799 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807201157391_DownloadVersions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs index 0bcd55246f..85c01bda17 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs index 9b7aa16571..c74650b17a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201807311708428_ProductPreviewPicture.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ProductPreviewPicture : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs index c28cdd698c..78fc1d740c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs index cf6adcbfff..da4286a21e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201808051818238_Merge4.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge4 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs index a8abf3ecf1..5fb014a4f0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs index 3304f86e1a..4b31f7c35b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809171309522_NewsletterSubscriptionLanguage.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class NewsletterSubscriptionLanguage : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs index 55b7fcd313..d983b4567e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs index 0c7e1af33d..1cd3fc2122 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201809261026134_ForumGroupAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ForumGroupAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs index df1f55332e..3e8fca9b89 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs index 37d44c2b2e..04022b33b7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810011954195_ForumPostVote.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ForumPostVote : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs index 9cf3ad8ecd..1134e897f7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs index 910446ec89..4487450ea5 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201810231214068_DataExchangeEnhancements.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class DataExchangeEnhancements : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs index 65a34605b6..c61e8868a4 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs index 964d170410..7553e18035 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811061745204_IsSystemProductIndex.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; public partial class IsSystemProductIndex : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs index d342d27f89..2305234573 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs index 847bea3807..b2c381cc56 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811082148279_LocalizedPropertyKeyGroupIndex.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class LocalizedPropertyKeyGroupIndex : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs index 61f95300e6..0016dee3b2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs index 6c6ba2e7a5..1fd31eac9d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811161142587_TaskHistoryErrorLength.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class TaskHistoryErrorLength : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs index 4205b2c00f..f5f3528aab 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs index 90640d3991..86aef0e770 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201811202204501_ProductIndexSeekExport.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; public partial class ProductIndexSeekExport : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs index 4d82aade02..999b0ea201 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs index c0a44dcdc9..94e3b06554 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201902211855242_TopicHtmlIdAndBodyCss.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class TopicHtmlIdAndBodyCss : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs index b943551be8..a3078f50b8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs index ae8714e7d7..356e07a72a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201904110735029_Menus.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs index 7a420fcffe..c6b5776bb1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs index d26335d830..0221019bf7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905020948354_WidgetTopics.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Topics; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs index e07144c09d..f30e8b6377 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs index 88c8d19d1b..1fe680dd5e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905101159134_V320Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Domain.Catalog; using SmartStore.Core.Domain.Common; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs index a194593e7c..bf759d8bed 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs index 4bd176f7f9..8559c5f8c2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201905271110370_V321Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V321Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs index 186f72e27d..6a8b4e72f0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs index 5f5ee9c386..690d3eba09 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201906252008551_QuantityUnitNamePlural.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Directory; diff --git a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs index 784b2cb7ce..cd68aba44f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs index f856a343e3..3bf88299ed 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907032251575_CategoryExternalLink.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class CategoryExternalLink : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs index e0cda0f6b7..9dc89e843c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs index 689a322ec2..36cbbb248c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907221803421_GranularPermissions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs index f6561f32ae..b516d5e042 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs index e51e96adb5..40437ffbed 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201907250103367_RuleSystem.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class RuleSystem : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs index e6839de954..60e7406431 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs index 020c785b60..d71d7c1695 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908050758298_MoveFurtherCustomerFields.cs @@ -2,7 +2,7 @@ namespace SmartStore.Data.Migrations { using System; using System.Collections.Generic; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs index be8c91d1d2..c6e6e989c0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs index 81056149ca..6e5e3e906e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908150749388_V322Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V322Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs index 2689514cb0..adb3460958 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs index ee1db0c32e..0ad5208c64 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211821559_Merge5.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge5 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs index 8d61f6d810..cd0ac7867a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs index b3d720ca95..992569a29c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908211825244_ProductTagPublished.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs index 8d24538a98..a7ef5f4e41 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs index c5948be73d..f98399e8a7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201908261226350_MenuItemMultistore.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MenuItemMultistore : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs index 01d2f697a9..611753fa69 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs index 8dc2ea6c66..857e43cd89 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201909291043284_BlogAndNewsItemPictures.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class BlogAndNewsItemPictures : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs index ea13123073..96842d5fc0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs index c9b18aac65..0b4cf9c47a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910021805242_RemoveOldPermissions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Domain.Tasks; diff --git a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs index c9efb16413..4aedd9ec4e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs index f33fea2e5e..f64bf9f0b7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201910162004581_Merge6.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge6 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs index ff3538cadb..9b77fbe868 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs index dd167ee0d9..abc23b49d6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911090805330_ProductVisibility.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs index f084fe871c..ec28d1b748 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs index 514a30a8f3..3452436091 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911120909434_Merge7.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge7 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs index 44b6784d80..ed6eb87793 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs index 96ddfb67fa..a5441b50ae 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201911141820264_ScheduleTaskPriority.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Tasks; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs index 8fd955896f..bb99d4795e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs index 78d3aa6849..e31e78276b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912051209105_MessageTemplateEmailAddress.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Messages; diff --git a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs index 325eb24496..e1f7a4bda1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs index 27839d3937..48ea0757d0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs +++ b/src/Libraries/SmartStore.Data/Migrations/201912111821362_AddNewPermissions.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class AddNewPermissions : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs index ed934504ae..1111d84dde 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs index 0f8d65fdb3..f4aa908f57 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001141118171_SpecificationAttributeColorAndPicture.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class SpecificationAttributeColorAndPicture : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs index 362b02beb3..b84fd0aa3d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs index a3603f70c5..2571ad1034 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001221054109_ManufacturerBottomDescription.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ManufacturerBottomDescription : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs index 198f5378e0..757884a1b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs index d0391353e4..edb2bbda00 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202001301039020_DiscountRuleSets.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs index 287c106f5c..a711f9feba 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs index e0d19a569e..ded8322e47 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002172101120_PictureMediaRename.cs @@ -1,9 +1,9 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Builders; - using System.Data.Entity.Migrations.Model; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Builders; + using Microsoft.EntityFrameworkCore.Migrations.Model; using SmartStore.Core.Data; public partial class PictureMediaRename : DbMigration diff --git a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs index e5997cafc4..5066b843a0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs index fb3fc9139d..34c918a5f1 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002180228163_PictureMediaRename1.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class PictureMediaRename1 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs index 7984e35545..ff75e22366 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs index 72b39d7843..c92552a818 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002191252074_RemoveDiscountRequirements.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs index 3e65742e14..693c0aa0fe 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs index b3e70a5953..c322ebd0cb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002211011108_GenericMessageTemplate.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Messages; diff --git a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs index db117a9ec5..e6621bfab9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs index e5ee0c0891..31bb82b449 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002241354543_ProductCondition.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ProductCondition : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs index 30eaed8497..f0acc8ec74 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs index e7a616ff0a..0b77f9f291 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002251510114_ManufacturerSubjectToAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ManufacturerSubjectToAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs index e56eab80b2..51cedb0729 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs index 7d752fe47f..0f564c149e 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002271206204_ShipmentTrackingUrl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class ShipmentTrackingUrl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs index d829eb7571..26ec169596 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs index b210c5ef59..cdb2937541 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202002280005340_MediaManager.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MediaManager : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs index 171f291d76..840a40b74c 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs index d1d37ebb47..3051bf768f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003022018038_Merge8.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge8 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs index 081c95329a..f95e72ed26 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs index 24bd074a26..b316e9fce9 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003052100521_CustomerRoleMappings.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs index 78b5637134..df08512bec 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs index bcf8c00d5f..4c2003c44b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003112359492_MediaManager2.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MediaManager2 : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs index aaa30bb291..ac2030083b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs index 799ce565aa..c8829c8558 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003171812584_CookieManager.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Cms; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs index ce453cbe79..0140a6a002 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs index 5069c892c2..ed16cd4584 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003251118391_CategoryRuleSets.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Localization; using SmartStore.Core.Domain.Tasks; diff --git a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs index d87fcba817..49fc1a9258 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs index bfcb56642b..d3f89f27ba 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202003311314082_CookieManagerCountries.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs index 50ab827064..502d6f6075 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs index 99ac87c6de..0e84955e53 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202004301922188_RemoveCustomerCustomerRoles.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs index e4153785ef..47e3798dca 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs index e6d328c13a..75b49430c3 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005111006305_CampaignSubjectToAcl.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class CampaignSubjectToAcl : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs index dd34b95167..1d47fb7e5b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs index d80781eac3..bb53ed3d83 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202005201826512_MediaManager3.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class MediaManager3 : DbMigration, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs index 395c46d11f..141b8484f4 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs index 6ec22fa5c1..17f181e7cd 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202006250801086_V400Resources.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using System.Web.Hosting; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs index 9387aac6ac..03d02d65ef 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs index 66ff8fec6f..b1caa81a35 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007160058551_MediaFileIndexReorg.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class MediaFileIndexReorg : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs index 94d37bbc96..ad1aee5bdf 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs index 049b0f2f23..b42415e1fb 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007241131557_V401Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V401Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs index 5d7b94d21e..fc3c452230 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs index 31eef90291..fc8c42a138 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007291847004_NewPropertiesAndIndexes.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class NewPropertiesAndIndexes : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs index e9d53d3e43..fa519c1fd7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs index 2b3fdefbff..3d4859a66b 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202007301117363_AddCustomerRoleOrderAmount.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class AddCustomerRoleOrderAmount : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs index ec697d5c0b..e84886f536 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs index 910fea9429..98ba643524 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202008181949580_RenamedCustomerRoleOrderTotal.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class RenamedCustomerRoleOrderTotal : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs index 664b26aadd..e951228336 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs index 4aaa198af3..3ffa60fcb2 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009021705132_Merge9.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class Merge9 : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs index 9a78bf96fb..1bce120da8 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs index 227a055aa8..d609fed8fc 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009041122208_ShopIcons.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs index 6a218b39fb..25513ab885 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs index 4cf6cab153..160ea738b6 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202009090817220_DeliveryTimeMinMaxDays.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Catalog; diff --git a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs index b4b28db84f..f8e71c0f68 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs index 818986dceb..0d12a10108 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010011005387_TopicCookieType.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs index 1051bb9ea1..529dd45551 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs index 01d2fb1e83..ded32dd453 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010030939136_AttributeChoiceBehaviour.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class AttributeChoiceBehaviour : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs index e662cced0e..c61b86cd53 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs index 53fcbb0cdc..04a3014b0a 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202010121359446_RemoveBlogAndNewsLanguage.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Data; using SmartStore.Core.Domain.Blogs; diff --git a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs index 316f66a305..5030890538 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs index 34543f8e68..cfd7eecb66 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202011091154314_V410Resources.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Core.Domain.Configuration; using SmartStore.Core.Domain.Media; diff --git a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs index 05f0cd1fa7..74106c037d 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs index 0312293126..2061ef86a5 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202012051645539_AddBlogAndNewsLanguage.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; public partial class AddBlogAndNewsLanguage : DbMigration { diff --git a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs index 7c33223814..c085002a1f 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs index fd19393cf6..21ed847f25 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202101251149352_V411Resources.cs @@ -1,6 +1,6 @@ namespace SmartStore.Data.Migrations { - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Setup; public partial class V411Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder diff --git a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs index db9463e650..885ac44061 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs @@ -2,8 +2,8 @@ namespace SmartStore.Data.Migrations { using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; + using Microsoft.EntityFrameworkCore.Migrations; + using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Resources; [GeneratedCode("EntityFramework.Migrations", "6.4.4")] diff --git a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs index 9dae67f2b9..0d82a7f2b0 100644 --- a/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs +++ b/src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Core.Data; using SmartStore.Data.Setup; diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs index 9afb1372cc..f8078174d7 100644 --- a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs +++ b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs @@ -1,7 +1,7 @@ namespace SmartStore.Data.Migrations { using System; - using System.Data.Entity.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using Setup; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs index 8503451f1f..c80c602734 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Validation; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Validation; using System.Linq; using System.Text; using System.Threading; diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.cs index 26d5a65685..296651d29d 100644 --- a/src/Libraries/SmartStore.Data/ObjectContextBase.cs +++ b/src/Libraries/SmartStore.Data/ObjectContextBase.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using System.Runtime.CompilerServices; using SmartStore.ComponentModel; diff --git a/src/Libraries/SmartStore.Data/Setup/Builder/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..6614da5147 100644 --- a/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs +++ b/src/Libraries/SmartStore.Data/Setup/DbSeedingMigrator.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Migrations; -using System.Data.Entity.Migrations.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; using System.Linq; using SmartStore.Core.Events; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Data/Setup/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/IDbMigrationExtensions.cs b/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs index 8513c8352e..7a0e08cf11 100644 --- a/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs +++ b/src/Libraries/SmartStore.Data/Setup/IDbMigrationExtensions.cs @@ -1,5 +1,5 @@ -using System.Data.Entity.Migrations.Infrastructure; -using System.Data.Entity.Migrations.Model; +using Microsoft.EntityFrameworkCore.Migrations.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations.Model; using System.Reflection; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs index 1e48290630..2e90a58290 100644 --- a/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/InstallDatabaseInitializer.cs @@ -1,5 +1,5 @@ -using System.Data.Entity; -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Migrations; using SmartStore.Data.Migrations; namespace SmartStore.Data.Setup diff --git a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs index a4d10d520a..91f568a9ed 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigrateDatabaseInitializer.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; using System.Linq; using SmartStore.Collections; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs b/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs index 4ed6df0496..3f52b2d27e 100644 --- a/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs +++ b/src/Libraries/SmartStore.Data/Setup/MigratorUtils.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; using System.IO; using System.Linq; using System.Text.RegularExpressions; diff --git a/src/Libraries/SmartStore.Data/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..5ef679c8d3 100644 --- a/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs +++ b/src/Libraries/SmartStore.Data/SmartDbConfiguration.cs @@ -1,7 +1,7 @@ -using System.Data.Entity; -using System.Data.Entity.Core.Common; -using System.Data.Entity.Infrastructure; -using System.Data.Entity.Infrastructure.DependencyResolution; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Core.Common; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure.DependencyResolution; using System.Web.Hosting; using SmartStore.Core.Data; using SmartStore.Core.Infrastructure; diff --git a/src/Libraries/SmartStore.Data/SmartObjectContext.cs b/src/Libraries/SmartStore.Data/SmartObjectContext.cs index d74769d6ed..97ea1c7052 100644 --- a/src/Libraries/SmartStore.Data/SmartObjectContext.cs +++ b/src/Libraries/SmartStore.Data/SmartObjectContext.cs @@ -1,7 +1,7 @@ using System; using System.Data; -using System.Data.Entity; -using System.Data.Entity.ModelConfiguration; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.ModelConfiguration; using System.Linq; using System.Reflection; using SmartStore.Core.Data; diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj index fb594ed6a4..23bc62516f 100644 --- a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj @@ -1,1016 +1,35 @@ - - + - 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 + disable + disable latest + false + - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll - True - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - True - ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.ConnectionInfo.dll - - - True - ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Management.Sdk.Sfc.dll - - - True - ..\..\packages\Microsoft.SqlServer.Scripting.11.0.2100.61\lib\Microsoft.SqlServer.Smo.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - True - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 201705281903241_MoreIndexes.cs - - - - 201706020759565_UpdateMediaPath.cs - - - - 201707190940318_V302Resources.cs - - - - 201707281452589_TierPriceCalcMethod.cs - - - - 201708251628482_SystemTopics.cs - - - - 201709141000226_V303Resources.cs - - - - 201709251538312_UpdateTrustedShopsTask.cs - - - - 201710102038287_CurrencyRounding.cs - - - - 201710252016556_IndexOptionNames.cs - - - - 201711112331162_ProductMainPictureId.cs - - - - 201711222311112_MoveFsMedia.cs - - - - 201711291017168_SyncStringResources.cs - - - - 201712081631552_Liquid.cs - - - - 201712290151517_AddressFormat.cs - - - - 201802081830029_ShippingMethodMultistore.cs - - - - 201802270844034_ExportAttributeMappings.cs - - - - 201804060721031_Wallet.cs - - - - 201804090744324_ForceSslForAllPages.cs - - - - 201804200835273_V310Resources.cs - - - - 201804252356096_TopicSlugs.cs - - - - 201805250724399_V315Resources.cs - - - - 201806051221399_RefundReturnRequests.cs - - - - 201806231547270_ScheduleTaskHistory.cs - - - - 201807051830375_MoveCustomerFields.cs - - - - 201807122120062_TopicAcl.cs - - - - 201807191020207_OrderItemDeliveryTime.cs - - - - 201807201157391_DownloadVersions.cs - - - - 201807311708428_ProductPreviewPicture.cs - - - - 201808051818238_Merge4.cs - - - - 201809171309522_NewsletterSubscriptionLanguage.cs - - - - 201809261026134_ForumGroupAcl.cs - - - - 201810011954195_ForumPostVote.cs - - - - 201810231214068_DataExchangeEnhancements.cs - - - - 201811061745204_IsSystemProductIndex.cs - - - - 201811082148279_LocalizedPropertyKeyGroupIndex.cs - - - - 201811161142587_TaskHistoryErrorLength.cs - - - - 201811202204501_ProductIndexSeekExport.cs - - - - 201902211855242_TopicHtmlIdAndBodyCss.cs - - - - 201904110735029_Menus.cs - - - - 201905020948354_WidgetTopics.cs - - - - 201905101159134_V320Resources.cs - - - - 201905271110370_V321Resources.cs - - - - 201906252008551_QuantityUnitNamePlural.cs - - - - 201907032251575_CategoryExternalLink.cs - - - - 201907250103367_RuleSystem.cs - - - - 201908050758298_MoveFurtherCustomerFields.cs - - - - 201908150749388_V322Resources.cs - - - - 201907221803421_GranularPermissions.cs - - - - 201908211821559_Merge5.cs - - - - 201908211825244_ProductTagPublished.cs - - - - 201908261226350_MenuItemMultistore.cs - - - - 201909291043284_BlogAndNewsItemPictures.cs - - - - 201910021805242_RemoveOldPermissions.cs - - - - 201910162004581_Merge6.cs - - - - 201911090805330_ProductVisibility.cs - - - - 201911120909434_Merge7.cs - - - - 201911141820264_ScheduleTaskPriority.cs - - - - 201912051209105_MessageTemplateEmailAddress.cs - - - - 201912111821362_AddNewPermissions.cs - - - - 202001141118171_SpecificationAttributeColorAndPicture.cs - - - - 202001221054109_ManufacturerBottomDescription.cs - - - - 202001301039020_DiscountRuleSets.cs - - - - 202002172101120_PictureMediaRename.cs - - - - 202002180228163_PictureMediaRename1.cs - - - - 202002280005340_MediaManager.cs - - - - 202002191252074_RemoveDiscountRequirements.cs - - - - 202002211011108_GenericMessageTemplate.cs - - - - 202002241354543_ProductCondition.cs - - - - 202002251510114_ManufacturerSubjectToAcl.cs - - - - 202002271206204_ShipmentTrackingUrl.cs - - - - 202003022018038_Merge8.cs - - - - 202003052100521_CustomerRoleMappings.cs - - - - 202003112359492_MediaManager2.cs - - - - 202003251118391_CategoryRuleSets.cs - - - - 202003171812584_CookieManager.cs - - - - 202003311314082_CookieManagerCountries.cs - - - - 202004301922188_RemoveCustomerCustomerRoles.cs - - - - 202005111006305_CampaignSubjectToAcl.cs - - - - 202005201826512_MediaManager3.cs - - - - 202006250801086_V400Resources.cs - - - - 202007160058551_MediaFileIndexReorg.cs - - - - 202007241131557_V401Resources.cs - - - - 202007291847004_NewPropertiesAndIndexes.cs - - - - 202007301117363_AddCustomerRoleOrderAmount.cs - - - - 202008181949580_RenamedCustomerRoleOrderTotal.cs - - - - 202009021705132_Merge9.cs - - - - 202009041122208_ShopIcons.cs - - - - 202009090817220_DeliveryTimeMinMaxDays.cs - - - - 202010011005387_TopicCookieType.cs - - - - 202010030939136_AttributeChoiceBehaviour.cs - - - - 202010121359446_RemoveBlogAndNewsLanguage.cs - - - - 202011091154314_V410Resources.cs - - - - 202012051645539_AddBlogAndNewsLanguage.cs - - - - 202101251149352_V411Resources.cs - - - - 202112171231491_V420Resources.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + - - + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - + - - - 201705281903241_MoreIndexes.cs - - - 201706020759565_UpdateMediaPath.cs - - - 201707190940318_V302Resources.cs - - - 201707281452589_TierPriceCalcMethod.cs - - - 201708251628482_SystemTopics.cs - - - 201709141000226_V303Resources.cs - - - 201709251538312_UpdateTrustedShopsTask.cs - - - 201710102038287_CurrencyRounding.cs - - - 201710252016556_IndexOptionNames.cs - - - 201711112331162_ProductMainPictureId.cs - - - 201711222311112_MoveFsMedia.cs - - - 201711291017168_SyncStringResources.cs - - - 201712081631552_Liquid.cs - - - 201712290151517_AddressFormat.cs - - - 201802081830029_ShippingMethodMultistore.cs - - - 201802270844034_ExportAttributeMappings.cs - - - 201804060721031_Wallet.cs - - - 201804090744324_ForceSslForAllPages.cs - - - 201804200835273_V310Resources.cs - - - 201804252356096_TopicSlugs.cs - - - 201805250724399_V315Resources.cs - - - 201806051221399_RefundReturnRequests.cs - - - 201806231547270_ScheduleTaskHistory.cs - - - 201807051830375_MoveCustomerFields.cs - - - 201807122120062_TopicAcl.cs - - - 201807191020207_OrderItemDeliveryTime.cs - - - 201807201157391_DownloadVersions.cs - - - 201807311708428_ProductPreviewPicture.cs - - - 201808051818238_Merge4.cs - - - 201809171309522_NewsletterSubscriptionLanguage.cs - - - 201809261026134_ForumGroupAcl.cs - - - 201810011954195_ForumPostVote.cs - - - 201810231214068_DataExchangeEnhancements.cs - - - 201811061745204_IsSystemProductIndex.cs - - - 201811082148279_LocalizedPropertyKeyGroupIndex.cs - - - 201811161142587_TaskHistoryErrorLength.cs - - - 201811202204501_ProductIndexSeekExport.cs - - - 201902211855242_TopicHtmlIdAndBodyCss.cs - - - 201904110735029_Menus.cs - - - 201905020948354_WidgetTopics.cs - - - 201905101159134_V320Resources.cs - - - 201905271110370_V321Resources.cs - - - 201906252008551_QuantityUnitNamePlural.cs - - - 201907032251575_CategoryExternalLink.cs - - - 201907250103367_RuleSystem.cs - - - 201907221803421_GranularPermissions.cs - - - 201908050758298_MoveFurtherCustomerFields.cs - - - 201908150749388_V322Resources.cs - - - 201908211821559_Merge5.cs - - - 201908211825244_ProductTagPublished.cs - - - 201908261226350_MenuItemMultistore.cs - - - 201909291043284_BlogAndNewsItemPictures.cs - - - 201910021805242_RemoveOldPermissions.cs - - - 201910162004581_Merge6.cs - - - 201911090805330_ProductVisibility.cs - - - 201911120909434_Merge7.cs - - - 201911141820264_ScheduleTaskPriority.cs - - - 201912051209105_MessageTemplateEmailAddress.cs - - - 201912111821362_AddNewPermissions.cs - - - 202001141118171_SpecificationAttributeColorAndPicture.cs - - - 202001221054109_ManufacturerBottomDescription.cs - - - 202001301039020_DiscountRuleSets.cs - - - 202002172101120_PictureMediaRename.cs - - - 202002180228163_PictureMediaRename1.cs - - - 202002280005340_MediaManager.cs - - - 202002191252074_RemoveDiscountRequirements.cs - - - 202002211011108_GenericMessageTemplate.cs - - - 202002241354543_ProductCondition.cs - - - 202002251510114_ManufacturerSubjectToAcl.cs - - - 202002271206204_ShipmentTrackingUrl.cs - - - 202003022018038_Merge8.cs - - - 202003052100521_CustomerRoleMappings.cs - - - 202003112359492_MediaManager2.cs - - - 202003251118391_CategoryRuleSets.cs - - - 202003171812584_CookieManager.cs - - - 202003311314082_CookieManagerCountries.cs - - - 202004301922188_RemoveCustomerCustomerRoles.cs - - - 202005111006305_CampaignSubjectToAcl.cs - - - 202005201826512_MediaManager3.cs - - - 202006250801086_V400Resources.cs - - - 202007160058551_MediaFileIndexReorg.cs - - - 202007241131557_V401Resources.cs - - - 202007291847004_NewPropertiesAndIndexes.cs - - - 202007301117363_AddCustomerRoleOrderAmount.cs - - - 202008181949580_RenamedCustomerRoleOrderTotal.cs - - - 202009021705132_Merge9.cs - - - 202009041122208_ShopIcons.cs - - - 202009090817220_DeliveryTimeMinMaxDays.cs - - - 202010011005387_TopicCookieType.cs - - - 202010030939136_AttributeChoiceBehaviour.cs - - - 202010121359446_RemoveBlogAndNewsLanguage.cs - - - 202011091154314_V410Resources.cs - - - 202012051645539_AddBlogAndNewsLanguage.cs - - - 202101251149352_V411Resources.cs - - - 202112171231491_V420Resources.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old new file mode 100644 index 0000000000..99b131536b --- /dev/null +++ b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj.old @@ -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/SqlCeDataProvider.cs b/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs index 676365febc..f51fa6ae41 100644 --- a/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs +++ b/src/Libraries/SmartStore.Data/SqlCeDataProvider.cs @@ -1,5 +1,5 @@ using System.Data.Common; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; namespace SmartStore.Data diff --git a/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs b/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs index b331488ed7..e15427607f 100644 --- a/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs +++ b/src/Libraries/SmartStore.Data/SqlServerDataProvider.cs @@ -1,5 +1,5 @@ using System.Data.Common; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; namespace SmartStore.Data diff --git a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs index 796f12c1fa..8bbde2af3d 100644 --- a/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs +++ b/src/Libraries/SmartStore.Data/Utilities/DataMigrator.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Globalization; using System.IO; using System.Linq; diff --git a/src/Libraries/SmartStore.Data/Utilities/FastPager.cs b/src/Libraries/SmartStore.Data/Utilities/FastPager.cs index 568157d7c4..40a151ec39 100644 --- a/src/Libraries/SmartStore.Data/Utilities/FastPager.cs +++ b/src/Libraries/SmartStore.Data/Utilities/FastPager.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; diff --git a/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs b/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs index 9e346c08ab..400c3de31f 100644 --- a/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs +++ b/src/Libraries/SmartStore.Data/Utilities/SqlBlobStream.cs @@ -1,7 +1,7 @@ using System; using System.Data; using System.Data.Common; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.IO; namespace SmartStore.Data.Utilities diff --git a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs index da90c9f326..5b219e3616 100644 --- a/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs +++ b/src/Libraries/SmartStore.Services/Authentication/External/AuthorizeState.cs @@ -1,7 +1,7 @@ //Contributor: Nicholas Mayne using System.Collections.Generic; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Services.Authentication.External { diff --git a/src/Libraries/SmartStore.Services/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..6e7e528094 100644 --- a/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs +++ b/src/Libraries/SmartStore.Services/Catalog/Extensions/ProductUrlHelper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.Routing; using SmartStore.Collections; using SmartStore.Core.Domain.Catalog; 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..31d91a50a8 100644 --- a/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs +++ b/src/Libraries/SmartStore.Services/Cms/Blocks/BlockHandlerBase.cs @@ -4,7 +4,7 @@ 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; 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/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/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/DataExchange/Import/ImportProfileService.cs b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs index ab3fb9563b..5ad1020482 100644 --- a/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs +++ b/src/Libraries/SmartStore.Services/DataExchange/Import/ImportProfileService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Core.Metadata.Edm; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Core.Metadata.Edm; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Diagnostics; using System.IO; using System.Linq; diff --git a/src/Libraries/SmartStore.Services/Forums/ForumService.cs b/src/Libraries/SmartStore.Services/Forums/ForumService.cs index 6430f209ce..0c4d5398aa 100644 --- a/src/Libraries/SmartStore.Services/Forums/ForumService.cs +++ b/src/Libraries/SmartStore.Services/Forums/ForumService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Customers; @@ -13,7 +13,7 @@ using SmartStore.Services.Seo; using SmartStore.Core.Domain.Seo; using SmartStore.Core.Domain.Localization; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System; using SmartStore.Data.Utilities; diff --git a/src/Libraries/SmartStore.Services/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..bd77924dae 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaService.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Drawing; using System.IO; using System.Linq; diff --git a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs index 21f31b28c4..9fd075affb 100644 --- a/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs +++ b/src/Libraries/SmartStore.Services/Media/MediaUrlGenerator.cs @@ -1,6 +1,6 @@ using System.Globalization; using System.Web; -using System.Web.Hosting; +using Microsoft.AspNetCore.Hosting; using SmartStore.Core; using SmartStore.Core.Domain.Media; using SmartStore.Services.Configuration; diff --git a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs index ba0c18c8e4..6bd5642c97 100644 --- a/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs +++ b/src/Libraries/SmartStore.Services/Media/Search/MediaSearcher.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Linq.Dynamic.Core; using SmartStore.Linq; diff --git a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs index 0fd3e2f053..45f6430996 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/DatabaseMediaStorageProvider.cs @@ -1,7 +1,7 @@ using System; using System.Data.Common; -using System.Data.Entity; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Data.SqlClient; using System.IO; using System.Threading.Tasks; diff --git a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs index bd5b52efcf..fa3a18ce8b 100644 --- a/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs +++ b/src/Libraries/SmartStore.Services/Media/Storage/MediaMover.cs @@ -1,5 +1,5 @@ using System; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using System.Linq; using System.Web.UI; using SmartStore.Core; 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/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/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/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/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/SmartStore.Services.csproj b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj index 377945466a..e939739110 100644 --- a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj @@ -1,845 +1,35 @@ - - + - 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 + disable + disable latest - - - ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\CronExpressionDescriptor.2.15.0\lib\netstandard2.0\CronExpressionDescriptor.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EPPlus.4.5.3.1\lib\net40\EPPlus.dll - - - ..\..\packages\ImageProcessor.2.8.0\lib\net452\ImageProcessor.dll - - - ..\..\packages\ImageProcessor.Plugins.WebP.1.3.0\lib\net452\ImageProcessor.Plugins.WebP.dll - - - ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll - - - ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll - - - ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll - - - ..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll - True - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NReco.PdfGenerator.1.2.0\lib\net45\NReco.PdfGenerator.dll - - - ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll - - - ..\..\packages\PreMailer.Net.2.0.1\lib\net45\PreMailer.Net.dll - - - - - - - - - - - - ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - ..\..\packages\UAParser.3.1.44\lib\net45\UAParser.dll - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Settings.settings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Reference.map - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - - - - - - Designer - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - Reference.map - - - MSDiscoCodeGenerator - Reference.cs - - - - - Dynamic - Web References\EuropeCheckVatService\ - https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl - - - - - Settings - SmartStore_Services_EuropeCheckVatService_checkVatService - - - - - - - - MSBuild:UpdateDesignTimeXaml - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Libraries/SmartStore.Services/SmartStore.Services.csproj.old b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj.old new file mode 100644 index 0000000000..603c16a3f1 --- /dev/null +++ b/src/Libraries/SmartStore.Services/SmartStore.Services.csproj.old @@ -0,0 +1,844 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {210541AD-F659-47DA-8763-16F36C5CD2F4} + Library + Properties + 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 + latest + + + + ..\..\packages\AngleSharp.0.9.11\lib\net45\AngleSharp.dll + + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll + + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll + + + ..\..\packages\CronExpressionDescriptor.2.15.0\lib\netstandard2.0\CronExpressionDescriptor.dll + + + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + True + + + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + True + + + ..\..\packages\EPPlus.4.5.3.1\lib\net40\EPPlus.dll + + + ..\..\packages\ImageProcessor.2.8.0\lib\net452\ImageProcessor.dll + + + ..\..\packages\ImageProcessor.Plugins.WebP.1.3.0\lib\net452\ImageProcessor.Plugins.WebP.dll + + + ..\..\packages\LumenWorksCsvReader.4.0.0\lib\net461\LumenWorks.Framework.IO.dll + + + ..\..\packages\MaxMind.Db.2.6.1\lib\net45\MaxMind.Db.dll + + + ..\..\packages\MaxMind.GeoIP2.3.2.0\lib\net45\MaxMind.GeoIP2.dll + + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + + True + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\..\packages\Microsoft.Web.Xdt.3.0.0\lib\net40\Microsoft.Web.XmlTransform.dll + + + ..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll + True + + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\..\packages\NReco.PdfGenerator.1.2.0\lib\net45\NReco.PdfGenerator.dll + + + ..\..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll + + + ..\..\packages\PreMailer.Net.2.0.1\lib\net45\PreMailer.Net.dll + + + + + + + + + + + + ..\..\packages\System.Linq.Dynamic.Core.1.2.1\lib\net46\System.Linq.Dynamic.Core.dll + + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll + + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + + + + + + + ..\..\packages\UAParser.3.1.44\lib\net45\UAParser.dll + + + + + Properties\AssemblySharedInfo.cs + + + Properties\AssemblyVersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Settings.settings + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Reference.map + + + + + {6bda8332-939f-45b7-a25e-7a797260ae59} + SmartStore.Core + + + {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} + SmartStore.Data + + + + + + + + Designer + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + Reference.map + + + MSDiscoCodeGenerator + Reference.cs + + + + + Dynamic + Web References\EuropeCheckVatService\ + https://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl + + + + + Settings + SmartStore_Services_EuropeCheckVatService_checkVatService + + + + + + + + MSBuild:UpdateDesignTimeXaml + + + + + + + + + \ No newline at end of file diff --git a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs index c9990757c2..1ba0ce37be 100644 --- a/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs +++ b/src/Libraries/SmartStore.Services/Tasks/ScheduleTaskService.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Core; +using Microsoft.EntityFrameworkCore.Core; using System.Data.SqlClient; using System.Linq; using System.Threading.Tasks; -using System.Data.Entity; +using Microsoft.EntityFrameworkCore; using SmartStore.Core; using SmartStore.Core.Data; using SmartStore.Core.Domain.Common; diff --git a/src/Libraries/SmartStore.Services/Tasks/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/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj index 4a2abff1a9..f4d4c321a1 100644 --- a/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj @@ -1,357 +1,30 @@ - - - - - - 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 - - - - - - - + disable + disable + latest - - 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/SmartStore.DevTools.csproj.old b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj.old new file mode 100644 index 0000000000..1fb04643b8 --- /dev/null +++ b/src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj.old @@ -0,0 +1,348 @@ + + + + + + False + + + False + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {542B9C12-E2A1-49BB-9134-0E3484F9D669} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + SmartStore.DevTools + SmartStore.DevTools + v4.7.2 + 512 + + ..\..\ + true + true + + + 4.0 + true + + + + + + + + + + true + full + false + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.DevTools\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.DevTools\ + TRACE + prompt + 4 + false + + + true + bin\EFMigrations\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\..\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) + + + + + + + + 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.OfflinePayment/SmartStore.OfflinePayment.csproj b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj index b392fe891f..12a64648db 100644 --- a/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj @@ -1,271 +1,30 @@ - - - - - - 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 - - - - - - - - - + disable + disable + latest - - 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.OfflinePayment/SmartStore.OfflinePayment.csproj.old b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj.old new file mode 100644 index 0000000000..1ac4d5c331 --- /dev/null +++ b/src/Plugins/SmartStore.OfflinePayment/SmartStore.OfflinePayment.csproj.old @@ -0,0 +1,269 @@ + + + + + + False + + + False + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {692E9D31-1393-47BF-B372-63F671052F89} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + SmartStore.OfflinePayment + SmartStore.OfflinePayment + v4.7.2 + 512 + + + + + + + + + + ..\..\ + true + + + 4.0 + true + + + + + + + + + + + + true + full + false + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.OfflinePayment\ + TRACE + prompt + 4 + false + + + true + bin\EFMigrations\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\..\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.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj index 77449e7c90..4bd218d663 100644 --- a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj @@ -1,275 +1,32 @@ - - - - - - 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 - - - - - - - - - + disable + disable + latest + false - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ - TRACE - prompt - 4 - false - - - true - ..\..\Presentation\SmartStore.Web\bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - 201403072202413_Initial.cs - - - - - - - - - - - - - - - - + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + + + + - - 201403072202413_Initial.cs - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + + + + + - - PreserveNewest - - - Designer - PreserveNewest - - - Designer - PreserveNewest - + + + + + - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51377 - / - http://localhost:53076/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj.old b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj.old new file mode 100644 index 0000000000..dbdcbf6158 --- /dev/null +++ b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj.old @@ -0,0 +1,272 @@ + + + + + + False + + + False + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {ACC1E122-B2C8-4441-BDED-D4A77763331A} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + SmartStore.Shipping + SmartStore.Shipping + v4.7.2 + 512 + + + + + + + + + + ..\..\ + true + + + 4.0 + true + + + + + + + + + + + + true + full + false + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Shipping\ + TRACE + prompt + 4 + false + + + true + ..\..\Presentation\SmartStore.Web\bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\..\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.Tax/SmartStore.Tax.csproj b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj index 4f0f0c8a61..1ff3d4af27 100644 --- a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj @@ -1,277 +1,33 @@ - - - - - - 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 - - - - - - - - - + disable + disable + latest + false - - true - full - false - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ - TRACE - prompt - 4 - false - - - true - ..\..\Presentation\SmartStore.Web\bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - False - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - False - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - False - - - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - False - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - False - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - False - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - False - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - False - - + - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - 201403112350417_Initial.cs - - - - - - - - - - - - - - - - - + + + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541AD-F659-47DA-8763-16F36C5CD2F4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - + + + + + - - PreserveNewest - - - Designer - Always - - - Designer - Always - + + + + + + - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - 201403112350417_Initial.cs - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - False - True - 51143 - / - http://localhost:56865/ - False - True - http://www.smartstore.net - False - - - - - - \ No newline at end of file + diff --git a/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj.old b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj.old new file mode 100644 index 0000000000..b61f8656b1 --- /dev/null +++ b/src/Plugins/SmartStore.Tax/SmartStore.Tax.csproj.old @@ -0,0 +1,275 @@ + + + + + + False + + + False + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {94D1BEEB-64A3-4EB6-9017-D66AFAF4F2B2} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + SmartStore.Tax + SmartStore.Tax + v4.7.2 + 512 + + + + + + + + + + ..\..\ + true + + + 4.0 + true + + + + + + + + + + + + true + full + false + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Presentation\SmartStore.Web\Plugins\SmartStore.Tax\ + TRACE + prompt + 4 + false + + + true + ..\..\Presentation\SmartStore.Web\bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\..\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/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..ef562721a4 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; 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/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..8374656dde 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 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..c4c9d64588 100644 --- a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj @@ -1,521 +1,29 @@ - - + - 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 - - + disable + disable + latest - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\EFMigrations\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\PluginDev\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll - - - False - ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\Autofac.WebApi2.5.0.0\lib\net461\Autofac.Integration.WebApi.dll - - - ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll - - - ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll - - - ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll - - - ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - - - ..\..\packages\CommonServiceLocator.2.0.5\lib\net47\CommonServiceLocator.dll - - - ..\..\packages\DotLiquid.2.0.254\lib\net45\DotLiquid.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - - ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.OData.Core.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Core.dll - - - ..\..\packages\Microsoft.OData.Edm.6.15.0\lib\portable-net45+win+wpa81\Microsoft.OData.Edm.dll - - - ..\..\packages\Microsoft.Spatial.6.15.0\lib\portable-net45+win+wpa81\Microsoft.Spatial.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - ..\..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll - - - ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - ..\..\packages\Microsoft.AspNet.OData.5.10.0\lib\net45\System.Web.OData.dll - - - False - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - - - False - ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Designer - - + + + + + + + + + + + - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - + + + - - - - - \ No newline at end of file + diff --git a/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj.old b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj.old new file mode 100644 index 0000000000..da35028d5e --- /dev/null +++ b/src/Presentation/SmartStore.Web.Framework/SmartStore.Web.Framework.csproj.old @@ -0,0 +1,520 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {75FD4163-333C-4DD5-854D-2EF294E45D94} + Library + Properties + 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 + + + + ..\..\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..591caecf87 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/BundlingVirtualPathProvider.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Web.Caching; -using System.Web.Hosting; +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..7ce337bbca 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/Assets/DefaultAssetCache.cs @@ -5,7 +5,7 @@ using System.Text; using System.Web; using System.Web.Caching; -using System.Web.Hosting; +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/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..8c2749c986 100644 --- a/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs +++ b/src/Presentation/SmartStore.Web.Framework/Theming/ThemingVirtualPathProvider.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Web.Caching; -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/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..229f911c21 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/ComponentRenderer.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Web; -using System.Web.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Web.UI; 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/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..3bc24558c0 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/Pager/PagerRenderer.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Routing; +using Microsoft.AspNetCore.Routing; using System.Web.UI; 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..8480d2354d 100644 --- a/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.cs +++ b/src/Presentation/SmartStore.Web.Framework/UI/Components/TabStrip/TabStripRenderer.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 System.Web.UI; using SmartStore.Web.Framework.Modelling; 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/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/Configuration/WebApiConfigurationBroadcaster.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs index d6e0f936fc..43be2a4ef0 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Configuration/WebApiConfigurationBroadcaster.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData.Builder; using System.Web.OData.Routing.Conventions; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs index ddcae71dde..c4c519e376 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/ApiControllerExtensions.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.WebApi { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs index fd97e3a26b..06a7cefebc 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Extensions/HttpRequestMessageExtensions.cs @@ -3,7 +3,7 @@ using System.Net; using System.Net.Http; using System.Reflection; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; namespace SmartStore.Web.Framework.WebApi { diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs index a9f9652cb2..6901c60054 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiEntityController.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; -using System.Data.Entity.Infrastructure; +using Microsoft.EntityFrameworkCore.Infrastructure; using System.Linq; using System.Linq.Expressions; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.OData; using System.Web.OData.Formatter; using Autofac; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs index bd5da2861d..cbc078b724 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/OData/WebApiQueryableAttribute.cs @@ -1,6 +1,6 @@ using System; using System.Net.Http; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.Filters; using System.Web.OData; using SmartStore.Web.Framework.WebApi.Caching; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs index 2194436571..40526e0a56 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/Security/WebApiAuthenticateAttribute.cs @@ -5,7 +5,7 @@ using System.Net.Http.Headers; using System.Security; using System.Web; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.Controllers; using System.Web.Http.Dependencies; using SmartStore.Core; diff --git a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs index 8fe2772ae6..129a7f7836 100644 --- a/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs +++ b/src/Presentation/SmartStore.Web.Framework/WebApi/WebApiStartupTask.cs @@ -1,6 +1,6 @@ using System; using System.Net.Http.Formatting; -using System.Web.Http; +using Microsoft.AspNetCore.Mvc; using System.Web.Http.Cors; using System.Web.OData.Builder; using System.Web.OData.Extensions; diff --git a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj index 27cf819bdf..ec01d1780f 100644 --- a/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj @@ -1,1390 +1,28 @@ - - - + - Debug - AnyCPU - - - 2.0 - {152C761A-DD2E-4C1F-AF89-DFB2547A3BCA} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + net8.0 SmartStore.Admin SmartStore.Admin - v4.7.2 - false - true - - - - - - - - - - - - - 4.0 - - - - - - ..\..\..\ - true - true - 1e5b888b - - + disable + disable + latest - - 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/Administration/SmartStore.Admin.csproj.old2 b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj.old2 new file mode 100644 index 0000000000..d1bb20b853 --- /dev/null +++ b/src/Presentation/SmartStore.Web/Administration/SmartStore.Admin.csproj.old2 @@ -0,0 +1,1388 @@ + + + + + Debug + AnyCPU + + + 2.0 + {152C761A-DD2E-4C1F-AF89-DFB2547A3BCA} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + SmartStore.Admin + SmartStore.Admin + v4.7.2 + false + true + + + + + + + + + + + + + 4.0 + + + + + + ..\..\..\ + true + true + 1e5b888b + + + + + true + full + false + ..\bin\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\bin\ + TRACE + prompt + 4 + false + + + + 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/SmartStore.Web.csproj b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj index c96f601e5a..ce4f05fc14 100644 --- a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj @@ -1,2170 +1,46 @@ - - - - - - - - + - 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 + disable + disable latest - false - AllFilesInProjectFolder - false - false - AnyCPU - - - - ..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll - - - False - ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - - ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll - - - ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll - - - ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll - - - ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll - - - ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll - - - ..\..\packages\BundleTransformer.JsMin.1.12.6\lib\net40\BundleTransformer.JsMin.dll - - - ..\..\packages\BundleTransformer.NUglify.1.12.16\lib\net40\BundleTransformer.NUglify.dll - - - ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll - - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\ClearScript.dll - - - ..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - True - - - ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll - True - - - ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll - - - ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll - - - ..\..\packages\JavaScriptEngineSwitcher.Msie.3.4.3\lib\net45\JavaScriptEngineSwitcher.Msie.dll - - - ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\JavaScriptEngineSwitcher.V8.dll - - - ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll - - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - True - ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\..\packages\MsieJavaScriptEngine.3.0.7\lib\net45\MsieJavaScriptEngine.dll - - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll - - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - - - - True - ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll - - - ..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll - - - - ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - - ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - - - False - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - - - ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - - - - - - - False - ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll - True - - - False - ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll - - - - - - Properties\AssemblySharedInfo.cs - - - Properties\AssemblyVersionInfo.cs - - - True - True - EditorLocalization.de.resx - - - True - True - EditorLocalization.resx - - - True - True - GridLocalization.de.resx - - - True - True - GridLocalization.resx - - - True - True - MvcLocalization.resx - - - True - True - MvcLocalization.de.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Global.asax - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - Designer - - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResXFileCodeGenerator - MvcLocalization.de.Designer.cs - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - Designer - - - - - Designer - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - Web.config - Designer - - - Web.config - Designer - - - - - - True - True - .\output - True - True - Nested - False - - - Designer - - - - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web.config - - - Web.config - - - - - - - - - {6bda8332-939f-45b7-a25e-7a797260ae59} - SmartStore.Core - - - {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} - SmartStore.Data - - - {210541ad-f659-47da-8763-16f36c5cd2f4} - SmartStore.Services - - - {75fd4163-333c-4dd5-854d-2ef294e45d94} - SmartStore.Web.Framework - - - - - - Designer - - - - - Designer - - - - - GlobalResourceProxyGenerator - EditorLocalization.de.designer.cs - - - GlobalResourceProxyGenerator - EditorLocalization.designer.cs - - - GlobalResourceProxyGenerator - GridLocalization.de.designer.cs - Designer - - - GlobalResourceProxyGenerator - GridLocalization.designer.cs - Designer - - - - - GlobalResourceProxyGenerator - MvcLocalization.Designer.cs - - - - - Config\log4net.config - False - $(TransformWebConfigIntermediateLocation)\original - Config\log4net.$(Configuration).config - $(TransformWebConfigIntermediateLocation)\original - $(TransformWebConfigIntermediateLocation)\original\%(DestinationRelativePath) - $(TransformWebConfigIntermediateLocation)\transformed\%(DestinationRelativePath) - $(_PackageTempDir)\%(DestinationRelativePath) - Designer - - - log4net.config - - - log4net.config - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - false - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - true - bin\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - True - - - - - - - - **\*.cs; - **\*.orig; - **\*.bak; - **\*.log; - **\*.csproj; - **\*.csproj.user; - **\*.DotSettings.user; - **\packages.config; - **\*.Debug.config; - **\*.Release.config; - **\*.PluginDev.config; - **\*.EFMigrations.config; - **\obj\**; - **\bin\*.xml; - App_Data\Licenses.lic; - App_Data\Settings.txt; - App_Data\InstalledPlugins.txt; - App_Data\SmartStore.Db.sdf; - Plugins\*\bin\**; - Themes\*\Content\compiled\**; - - - x64; - x86; - roslyn; - bin\da; bin\fi; bin\ja; bin\ko; bin\mk; bin\nl; bin\pt; bin\no; bin\pl; bin\pl; bin\ru-ru; bin\sv; bin\tr; bin\uk; bin\zh-CHS; bin\zh-Hans; bin\zh-Hant; - Exchange; - Media; - Properties; - App_Data\_Backup; - App_Data\_temp; - App_Data\Tenants; - App_Data\Migrations; - App_Data\Logs; - bin\HostRestart; - Administration\bin; - Content\Images\Thumbs; - - - - - - - Project - false - - - - - - - - - - - - - - - - - - - - $(ProjectDir)bin\roslyn\ - - - - - - - - $(ProjectDir)Content\placeholder.txt - - - - - - - - - - - - - - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - - - - - - \ No newline at end of file + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Presentation/SmartStore.Web/SmartStore.Web.csproj.old2 b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj.old2 new file mode 100644 index 0000000000..9012fb89b0 --- /dev/null +++ b/src/Presentation/SmartStore.Web/SmartStore.Web.csproj.old2 @@ -0,0 +1,2168 @@ + + + + + + + + + + Debug + AnyCPU + + + 2.0 + {4F1F649C-1020-45BE-A487-F416D9297FF3} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + 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 + latest + false + AllFilesInProjectFolder + false + false + AnyCPU + + + + ..\..\packages\AdvancedStringBuilder.0.1.0\lib\net45\AdvancedStringBuilder.dll + + + False + ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + + + ..\..\packages\Autofac.5.2.0\lib\net461\Autofac.dll + + + ..\..\packages\Autofac.Mvc5.5.0.0\lib\net461\Autofac.Integration.Mvc.dll + + + ..\..\packages\AutoprefixerHost.1.1.10\lib\net45\AutoprefixerHost.dll + + + ..\..\packages\BundleTransformer.Autoprefixer.1.12.1\lib\net40\BundleTransformer.Autoprefixer.dll + + + ..\..\packages\BundleTransformer.Core.1.10.0\lib\net40\BundleTransformer.Core.dll + + + ..\..\packages\BundleTransformer.JsMin.1.12.6\lib\net40\BundleTransformer.JsMin.dll + + + ..\..\packages\BundleTransformer.NUglify.1.12.16\lib\net40\BundleTransformer.NUglify.dll + + + ..\..\packages\BundleTransformer.SassAndScss.1.12.1\lib\net40\BundleTransformer.SassAndScss.dll + + + ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\ClearScript.dll + + + ..\..\packages\DouglasCrockford.JsMin.2.1.0\lib\net45\DouglasCrockford.JsMin.dll + + + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + True + + + ..\..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + True + + + ..\..\packages\EntityFramework.SqlServerCompact.6.4.4\lib\net45\EntityFramework.SqlServerCompact.dll + True + + + ..\..\packages\FluentValidation.7.4.0\lib\net45\FluentValidation.dll + + + ..\..\packages\FluentValidation.Mvc5.7.4.0\lib\net45\FluentValidation.Mvc.dll + + + ..\..\packages\JavaScriptEngineSwitcher.Core.3.3.0\lib\net45\JavaScriptEngineSwitcher.Core.dll + + + ..\..\packages\JavaScriptEngineSwitcher.Msie.3.4.3\lib\net45\JavaScriptEngineSwitcher.Msie.dll + + + ..\..\packages\JavaScriptEngineSwitcher.V8.3.5.5\lib\net45\JavaScriptEngineSwitcher.V8.dll + + + ..\..\packages\LibSassHost.1.2.6\lib\net471\LibSassHost.dll + + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + True + ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\..\packages\MsieJavaScriptEngine.3.0.7\lib\net45\MsieJavaScriptEngine.dll + + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + + ..\..\packages\NUglify.1.6.4\lib\net40\NUglify.dll + + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll + + + + + True + ..\..\packages\Microsoft.SqlServer.Compact.4.0.8876.1\lib\net40\System.Data.SqlServerCe.dll + + + ..\..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll + + + + ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + + + + + + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + + + + + + + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + + + False + ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + + + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll + + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll + + + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll + + + + + + + + False + ..\..\..\lib\Telerik\Telerik.Web.Mvc.dll + True + + + False + ..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll + + + + + + Properties\AssemblySharedInfo.cs + + + Properties\AssemblyVersionInfo.cs + + + True + True + EditorLocalization.de.resx + + + True + True + EditorLocalization.resx + + + True + True + GridLocalization.de.resx + + + True + True + GridLocalization.resx + + + True + True + MvcLocalization.resx + + + True + True + MvcLocalization.de.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Global.asax + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + Designer + + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ResXFileCodeGenerator + MvcLocalization.de.Designer.cs + Designer + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + Designer + + + + + Designer + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + Web.config + Designer + + + Web.config + Designer + + + + + + True + True + .\output + True + True + Nested + False + + + Designer + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Web.config + + + Web.config + + + + + + + + + {6bda8332-939f-45b7-a25e-7a797260ae59} + SmartStore.Core + + + {ccd7f2c9-6a2c-4cf0-8e89-076b8fc0f144} + SmartStore.Data + + + {210541ad-f659-47da-8763-16f36c5cd2f4} + SmartStore.Services + + + {75fd4163-333c-4dd5-854d-2ef294e45d94} + SmartStore.Web.Framework + + + + + + Designer + + + + + Designer + + + + + GlobalResourceProxyGenerator + EditorLocalization.de.designer.cs + + + GlobalResourceProxyGenerator + EditorLocalization.designer.cs + + + GlobalResourceProxyGenerator + GridLocalization.de.designer.cs + Designer + + + GlobalResourceProxyGenerator + GridLocalization.designer.cs + Designer + + + + + GlobalResourceProxyGenerator + MvcLocalization.Designer.cs + + + + + Config\log4net.config + False + $(TransformWebConfigIntermediateLocation)\original + Config\log4net.$(Configuration).config + $(TransformWebConfigIntermediateLocation)\original + $(TransformWebConfigIntermediateLocation)\original\%(DestinationRelativePath) + $(TransformWebConfigIntermediateLocation)\transformed\%(DestinationRelativePath) + $(_PackageTempDir)\%(DestinationRelativePath) + Designer + + + log4net.config + + + log4net.config + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + false + + + true + bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + true + bin\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + + + True + + + + + + + + **\*.cs; + **\*.orig; + **\*.bak; + **\*.log; + **\*.csproj; + **\*.csproj.user; + **\*.DotSettings.user; + **\packages.config; + **\*.Debug.config; + **\*.Release.config; + **\*.PluginDev.config; + **\*.EFMigrations.config; + **\obj\**; + **\bin\*.xml; + App_Data\Licenses.lic; + App_Data\Settings.txt; + App_Data\InstalledPlugins.txt; + App_Data\SmartStore.Db.sdf; + Plugins\*\bin\**; + Themes\*\Content\compiled\**; + + + x64; + x86; + roslyn; + bin\da; bin\fi; bin\ja; bin\ko; bin\mk; bin\nl; bin\pt; bin\no; bin\pl; bin\pl; bin\ru-ru; bin\sv; bin\tr; bin\uk; bin\zh-CHS; bin\zh-Hans; bin\zh-Hant; + Exchange; + Media; + Properties; + App_Data\_Backup; + App_Data\_temp; + App_Data\Tenants; + App_Data\Migrations; + App_Data\Logs; + bin\HostRestart; + Administration\bin; + Content\Images\Thumbs; + + + + + + + Project + false + + + + + + + + + + + + + + + + + + + + $(ProjectDir)bin\roslyn\ + + + + + + + + $(ProjectDir)Content\placeholder.txt + + + + + + + + + + + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + + + + + + + \ No newline at end of file