Skip to content

Commit

Permalink
Merge branch 'hotfix/refactor-sdk2.2' into 'develop'
Browse files Browse the repository at this point in the history
Hotfix/refactor sdk2.2

See merge request gear/GR!4
  • Loading branch information
nicolae-lupei committed Mar 16, 2020
2 parents 0266a0f + b02cd29 commit 11c44c9
Show file tree
Hide file tree
Showing 348 changed files with 2,540 additions and 2,128 deletions.
43 changes: 26 additions & 17 deletions GR.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -307,15 +307,21 @@ 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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GR.Notifications.Hub", "src\GR.Extensions\GR.Notifications.Extension\GR.Notifications.Hub\GR.Notifications.Hub.csproj", "{D889432D-A38A-4C22-87B0-8522192DCA49}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GR.Notifications.Hub", "src\GR.Extensions\GR.Notifications.Extension\GR.Notifications.Hub\GR.Notifications.Hub.csproj", "{D889432D-A38A-4C22-87B0-8522192DCA49}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.Permissions", "GR.Permissions", "{A9CDA9C0-A7EE-4B79-8DB0-CAA036A01B7C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.Profile", "GR.Profile", "{1896A6F8-56E1-4C56-ACBB-C9350014EB85}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GR.Ldap", "GR.Ldap", "{9E32496B-C795-45E7-B22F-FB382D8208BD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -1067,8 +1073,8 @@ Global
{AC174814-1F8C-4960-9B4A-067EED8B5546} = {6FE2EAEF-E294-4D4D-BE94-A03D3ABC1653}
{9F68CC74-9147-497E-B15F-70A2D5A7F2DA} = {BCF212C6-8AFE-490D-A10D-57869EFDC75C}
{B7AB42C6-3D13-4A40-B1DE-850917E795C9} = {BCF212C6-8AFE-490D-A10D-57869EFDC75C}
{6D6984F4-EB54-4107-AED8-DFA3F0E7B890} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{400C2124-8B49-49E0-B15F-C940A30DF2FE} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{6D6984F4-EB54-4107-AED8-DFA3F0E7B890} = {1896A6F8-56E1-4C56-ACBB-C9350014EB85}
{400C2124-8B49-49E0-B15F-C940A30DF2FE} = {1896A6F8-56E1-4C56-ACBB-C9350014EB85}
{228BABBE-1F74-438F-B756-FBD8E28F2582} = {F1554EFC-257E-4B7C-9FD2-49CF1E2AD3B6}
{9A6EBD6D-8BBD-4D5E-9922-35F129D3537B} = {F1554EFC-257E-4B7C-9FD2-49CF1E2AD3B6}
{5EE32D18-3642-4FC8-9439-DA12B76D3AC5} = {4B6C8C28-B2EC-4EDD-B6D8-F90B125CB109}
Expand All @@ -1086,8 +1092,8 @@ Global
{4ADAD96E-E01B-47C5-9589-7C6DEF589D66} = {7AE24405-9DE2-4131-904B-F3ED0F6B104B}
{2D22B7C1-DC4A-41AF-9132-D60276D5B94F} = {4ADAD96E-E01B-47C5-9589-7C6DEF589D66}
{817AD117-DE1E-4DB5-8F94-4D9653D51CC8} = {4ADAD96E-E01B-47C5-9589-7C6DEF589D66}
{E71932BB-6CE9-4668-AE67-C87AE3738645} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{5AD326F8-C456-4D22-B846-14DB8D5E8FAF} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{E71932BB-6CE9-4668-AE67-C87AE3738645} = {A9CDA9C0-A7EE-4B79-8DB0-CAA036A01B7C}
{5AD326F8-C456-4D22-B846-14DB8D5E8FAF} = {A9CDA9C0-A7EE-4B79-8DB0-CAA036A01B7C}
{827C1E40-3FCE-44A8-A0E9-DA9B6466C4B1} = {3D0F6210-272F-410D-AEAA-A5722E8C6D95}
{DD8B27D9-E5F4-48BC-BADD-97C85DBCAB89} = {7AE24405-9DE2-4131-904B-F3ED0F6B104B}
{F154FDB8-6FDD-4D69-AED5-80990E464B53} = {DD8B27D9-E5F4-48BC-BADD-97C85DBCAB89}
Expand Down Expand Up @@ -1140,8 +1146,8 @@ Global
{A0C4C692-A987-47C7-9437-36457BA49EFB} = {B595C1E9-D7E5-4A9D-8995-55720F89A815}
{43E024A7-9842-4F33-BE70-600C764F5593} = {A45A887D-97C6-4B42-B1F4-F319CBD39038}
{C2317862-8F23-4183-8289-6CC6761467D3} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{C0597030-10CE-488C-BEF6-9ECBAD6BEE06} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{77056BF2-D0DC-4BEA-BFC6-205728235A47} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{C0597030-10CE-488C-BEF6-9ECBAD6BEE06} = {9E32496B-C795-45E7-B22F-FB382D8208BD}
{77056BF2-D0DC-4BEA-BFC6-205728235A47} = {9E32496B-C795-45E7-B22F-FB382D8208BD}
{4AD4A550-3E6C-4453-A025-D7FEA1E992CE} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{A19141B5-44D4-4789-9157-C34718521F17} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{67772CD9-5D26-40A4-8E04-B2EF02AB9B25} = {7AE24405-9DE2-4131-904B-F3ED0F6B104B}
Expand Down Expand Up @@ -1173,6 +1179,9 @@ Global
{663F27FE-FFAC-4F3D-B390-B4617A75A0F9} = {AB58D5FE-AFC9-4BD6-9371-EFE689A05AFF}
{BCF212C6-8AFE-490D-A10D-57869EFDC75C} = {4B6C8C28-B2EC-4EDD-B6D8-F90B125CB109}
{D889432D-A38A-4C22-87B0-8522192DCA49} = {3D0F6210-272F-410D-AEAA-A5722E8C6D95}
{A9CDA9C0-A7EE-4B79-8DB0-CAA036A01B7C} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{1896A6F8-56E1-4C56-ACBB-C9350014EB85} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
{9E32496B-C795-45E7-B22F-FB382D8208BD} = {E75A6593-EA57-45A2-AC38-EBBBD7E7465E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6A849486-D7B5-49D1-94F6-9D173ACBA581}
Expand Down
1 change: 1 addition & 0 deletions GR.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Foreing/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=formeo/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=fullfillment/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gres/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Gtin/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Indrivo/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ISODMS/@EntryIndexedValue">True</s:Boolean>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
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;
using GR.Core.Helpers;
using GR.Core.Helpers.ModelBinders.ModelBinderProviders;
using GR.Core.Razor.Extensions;
using GR.Localization.Abstractions.Extensions;
using GR.Localization.Abstractions.Models;
using GR.Localization.Abstractions.Models.Config;
using GR.Notifications.Abstractions.Extensions;
using GR.Notifications.Hub.Hubs;
using GR.PageRender.Abstractions.Extensions;
using GR.WebApplication.Helpers;
using GR.WebApplication.Helpers.AppConfigurations;
using Microsoft.AspNetCore.Builder;
Expand Down Expand Up @@ -97,11 +98,12 @@ public static IServiceProvider RegisterGearWebApp(this IServiceCollection servic
if (configuration.CacheConfiguration.UseDistributedCache)
{
services.AddDistributedMemoryCache()
.AddCacheModule<DistributedCacheService, RedisConnection>(configuration.HostingEnvironment, configuration.Configuration);
.AddCacheModule<DistributedCacheService>()
.AddRedisCacheConfiguration<RedisConnection>(configuration.HostingEnvironment, configuration.Configuration);
}
else if (configuration.CacheConfiguration.UseInMemoryCache)
{
services.AddCacheModule<InMemoryCacheService, RedisConnection>(configuration.HostingEnvironment, configuration.Configuration);
services.AddCacheModule<InMemoryCacheService>();
}

//---------------------------------Api version Module-------------------------------------
Expand Down Expand Up @@ -176,9 +178,6 @@ public static IGearAppBuilder UseGearWebApp(this IApplicationBuilder app, Action
app.UseExceptionHandler("/Home/Error");
}

//-----------------------Custom url redirection Usage-------------------------------------
if (configuration.UseCustomUrlRewrite) app.UseUrlRewriteModule();

//----------------------------------Origin Cors Usage-------------------------------------
if (configuration.UseDefaultCorsConfiguration) app.UseConfiguredCors();

Expand Down Expand Up @@ -267,4 +266,4 @@ public static IApplicationBuilder UseAppMvc(this IApplicationBuilder app, IConfi
return app;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<Version>1.9.1</Version>
<Version>1.9.2</Version>
<Authors>Lupei Nicolae</Authors>
<Company>Indrivo</Company>
<Description>Web app for run gear product</Description>
<PackageIconUrl>https://i.ibb.co/KFYfF4D/indrivo-logo.jpg</PackageIconUrl>
<PackageTags>c# gear app .net core web webapp framework</PackageTags>
<PackageReleaseNotes>-Move app extensions</PackageReleaseNotes>
<FileVersion>1.9.1</FileVersion>
<AssemblyVersion>1.9.1</AssemblyVersion>
<FileVersion>1.9.2</FileVersion>
<AssemblyVersion>1.9.2</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -28,6 +28,7 @@
<ProjectReference Include="..\..\GR.Core.Extension\GR.Core.Razor\GR.Core.Razor.csproj" />
<ProjectReference Include="..\..\GR.Core.Extension\GR.Core\GR.Core.csproj" />
<ProjectReference Include="..\..\GR.Email.Extension\GR.Email.Abstractions\GR.Email.Abstractions.csproj" />
<ProjectReference Include="..\..\GR.Entities.Extension\GR.Entities\GR.Entities.csproj" />
<ProjectReference Include="..\..\GR.Forms.Extension\GR.Forms.Abstractions\GR.Forms.Abstractions.csproj" />
<ProjectReference Include="..\..\GR.Identity.Extension\GR.Identity.IdentityServer4\GR.Identity.IdentityServer4.csproj" />
<ProjectReference Include="..\..\GR.Localization.Extension\GR.Localization.Abstractions\GR.Localization.Abstractions.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ public class GearAppBuilderConfig
/// </summary>
public IConfiguration Configuration { get; set; }

/// <summary>
/// Use dynamic pages url rewrite
/// </summary>
public virtual bool UseCustomUrlRewrite { get; set; } = true;

/// <summary>
/// Use default cors
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -61,7 +61,7 @@ public sealed class RootObject
/// <summary>
/// Redis connection configuration
/// </summary>
public RedisConnectionConfig RedisConnection { get; set; } = new RedisConnectionConfig();
public CacheConfiguration RedisConnection { get; set; } = new CacheConfiguration();
}

public sealed class ConnectionStrings
Expand Down

This file was deleted.

Loading

0 comments on commit 11c44c9

Please sign in to comment.