Skip to content

Commit

Permalink
PT-991: Remove obsolete SearchCriteriaJsonConverter (#494)
Browse files Browse the repository at this point in the history
  • Loading branch information
@akak1977
akak1977 committed Apr 9, 2021
1 parent 014fcd8 commit bb79335
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 66 deletions.
4 changes: 2 additions & 2 deletions src/VirtoCommerce.CatalogModule.BulkActions/VirtoCommerce.CatalogModule.BulkActions.csproj
View file
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
<PackageReference Include="VirtoCommerce.BulkActionsModule.Core" Version="3.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
<PackageReference Include="VirtoCommerce.BulkActionsModule.Core" Version="3.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.CatalogModule.Core/VirtoCommerce.CatalogModule.Core.csproj
View file
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" />
<PackageReference Include="VirtoCommerce.ExportModule.Core" Version="3.1.0" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.5.0" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.51.0" />
<PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.2.0" />
</ItemGroup>
</Project>
20 changes: 10 additions & 10 deletions src/VirtoCommerce.CatalogModule.Data/VirtoCommerce.CatalogModule.Data.csproj
View file
Expand Up @@ -6,26 +6,26 @@
<IsPackable>True</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentValidation" Version="8.6.2" />
<PackageReference Include="FluentValidation" Version="8.6.3" />
<PackageReference Include="Hangfire" Version="1.7.9" />
<PackageReference Include="EntityFrameworkCore.Triggers" Version="1.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" />
<PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.1.0" />
<PackageReference Include="VirtoCommerce.ExportModule.Data" Version="3.4.0" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.5.0" />
<PackageReference Include="VirtoCommerce.Platform.Data" Version="3.5.0" />
<PackageReference Include="VirtoCommerce.Platform.Security" Version="3.5.0" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.51.0" />
<PackageReference Include="VirtoCommerce.Platform.Data" Version="3.51.0" />
<PackageReference Include="VirtoCommerce.Platform.Security" Version="3.51.0" />
<PackageReference Include="VirtoCommerce.SearchModule.Data" Version="3.2.0" />
<PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.1.0" />
</ItemGroup>
Expand Down
41 changes: 0 additions & 41 deletions src/VirtoCommerce.CatalogModule.Web/JsonConverters/SearchCriteriaJsonConverter.cs
View file

This file was deleted.

6 changes: 0 additions & 6 deletions src/VirtoCommerce.CatalogModule.Web/Module.cs
View file
Expand Up @@ -5,11 +5,9 @@
using FluentValidation;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using VirtoCommerce.BulkActionsModule.Core.Models.BulkActions;
using VirtoCommerce.BulkActionsModule.Core.Services;
using VirtoCommerce.CatalogModule.BulkActions.Actions.CategoryChange;
Expand All @@ -34,7 +32,6 @@
using VirtoCommerce.CatalogModule.Data.Services;
using VirtoCommerce.CatalogModule.Data.Validation;
using VirtoCommerce.CatalogModule.Web.Authorization;
using VirtoCommerce.CatalogModule.Web.JsonConverters;
using VirtoCommerce.CoreModule.Core.Seo;
using VirtoCommerce.ExportModule.Core.Model;
using VirtoCommerce.ExportModule.Core.Services;
Expand Down Expand Up @@ -211,9 +208,6 @@ public void PostInitialize(IApplicationBuilder appBuilder)
ModuleConstants.Security.Permissions.Delete,
}, new SelectedCatalogScope());

var mvcJsonOptions = appBuilder.ApplicationServices.GetService<IOptions<MvcNewtonsoftJsonOptions>>();
mvcJsonOptions.Value.SerializerSettings.Converters.Add(new SearchCriteriaJsonConverter());

var inProcessBus = appBuilder.ApplicationServices.GetService<IHandlerRegistrar>();
inProcessBus.RegisterHandler<ProductChangedEvent>(async (message, token) => await appBuilder.ApplicationServices.GetService<LogChangesChangedEventHandler>().Handle(message));
inProcessBus.RegisterHandler<CategoryChangedEvent>(async (message, token) => await appBuilder.ApplicationServices.GetService<LogChangesChangedEventHandler>().Handle(message));
Expand Down
8 changes: 4 additions & 4 deletions src/VirtoCommerce.CatalogModule.Web/VirtoCommerce.CatalogModule.Web.csproj
View file
Expand Up @@ -19,10 +19,10 @@
<NoWarn>1701;1702;1705;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentValidation" Version="8.6.2" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.5.0" />
<PackageReference Include="VirtoCommerce.Platform.Data" Version="3.5.0" />
<PackageReference Include="VirtoCommerce.Platform.Security" Version="3.5.0" />
<PackageReference Include="FluentValidation" Version="8.6.3" />
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.51.0" />
<PackageReference Include="VirtoCommerce.Platform.Data" Version="3.51.0" />
<PackageReference Include="VirtoCommerce.Platform.Security" Version="3.51.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VirtoCommerce.CatalogModule.BulkActions\VirtoCommerce.CatalogModule.BulkActions.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/VirtoCommerce.CatalogModule.Web/module.manifest
View file
Expand Up @@ -3,7 +3,7 @@
<id>VirtoCommerce.Catalog</id>
<version>3.39.0</version>
<version-tag />
<platformVersion>3.46.0</platformVersion>
<platformVersion>3.51.0</platformVersion>
<title>Catalog module</title>
<description>Catalog, categories, products, variations, properties management</description>
<authors>
Expand All @@ -25,7 +25,7 @@
<dependency id="VirtoCommerce.Search" version="3.2.0" />
<dependency id="VirtoCommerce.Export" version="3.4.0" />
<dependency id="VirtoCommerce.Store" version="3.1.0" />
<dependency id="VirtoCommerce.BulkActionsModule" version="3.0.0" />
<dependency id="VirtoCommerce.BulkActionsModule" version="3.1.0" />
</dependencies>
<groups>
<group>commerce</group>
Expand Down

0 comments on commit bb79335

Please sign in to comment.