From 0efd5b2edc7ef32c4b22bcb053edd2def246ba7b Mon Sep 17 00:00:00 2001
From: Konstantin Savosteev <Konstantin.Savosteev@virtoway.com>
Date: Fri, 27 Dec 2024 17:03:40 +0200
Subject: [PATCH 1/6] feat: v8 update

---
 .../Schemas/WhiteLabelingSettingsType.cs       |  3 ++-
 ...Commerce.WhiteLabeling.ExperienceApi.csproj |  4 ++--
 src/VirtoCommerce.WhiteLabeling.Web/Module.cs  | 18 ++++++++++--------
 .../module.manifest                            |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
index 258c0c2..e77b2a0 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
@@ -1,10 +1,11 @@
 using GraphQL.Types;
 using VirtoCommerce.WhiteLabeling.ExperienceApi.Models;
+using VirtoCommerce.Xapi.Core.Schemas;
 using VirtoCommerce.XCMS.Core.Schemas;
 
 namespace VirtoCommerce.WhiteLabeling.ExperienceApi.Schemas
 {
-    public class WhiteLabelingSettingsType : ObjectGraphType<ExpWhiteLabelingSetting>
+    public class WhiteLabelingSettingsType : ExtendableGraphType<ExpWhiteLabelingSetting>
     {
         public WhiteLabelingSettingsType()
         {
diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
index 9fca09f..c2f1da5 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.816.0-alpha.74-vcst-2376-update-graphql" />
+    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.806.0-alpha.20-vcst-2376-update-graphql" />
     <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
index c9c42bc..b0f49d3 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
+++ b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
@@ -1,5 +1,6 @@
 using System;
-using GraphQL.Server;
+using GraphQL;
+using GraphQL.MicrosoftDI;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
@@ -18,7 +19,6 @@
 using VirtoCommerce.WhiteLabeling.Data.SqlServer;
 using VirtoCommerce.WhiteLabeling.ExperienceApi;
 using VirtoCommerce.Xapi.Core.Extensions;
-using VirtoCommerce.Xapi.Core.Infrastructure;
 
 namespace VirtoCommerce.WhiteLabeling.Web;
 
@@ -29,12 +29,14 @@ public class Module : IModule, IHasConfiguration
 
     public void Initialize(IServiceCollection serviceCollection)
     {
-        var assemblyMarker = typeof(AssemblyMarker);
-        var graphQlBuilder = new CustomGraphQLBuilder(serviceCollection);
-        graphQlBuilder.AddGraphTypes(assemblyMarker);
-        serviceCollection.AddMediatR(assemblyMarker);
-        serviceCollection.AddAutoMapper(assemblyMarker);
-        serviceCollection.AddSchemaBuilders(assemblyMarker);
+        var graphQlBuilder = new GraphQLBuilder(serviceCollection, builder =>
+        {
+            var assemblyMarker = typeof(AssemblyMarker);
+            builder.AddGraphTypes(assemblyMarker.Assembly);
+            serviceCollection.AddMediatR(assemblyMarker);
+            serviceCollection.AddAutoMapper(assemblyMarker);
+            serviceCollection.AddSchemaBuilders(assemblyMarker);
+        });
 
         serviceCollection.AddDbContext<WhiteLabelingDbContext>(options =>
         {
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
index e609029..33ab8d4 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
+++ b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
@@ -6,8 +6,8 @@
 
   <platformVersion>3.841.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Xapi" version="3.800.0" />
-    <dependency id="VirtoCommerce.XCMS" version="3.800.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.816.0" />
+    <dependency id="VirtoCommerce.XCMS" version="3.806.0" />
     <dependency id="VirtoCommerce.Customer" version="3.811.0" />
     <dependency id="VirtoCommerce.ImageTools" version="3.802.0" />
   </dependencies>

From cb8594e41c370eedfe4d3ba3c4826308c52f537d Mon Sep 17 00:00:00 2001
From: Konstantin Savosteev <Konstantin.Savosteev@virtoway.com>
Date: Fri, 27 Dec 2024 17:23:51 +0200
Subject: [PATCH 2/6] fix: sonar

---
 src/VirtoCommerce.WhiteLabeling.Web/Module.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
index b0f49d3..a04b97a 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
+++ b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
@@ -29,7 +29,7 @@ public class Module : IModule, IHasConfiguration
 
     public void Initialize(IServiceCollection serviceCollection)
     {
-        var graphQlBuilder = new GraphQLBuilder(serviceCollection, builder =>
+        _ = new GraphQLBuilder(serviceCollection, builder =>
         {
             var assemblyMarker = typeof(AssemblyMarker);
             builder.AddGraphTypes(assemblyMarker.Assembly);

From 8259880d174d44a301e82af690e7e5e440d12c7d Mon Sep 17 00:00:00 2001
From: Konstantin Savosteev <Konstantin.Savosteev@virtoway.com>
Date: Mon, 6 Jan 2025 11:48:45 +0200
Subject: [PATCH 3/6] feat: update dependency

---
 .../VirtoCommerce.WhiteLabeling.ExperienceApi.csproj       | 2 +-
 src/VirtoCommerce.WhiteLabeling.Web/Module.cs              | 7 +------
 src/VirtoCommerce.WhiteLabeling.Web/module.manifest        | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
index c2f1da5..81dae22 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.816.0-alpha.74-vcst-2376-update-graphql" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.817.0-alpha.78-vcst-2376-update-graphql" />
     <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.806.0-alpha.20-vcst-2376-update-graphql" />
     <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
   </ItemGroup>
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
index a04b97a..9c1031b 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
+++ b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
@@ -1,7 +1,6 @@
 using System;
 using GraphQL;
 using GraphQL.MicrosoftDI;
-using MediatR;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
@@ -31,11 +30,7 @@ public void Initialize(IServiceCollection serviceCollection)
     {
         _ = new GraphQLBuilder(serviceCollection, builder =>
         {
-            var assemblyMarker = typeof(AssemblyMarker);
-            builder.AddGraphTypes(assemblyMarker.Assembly);
-            serviceCollection.AddMediatR(assemblyMarker);
-            serviceCollection.AddAutoMapper(assemblyMarker);
-            serviceCollection.AddSchemaBuilders(assemblyMarker);
+            builder.AddSchema(serviceCollection, typeof(AssemblyMarker));
         });
 
         serviceCollection.AddDbContext<WhiteLabelingDbContext>(options =>
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
index 33ab8d4..c8905fe 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
+++ b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
@@ -6,7 +6,7 @@
 
   <platformVersion>3.841.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Xapi" version="3.816.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.817.0" />
     <dependency id="VirtoCommerce.XCMS" version="3.806.0" />
     <dependency id="VirtoCommerce.Customer" version="3.811.0" />
     <dependency id="VirtoCommerce.ImageTools" version="3.802.0" />

From a496f3e017a4fdac42500da536fdec2882077736 Mon Sep 17 00:00:00 2001
From: Konstantin Savosteev <Konstantin.Savosteev@virtoway.com>
Date: Wed, 8 Jan 2025 19:35:28 +0200
Subject: [PATCH 4/6] feat: remove obsolete fields definitions

---
 .../Schemas/WhiteLabelingSettingsType.cs                      | 4 ++--
 .../VirtoCommerce.WhiteLabeling.ExperienceApi.csproj          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
index e77b2a0..001513d 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
@@ -16,8 +16,8 @@ public WhiteLabelingSettingsType()
             Field(x => x.LabelingSetting.SecondaryLogoUrl, nullable: true).Description("Logo URL for footer");
             Field(x => x.LabelingSetting.FaviconUrl, nullable: true).Description("Master favicon URL");
             Field(x => x.LabelingSetting.ThemePresetName, nullable: true).Description("Theme preset name");
-            Field<ListGraphType<MenuLinkType>>("footerLinks", resolve: context => context.Source.FooterLinks);
-            Field<ListGraphType<FaviconType>>("favicons", resolve: context => context.Source.Favicons);
+            Field<ListGraphType<MenuLinkType>>("footerLinks").Resolve(context => context.Source.FooterLinks);
+            Field<ListGraphType<FaviconType>>("favicons").Resolve(context => context.Source.Favicons);
         }
     }
 }
diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
index 81dae22..2f97e4e 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.817.0-alpha.78-vcst-2376-update-graphql" />
-    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.806.0-alpha.20-vcst-2376-update-graphql" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.817.0-alpha.79-vcst-2376-update-graphql" />
+    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.806.0-alpha.22-vcst-2376-update-graphql" />
     <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
   </ItemGroup>
   <ItemGroup>

From 7804a37ede3e0108b267585a9d07e171fbb5fcbe Mon Sep 17 00:00:00 2001
From: Konstantin Savosteev <Konstantin.Savosteev@virtoway.com>
Date: Mon, 27 Jan 2025 15:59:39 +0200
Subject: [PATCH 5/6] v3.900.0

---
 Directory.Build.props                                     | 2 +-
 .../VirtoCommerce.WhiteLabeling.ExperienceApi.csproj      | 4 ++--
 src/VirtoCommerce.WhiteLabeling.Web/module.manifest       | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f183eb8..754cdf2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.805.0</VersionPrefix>
+    <VersionPrefix>3.900.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
index 2f97e4e..ff81213 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.817.0-alpha.79-vcst-2376-update-graphql" />
-    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.806.0-alpha.22-vcst-2376-update-graphql" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.900.0" />
+    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.900.0" />
     <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
index c8905fe..c028a0c 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
+++ b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.WhiteLabeling</id>
-  <version>3.805.0</version>
+  <version>3.900.0</version>
   <version-tag></version-tag>
 
   <platformVersion>3.841.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Xapi" version="3.817.0" />
-    <dependency id="VirtoCommerce.XCMS" version="3.806.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.900.0" />
+    <dependency id="VirtoCommerce.XCMS" version="3.900.0" />
     <dependency id="VirtoCommerce.Customer" version="3.811.0" />
     <dependency id="VirtoCommerce.ImageTools" version="3.802.0" />
   </dependencies>
@@ -30,7 +30,7 @@
   <moduleType>VirtoCommerce.WhiteLabeling.Web.Module, VirtoCommerce.WhiteLabeling.Web</moduleType>
 
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2024 VirtoCommerce. All rights reserved</copyright>
+  <copyright>Copyright © 2024–2025 VirtoCommerce. All rights reserved</copyright>
   <tags>extension module</tags>
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
 </module>

From 868465cafc7ad2062dc96d05cbff1ebe56208897 Mon Sep 17 00:00:00 2001
From: Konstantin Savosteev <Konstantin.Savosteev@virtoway.com>
Date: Mon, 27 Jan 2025 18:17:45 +0200
Subject: [PATCH 6/6] fix: platform version

---
 .../VirtoCommerce.WhiteLabeling.ExperienceApi.csproj            | 2 +-
 src/VirtoCommerce.WhiteLabeling.Web/Module.cs                   | 1 -
 src/VirtoCommerce.WhiteLabeling.Web/module.manifest             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
index bfd4a97..103da39 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="VirtoCommerce.FileExperienceApi.Data" Version="3.900.0" />
     <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.900.0" />
     <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.900.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.861.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.WhiteLabeling.Core\VirtoCommerce.WhiteLabeling.Core.csproj" />
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
index 60310d4..cadf64e 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
+++ b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
@@ -1,7 +1,6 @@
 using System;
 using GraphQL;
 using GraphQL.MicrosoftDI;
-using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
index 5270c14..6e0ebcd 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
+++ b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
@@ -4,7 +4,7 @@
   <version>3.900.0</version>
   <version-tag></version-tag>
 
-  <platformVersion>3.841.0</platformVersion>
+  <platformVersion>3.861.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.FileExperienceApi" version="3.900.0" />
     <dependency id="VirtoCommerce.Xapi" version="3.900.0" />