From 0196edbee68adfffe838735e1e7f1a82d1a45ef0 Mon Sep 17 00:00:00 2001 From: Lupei Nicolae Date: Sun, 8 Mar 2020 20:50:28 +0200 Subject: [PATCH 01/16] fix: too long files names --- GR.sln | 20 +++++++++--------- .../ServiceCollectionsExtensions.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 0 .../GR.Braintree.Abstractions.csproj | 0 .../IBraintreePaymentMethod.cs | 0 .../Models/BraintreeConfiguration.cs | 0 .../Models/BraintreeSuccessPaymentResult.cs | 0 .../Controllers/BraintreeController.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../GR.Braintree.Razor.csproj | 0 .../BraintreeAssetsRazorFileConfiguration.cs | 0 .../_Braintree_MethodPartialView.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../GR.Braintree.Razor/libman.json | 0 .../wwwroot/assets/js/braintree-plugin.js | 0 .../BraintreePaymentMethodService.cs | 0 .../BraintreeValidationExtensions.cs | 0 .../GR.Braintree/GR.Braintree.csproj | 0 .../Assemblies/MobilpayEncryptDecrypt.dll | Bin .../Extensions/ServiceCollectionExtensions.cs | 0 .../GR.MobilPay.Abstractions.csproj | 0 .../Helpers/MobilPayResources.cs | 0 .../IMobilPayPaymentMethod.cs | 0 .../Models/MobilPayConfiguration.cs | 0 .../Models/MobilPayPaymentResponse.cs | 0 .../Controllers/MobilPayController.cs | 0 .../Controllers/MobilPaySettingsController.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../GR.MobilPay.Razor.csproj | 0 .../MobilPayAssetsRazorFileConfiguration.cs | 0 .../MobilPayConfigurationViewModel.cs | 0 .../Views/MobilPaySettings/Index.cshtml | 0 .../Shared/_MobilPay_MethodPartialView.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../GR.MobilPay.Razor/Views/_ViewStart.cshtml | 0 .../GR.MobilPay.Razor/libman.json | 0 .../wwwroot/assets/images/mobilPay.jpg | Bin .../wwwroot/assets/js/mobilPay-plugin.js | 0 .../Extensions/EncryptDecryptExtensions.cs | 0 .../GR.MobilPay/GR.MobilPay.csproj | 0 .../MobilPayPaymentMethodService.cs | 0 .../PaypalConfigurationExtensions.cs | 0 .../GR.Paypal.Abstractions.csproj | 0 .../IPaypalPaymentMethodService.cs | 0 .../Models/PaypalExpressConfigForm.cs | 0 .../PaypalExpressConfigFormViewModel.cs | 0 .../ViewModels/ExperienceProfile.cs | 0 .../ViewModels/PaymentCreateRequest.cs | 0 .../ViewModels/PaymentExecuteRequest.cs | 0 .../ViewModels/PaymentExecuteVm.cs | 0 .../ViewModels/PaypalExpressCheckoutForm.cs | 0 .../ViewModels/ResponsePaypal.cs | 0 .../Controllers/PaypalController.cs | 0 .../Controllers/PaypalSettingsController.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../GR.Paypal.Razor/GR.Paypal.Razor.csproj | 0 .../PaypalAssetsRazorFileConfiguration.cs | 0 .../GR.Paypal.Razor/Views/Paypal/Index.cshtml | 0 .../Views/PaypalSettings/Config.cshtml | 0 .../Shared/_Paypal_MethodPartialView.cshtml | 0 .../GR.Paypal.Razor/Views/_ViewImports.cshtml | 0 .../GR.Paypal.Razor/Views/_ViewStart.cshtml | 0 .../GR.Paypal.Razor/libman.json | 0 .../assets/PaypalProvider/paypal-plugin.js | 0 .../GR.Paypal/GR.Paypal.csproj | 0 .../GR.Paypal/PaypalPaymentMethodService.cs | 0 src/GR.WebHosts/GR.Cms/GR.Cms.csproj | 12 +++++------ 68 files changed, 17 insertions(+), 17 deletions(-) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Extensions/ServiceCollectionExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Abstractions/GR.Braintree.Abstractions.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Abstractions/IBraintreePaymentMethod.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeConfiguration.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeSuccessPaymentResult.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/Controllers/BraintreeController.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/Extensions/ServiceCollectionExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/GR.Braintree.Razor.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/Helpers/BraintreeAssetsRazorFileConfiguration.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/Shared/_Braintree_MethodPartialView.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewImports.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewStart.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/libman.json (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree.Razor/wwwroot/assets/js/braintree-plugin.js (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree/BraintreePaymentMethodService.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree/Extensions/BraintreeValidationExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Braintree/GR.Braintree/GR.Braintree.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Assemblies/MobilpayEncryptDecrypt.dll (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Extensions/ServiceCollectionExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/GR.MobilPay.Abstractions.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Helpers/MobilPayResources.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/IMobilPayPaymentMethod.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayConfiguration.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayPaymentResponse.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPayController.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPaySettingsController.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Extensions/ServiceCollectionExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/GR.MobilPay.Razor.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Helpers/MobilPayAssetsRazorFileConfiguration.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/ViewModels/MobilPayConfigurationViewModel.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/MobilPaySettings/Index.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/Shared/_MobilPay_MethodPartialView.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewImports.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewStart.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/libman.json (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/images/mobilPay.jpg (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/js/mobilPay-plugin.js (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay/Extensions/EncryptDecryptExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay/GR.MobilPay.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.MobilPay/GR.MobilPay/MobilPayPaymentMethodService.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Extensions/PaypalConfigurationExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/GR.Paypal.Abstractions.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/IPaypalPaymentMethodService.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/PaypalExpressConfigForm.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/ViewModels/PaypalExpressConfigFormViewModel.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ExperienceProfile.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentCreateRequest.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteRequest.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteVm.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaypalExpressCheckoutForm.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ResponsePaypal.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalController.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalSettingsController.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Extensions/ServiceCollectionExtensions.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/GR.Paypal.Razor.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Helpers/PaypalAssetsRazorFileConfiguration.cs (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Paypal/Index.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/PaypalSettings/Config.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Shared/_Paypal_MethodPartialView.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewImports.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewStart.cshtml (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/libman.json (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal.Razor/wwwroot/assets/PaypalProvider/paypal-plugin.js (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal/GR.Paypal.csproj (100%) rename src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/{GR.ECommerce.Payments.Providers => GR.Providers}/GR.ECommerce.Paypal/GR.Paypal/PaypalPaymentMethodService.cs (100%) diff --git a/GR.sln b/GR.sln index 4a8aeecb..c15cd5ea 100644 --- a/GR.sln +++ b/GR.sln @@ -217,7 +217,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Calendar.NetCore.Api.Gra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.ECommerce.Payments", "GR.ECommerce.Payments", "{A7B5EA4E-8A86-4F5D-820C-443A6C54BF36}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.ECommerce.Payments.Providers", "GR.ECommerce.Payments.Providers", "{E7023FD7-77DB-4A24-9ED4-A6054977BC22}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.Providers", "GR.Providers", "{E7023FD7-77DB-4A24-9ED4-A6054977BC22}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.ECommerce.Paypal", "GR.ECommerce.Paypal", "{9BEA7DC3-0498-4E31-805C-40E09C36F88F}" EndProject @@ -279,17 +279,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.ECommerce.Infrastructure EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.ECommerce.Modules", "GR.ECommerce.Modules", "{688A8EA1-8902-4AED-A503-AF1CC129F993}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.MobilPay.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.MobilPay\GR.MobilPay.Abstractions\GR.MobilPay.Abstractions.csproj", "{55FC695F-3F4D-4CF9-9EE0-42E51A2AEC44}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.MobilPay.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.MobilPay\GR.MobilPay.Abstractions\GR.MobilPay.Abstractions.csproj", "{55FC695F-3F4D-4CF9-9EE0-42E51A2AEC44}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.MobilPay", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.MobilPay\GR.MobilPay\GR.MobilPay.csproj", "{DE7B26A1-55DA-4615-A7B3-52AE931AA0E3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.MobilPay", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.MobilPay\GR.MobilPay\GR.MobilPay.csproj", "{DE7B26A1-55DA-4615-A7B3-52AE931AA0E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.MobilPay.Razor", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.MobilPay\GR.MobilPay.Razor\GR.MobilPay.Razor.csproj", "{835B2DF3-C7CB-4120-ACC4-1793C9AF8EA0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.MobilPay.Razor", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.MobilPay\GR.MobilPay.Razor\GR.MobilPay.Razor.csproj", "{835B2DF3-C7CB-4120-ACC4-1793C9AF8EA0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Paypal.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.Paypal\GR.Paypal.Abstractions\GR.Paypal.Abstractions.csproj", "{DE2990AB-133B-4E60-8706-FB12C053DFCE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Paypal.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.Paypal\GR.Paypal.Abstractions\GR.Paypal.Abstractions.csproj", "{DE2990AB-133B-4E60-8706-FB12C053DFCE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Paypal", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.Paypal\GR.Paypal\GR.Paypal.csproj", "{57E23449-A099-4B70-8585-322DB2CECCEE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Paypal", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.Paypal\GR.Paypal\GR.Paypal.csproj", "{57E23449-A099-4B70-8585-322DB2CECCEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Paypal.Razor", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.Paypal\GR.Paypal.Razor\GR.Paypal.Razor.csproj", "{42E837B7-66F8-45E3-9F8F-FFE019CB83C6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Paypal.Razor", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.Paypal\GR.Paypal.Razor\GR.Paypal.Razor.csproj", "{42E837B7-66F8-45E3-9F8F-FFE019CB83C6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.ECommerce.Payments.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Abstractions\GR.ECommerce.Payments.Abstractions.csproj", "{475F1FC4-62BD-416B-A5E1-56E02F09595E}" EndProject @@ -307,11 +307,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Subscriptions.Razor", "s EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.ECommerce.Braintree", "GR.ECommerce.Braintree", "{AB58D5FE-AFC9-4BD6-9371-EFE689A05AFF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Braintree.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.Braintree\GR.Braintree.Abstractions\GR.Braintree.Abstractions.csproj", "{120E621A-C97F-4104-942A-2359F973BF2E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Braintree.Abstractions", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.Braintree\GR.Braintree.Abstractions\GR.Braintree.Abstractions.csproj", "{120E621A-C97F-4104-942A-2359F973BF2E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Braintree", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.Braintree\GR.Braintree\GR.Braintree.csproj", "{F7DA2F5E-95AC-4909-976C-A0CD0FA74A51}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Braintree", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.Braintree\GR.Braintree\GR.Braintree.csproj", "{F7DA2F5E-95AC-4909-976C-A0CD0FA74A51}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Braintree.Razor", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.ECommerce.Payments.Providers\GR.ECommerce.Braintree\GR.Braintree.Razor\GR.Braintree.Razor.csproj", "{663F27FE-FFAC-4F3D-B390-B4617A75A0F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Braintree.Razor", "src\GR.Extensions\GR.Ecommerce.Extension\GR.ECommerce.Payments\GR.Providers\GR.ECommerce.Braintree\GR.Braintree.Razor\GR.Braintree.Razor.csproj", "{663F27FE-FFAC-4F3D-B390-B4617A75A0F9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.Entities.Providers", "GR.Entities.Providers", "{BCF212C6-8AFE-490D-A10D-57869EFDC75C}" EndProject diff --git a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs index 3b8c3fb8..b3594317 100644 --- a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs +++ b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs @@ -267,4 +267,4 @@ public static IApplicationBuilder UseAppMvc(this IApplicationBuilder app, IConfi return app; } } -} +} \ No newline at end of file diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Extensions/ServiceCollectionExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Extensions/ServiceCollectionExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Extensions/ServiceCollectionExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/GR.Braintree.Abstractions.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/GR.Braintree.Abstractions.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/GR.Braintree.Abstractions.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/GR.Braintree.Abstractions.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/IBraintreePaymentMethod.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/IBraintreePaymentMethod.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/IBraintreePaymentMethod.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/IBraintreePaymentMethod.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeConfiguration.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeConfiguration.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeConfiguration.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeConfiguration.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeSuccessPaymentResult.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeSuccessPaymentResult.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeSuccessPaymentResult.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Abstractions/Models/BraintreeSuccessPaymentResult.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Controllers/BraintreeController.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Controllers/BraintreeController.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Controllers/BraintreeController.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Controllers/BraintreeController.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Extensions/ServiceCollectionExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Extensions/ServiceCollectionExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Extensions/ServiceCollectionExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/GR.Braintree.Razor.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/GR.Braintree.Razor.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/GR.Braintree.Razor.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/GR.Braintree.Razor.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Helpers/BraintreeAssetsRazorFileConfiguration.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Helpers/BraintreeAssetsRazorFileConfiguration.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Helpers/BraintreeAssetsRazorFileConfiguration.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Helpers/BraintreeAssetsRazorFileConfiguration.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/Shared/_Braintree_MethodPartialView.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/Shared/_Braintree_MethodPartialView.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/Shared/_Braintree_MethodPartialView.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/Shared/_Braintree_MethodPartialView.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewImports.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewImports.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewImports.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewImports.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewStart.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewStart.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewStart.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/Views/_ViewStart.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/libman.json b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/libman.json similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/libman.json rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/libman.json diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/wwwroot/assets/js/braintree-plugin.js b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/wwwroot/assets/js/braintree-plugin.js similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/wwwroot/assets/js/braintree-plugin.js rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree.Razor/wwwroot/assets/js/braintree-plugin.js diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree/BraintreePaymentMethodService.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree/BraintreePaymentMethodService.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree/BraintreePaymentMethodService.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree/BraintreePaymentMethodService.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree/Extensions/BraintreeValidationExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree/Extensions/BraintreeValidationExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree/Extensions/BraintreeValidationExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree/Extensions/BraintreeValidationExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree/GR.Braintree.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree/GR.Braintree.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Braintree/GR.Braintree/GR.Braintree.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Braintree/GR.Braintree/GR.Braintree.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Assemblies/MobilpayEncryptDecrypt.dll b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Assemblies/MobilpayEncryptDecrypt.dll similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Assemblies/MobilpayEncryptDecrypt.dll rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Assemblies/MobilpayEncryptDecrypt.dll diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Extensions/ServiceCollectionExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Extensions/ServiceCollectionExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Extensions/ServiceCollectionExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/GR.MobilPay.Abstractions.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/GR.MobilPay.Abstractions.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/GR.MobilPay.Abstractions.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/GR.MobilPay.Abstractions.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Helpers/MobilPayResources.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Helpers/MobilPayResources.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Helpers/MobilPayResources.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Helpers/MobilPayResources.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/IMobilPayPaymentMethod.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/IMobilPayPaymentMethod.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/IMobilPayPaymentMethod.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/IMobilPayPaymentMethod.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayConfiguration.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayConfiguration.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayConfiguration.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayConfiguration.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayPaymentResponse.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayPaymentResponse.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayPaymentResponse.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Abstractions/Models/MobilPayPaymentResponse.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPayController.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPayController.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPayController.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPayController.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPaySettingsController.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPaySettingsController.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPaySettingsController.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Controllers/MobilPaySettingsController.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Extensions/ServiceCollectionExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Extensions/ServiceCollectionExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Extensions/ServiceCollectionExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/GR.MobilPay.Razor.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/GR.MobilPay.Razor.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/GR.MobilPay.Razor.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/GR.MobilPay.Razor.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Helpers/MobilPayAssetsRazorFileConfiguration.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Helpers/MobilPayAssetsRazorFileConfiguration.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Helpers/MobilPayAssetsRazorFileConfiguration.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Helpers/MobilPayAssetsRazorFileConfiguration.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/ViewModels/MobilPayConfigurationViewModel.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/ViewModels/MobilPayConfigurationViewModel.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/ViewModels/MobilPayConfigurationViewModel.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/ViewModels/MobilPayConfigurationViewModel.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/MobilPaySettings/Index.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/MobilPaySettings/Index.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/MobilPaySettings/Index.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/MobilPaySettings/Index.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/Shared/_MobilPay_MethodPartialView.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/Shared/_MobilPay_MethodPartialView.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/Shared/_MobilPay_MethodPartialView.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/Shared/_MobilPay_MethodPartialView.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewImports.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewImports.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewImports.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewImports.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewStart.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewStart.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewStart.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/Views/_ViewStart.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/libman.json b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/libman.json similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/libman.json rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/libman.json diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/images/mobilPay.jpg b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/images/mobilPay.jpg similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/images/mobilPay.jpg rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/images/mobilPay.jpg diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/js/mobilPay-plugin.js b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/js/mobilPay-plugin.js similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/js/mobilPay-plugin.js rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay.Razor/wwwroot/assets/js/mobilPay-plugin.js diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay/Extensions/EncryptDecryptExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay/Extensions/EncryptDecryptExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay/Extensions/EncryptDecryptExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay/Extensions/EncryptDecryptExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay/GR.MobilPay.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay/GR.MobilPay.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay/GR.MobilPay.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay/GR.MobilPay.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay/MobilPayPaymentMethodService.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay/MobilPayPaymentMethodService.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.MobilPay/GR.MobilPay/MobilPayPaymentMethodService.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.MobilPay/GR.MobilPay/MobilPayPaymentMethodService.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Extensions/PaypalConfigurationExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Extensions/PaypalConfigurationExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Extensions/PaypalConfigurationExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Extensions/PaypalConfigurationExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/GR.Paypal.Abstractions.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/GR.Paypal.Abstractions.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/GR.Paypal.Abstractions.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/GR.Paypal.Abstractions.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/IPaypalPaymentMethodService.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/IPaypalPaymentMethodService.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/IPaypalPaymentMethodService.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/IPaypalPaymentMethodService.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/PaypalExpressConfigForm.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/PaypalExpressConfigForm.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/PaypalExpressConfigForm.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/PaypalExpressConfigForm.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/ViewModels/PaypalExpressConfigFormViewModel.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/ViewModels/PaypalExpressConfigFormViewModel.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/ViewModels/PaypalExpressConfigFormViewModel.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/Models/ViewModels/PaypalExpressConfigFormViewModel.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ExperienceProfile.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ExperienceProfile.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ExperienceProfile.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ExperienceProfile.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentCreateRequest.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentCreateRequest.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentCreateRequest.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentCreateRequest.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteRequest.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteRequest.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteRequest.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteRequest.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteVm.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteVm.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteVm.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaymentExecuteVm.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaypalExpressCheckoutForm.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaypalExpressCheckoutForm.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaypalExpressCheckoutForm.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/PaypalExpressCheckoutForm.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ResponsePaypal.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ResponsePaypal.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ResponsePaypal.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Abstractions/ViewModels/ResponsePaypal.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalController.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalController.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalController.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalController.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalSettingsController.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalSettingsController.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalSettingsController.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Controllers/PaypalSettingsController.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Extensions/ServiceCollectionExtensions.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Extensions/ServiceCollectionExtensions.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Extensions/ServiceCollectionExtensions.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/GR.Paypal.Razor.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/GR.Paypal.Razor.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/GR.Paypal.Razor.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/GR.Paypal.Razor.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Helpers/PaypalAssetsRazorFileConfiguration.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Helpers/PaypalAssetsRazorFileConfiguration.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Helpers/PaypalAssetsRazorFileConfiguration.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Helpers/PaypalAssetsRazorFileConfiguration.cs diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Paypal/Index.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Paypal/Index.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Paypal/Index.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Paypal/Index.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/PaypalSettings/Config.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/PaypalSettings/Config.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/PaypalSettings/Config.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/PaypalSettings/Config.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Shared/_Paypal_MethodPartialView.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Shared/_Paypal_MethodPartialView.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Shared/_Paypal_MethodPartialView.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/Shared/_Paypal_MethodPartialView.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewImports.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewImports.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewImports.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewImports.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewStart.cshtml b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewStart.cshtml similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewStart.cshtml rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/Views/_ViewStart.cshtml diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/libman.json b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/libman.json similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/libman.json rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/libman.json diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/wwwroot/assets/PaypalProvider/paypal-plugin.js b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/wwwroot/assets/PaypalProvider/paypal-plugin.js similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/wwwroot/assets/PaypalProvider/paypal-plugin.js rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal.Razor/wwwroot/assets/PaypalProvider/paypal-plugin.js diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal/GR.Paypal.csproj b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal/GR.Paypal.csproj similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal/GR.Paypal.csproj rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal/GR.Paypal.csproj diff --git a/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal/PaypalPaymentMethodService.cs b/src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal/PaypalPaymentMethodService.cs similarity index 100% rename from src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.ECommerce.Payments.Providers/GR.ECommerce.Paypal/GR.Paypal/PaypalPaymentMethodService.cs rename to src/GR.Extensions/GR.Ecommerce.Extension/GR.ECommerce.Payments/GR.Providers/GR.ECommerce.Paypal/GR.Paypal/PaypalPaymentMethodService.cs diff --git a/src/GR.WebHosts/GR.Cms/GR.Cms.csproj b/src/GR.WebHosts/GR.Cms/GR.Cms.csproj index 9fda9b3d..d043cdca 100644 --- a/src/GR.WebHosts/GR.Cms/GR.Cms.csproj +++ b/src/GR.WebHosts/GR.Cms/GR.Cms.csproj @@ -52,12 +52,12 @@ - - - - - - + + + + + + From 0a6fc60885c446702a41cdbbf39a32ec45158744 Mon Sep 17 00:00:00 2001 From: Lupei Nicolae Date: Sun, 8 Mar 2020 21:35:04 +0200 Subject: [PATCH 02/16] fix: cache module refactoring --- .../ServiceCollectionsExtensions.cs | 9 ++-- .../Models/AppSettingsModel.cs | 4 +- .../Extensions/ServiceProviderExtensions.cs | 53 ++----------------- .../GR.Cache.Abstractions.csproj | 2 - .../GR.Cache.Abstractions/ICacheService.cs | 6 +++ .../CacheConfiguration.cs} | 4 +- .../Controllers/CacheController.cs | 7 +-- .../GR.Cache.Razor/GR.Cache.Razor.csproj | 2 - .../GR.Cache.Razor/Views/Cache/Index.cshtml | 8 ++- .../Views/Cache/Settings.cshtml | 2 +- .../InvalidCacheConfigurationException.cs | 2 +- .../Exceptions/RedisConnectionException.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 50 +++++++++++++++++ .../GR.Cache/GR.Cache.csproj | 2 + .../GR.Cache/Helpers/RedisConnection.cs | 7 ++- .../IRedisConnection.cs | 2 +- .../GR.Cache/RedisConnectionConfig.cs | 9 ++++ .../Services/DistributedCacheService.cs | 6 +++ .../GR.Cache/Services/InMemoryCacheService.cs | 6 +++ 19 files changed, 106 insertions(+), 77 deletions(-) rename src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/{RedisConnectionConfig.cs => Models/CacheConfiguration.cs} (76%) mode change 100755 => 100644 rename src/GR.Extensions/GR.Cache.Extension/{GR.Cache.Abstractions => GR.Cache}/Exceptions/InvalidCacheConfigurationException.cs (88%) rename src/GR.Extensions/GR.Cache.Extension/{GR.Cache.Abstractions => GR.Cache}/Exceptions/RedisConnectionException.cs (85%) mode change 100755 => 100644 create mode 100644 src/GR.Extensions/GR.Cache.Extension/GR.Cache/Extensions/ServiceCollectionExtensions.cs rename src/GR.Extensions/GR.Cache.Extension/{GR.Cache.Abstractions => GR.Cache}/IRedisConnection.cs (95%) mode change 100755 => 100644 create mode 100644 src/GR.Extensions/GR.Cache.Extension/GR.Cache/RedisConnectionConfig.cs diff --git a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs index b3594317..32be7e69 100644 --- a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs +++ b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Extensions/ServiceCollectionsExtensions.cs @@ -3,8 +3,10 @@ using System.Linq; using Castle.MicroKernel.Registration; using Castle.Windsor.MsDependencyInjection; -using GR.Cache.Abstractions.Exceptions; using GR.Cache.Abstractions.Extensions; +using GR.Cache.Exceptions; +using GR.Cache.Extensions; +using GR.Cache.Helpers; using GR.Cache.Services; using GR.Core; using GR.Core.Extensions; @@ -97,11 +99,12 @@ public static IServiceProvider RegisterGearWebApp(this IServiceCollection servic if (configuration.CacheConfiguration.UseDistributedCache) { services.AddDistributedMemoryCache() - .AddCacheModule(configuration.HostingEnvironment, configuration.Configuration); + .AddCacheModule() + .AddRedisCacheConfiguration(configuration.HostingEnvironment, configuration.Configuration); } else if (configuration.CacheConfiguration.UseInMemoryCache) { - services.AddCacheModule(configuration.HostingEnvironment, configuration.Configuration); + services.AddCacheModule(); } //---------------------------------Api version Module------------------------------------- diff --git a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Models/AppSettingsModel.cs b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Models/AppSettingsModel.cs index 266650a3..80ecabd0 100644 --- a/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Models/AppSettingsModel.cs +++ b/src/GR.Extensions/GR.Application.Extension/GR.WebApplication/Models/AppSettingsModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using GR.Backup.Abstractions.Models; -using GR.Cache.Abstractions; +using GR.Cache.Abstractions.Models; using GR.Core; using GR.Email.Abstractions.Models.EmailViewModels; using GR.Localization.Abstractions.ViewModels.LocalizationViewModels; @@ -61,7 +61,7 @@ public sealed class RootObject /// /// Redis connection configuration /// - public RedisConnectionConfig RedisConnection { get; set; } = new RedisConnectionConfig(); + public CacheConfiguration RedisConnection { get; set; } = new CacheConfiguration(); } public sealed class ConnectionStrings diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Extensions/ServiceProviderExtensions.cs b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Extensions/ServiceProviderExtensions.cs index 22bf73b3..6404b583 100644 --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Extensions/ServiceProviderExtensions.cs +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Extensions/ServiceProviderExtensions.cs @@ -1,10 +1,4 @@ -using System; -using GR.Cache.Abstractions.Exceptions; -using GR.Core; -using GR.Core.Extensions; -using GR.Core.Helpers; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using GR.Core.Extensions; using Microsoft.Extensions.DependencyInjection; namespace GR.Cache.Abstractions.Extensions @@ -15,52 +9,11 @@ public static class ServiceProviderExtensions /// Use custom cache service /// /// - /// - /// - /// /// - public static IServiceCollection AddCacheModule(this IServiceCollection services, IHostingEnvironment environment, IConfiguration configuration, string customSystemIdentifier = null) + public static IServiceCollection AddCacheModule(this IServiceCollection services) where TCacheService : class, ICacheService - where TRedisConnection : class, IRedisConnection { - services.AddCacheModule(environment, configuration); - services.AddSingleton(); - IoC.RegisterSingletonService(); - return services; - } - - /// - /// Add cache module - /// - /// - /// - /// - /// - /// - public static IServiceCollection AddCacheModule(this IServiceCollection services, IHostingEnvironment environment, IConfiguration configuration, string customSystemIdentifier = null) - where TRedisConnection : class, IRedisConnection - { - if (customSystemIdentifier == null) - { - var systemIdentifier = configuration.GetSection(nameof(SystemConfig)) - .GetValue(nameof(SystemConfig.MachineIdentifier)); - - if (string.IsNullOrEmpty(systemIdentifier)) - throw new NullReferenceException("System identifier was not registered in appsettings file"); - customSystemIdentifier = systemIdentifier; - } - var redisSection = configuration.GetSection("RedisConnection"); - var redisConfig = redisSection.Get(); - if (redisConfig == null) throw new InvalidCacheConfigurationException(); - services.ConfigureWritable(configuration.GetSection("RedisConnection")); - services.AddDistributedRedisCache(opts => - { - opts.Configuration = redisConfig.Host; - opts.InstanceName = $"{customSystemIdentifier}.{environment.EnvironmentName}@"; - }); - - services.AddSingleton(); - IoC.RegisterSingletonService(); + services.AddGearSingleton(); return services; } } diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/GR.Cache.Abstractions.csproj b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/GR.Cache.Abstractions.csproj index 8503ef32..ec48df55 100644 --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/GR.Cache.Abstractions.csproj +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/GR.Cache.Abstractions.csproj @@ -13,8 +13,6 @@ - - diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/ICacheService.cs b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/ICacheService.cs index b05b80e5..dd05b2e8 100755 --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/ICacheService.cs +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/ICacheService.cs @@ -54,5 +54,11 @@ public interface ICacheService /// Flush all keys /// void FlushAll(); + + /// + /// Get provider name + /// + /// + string GetImplementationProviderName(); } } diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/RedisConnectionConfig.cs b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Models/CacheConfiguration.cs old mode 100755 new mode 100644 similarity index 76% rename from src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/RedisConnectionConfig.cs rename to src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Models/CacheConfiguration.cs index 2c86fb19..48a656be --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/RedisConnectionConfig.cs +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Abstractions/Models/CacheConfiguration.cs @@ -1,6 +1,6 @@ -namespace GR.Cache.Abstractions +namespace GR.Cache.Abstractions.Models { - public sealed class RedisConnectionConfig + public class CacheConfiguration { /// /// Host of redis diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Controllers/CacheController.cs b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Controllers/CacheController.cs index 15cb2912..c1e87113 100755 --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Controllers/CacheController.cs +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Controllers/CacheController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using GR.Cache.Abstractions; +using GR.Cache.Abstractions.Models; using GR.Core; using GR.Core.Abstractions; using GR.Core.Helpers; @@ -20,14 +21,14 @@ public class CacheController : Controller /// /// Cache options /// - private readonly IWritableOptions _writableOptions; + private readonly IWritableOptions _writableOptions; /// /// Constructor /// /// /// - public CacheController(ICacheService cacheService, IWritableOptions writableOptions) + public CacheController(ICacheService cacheService, IWritableOptions writableOptions) { _cacheService = cacheService; _writableOptions = writableOptions; @@ -87,7 +88,7 @@ public IActionResult Settings() /// /// [HttpPost] - public IActionResult Settings(RedisConnectionConfig model) + public IActionResult Settings(CacheConfiguration model) { _writableOptions.Update(opt => { diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/GR.Cache.Razor.csproj b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/GR.Cache.Razor.csproj index 38826135..790b4f56 100755 --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/GR.Cache.Razor.csproj +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/GR.Cache.Razor.csproj @@ -16,8 +16,6 @@ - - diff --git a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Views/Cache/Index.cshtml b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Views/Cache/Index.cshtml index cc1eba64..44237c12 100755 --- a/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Views/Cache/Index.cshtml +++ b/src/GR.Extensions/GR.Cache.Extension/GR.Cache.Razor/Views/Cache/Index.cshtml @@ -1,7 +1,4 @@ -@using Newtonsoft.Json -@using GR.Cache.Abstractions -@using GR.Cache.Services -@using GR.Core +@using GR.Cache.Abstractions @using GR.Core.Extensions @model IEnumerable @inject ICacheService CacheService @@ -42,7 +39,7 @@ { foreach (var item in Model) { - var key = CacheService is DistributedCacheService ? item.Key.Split('@')?[1] : item.Key; + var key = CacheService.GetImplementationProviderName() == "DistributedCacheService" ? item.Key.Split('@')[1] : item.Key; var pre = await CacheService.GetAsync (key); @@ -153,6 +150,7 @@ @section Styles {