Merge branch 'release/3.806.0'

VirtoCommerce · Jul 18, 2024 · 619240e · 619240e
2 parents 3a2f5cf + 146c345
commit 619240e
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 23 deletions.
diff --git 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.806.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/module.ignore b/module.ignore
@@ -1,2 +1,27 @@
+AutoMapper.dll
+AutoMapper.Extensions.Microsoft.DependencyInjection.dll
+FluentAssertions.dll
+GraphQL.dll
+GraphQL.Authorization.dll
+GraphQL.DataLoader.dll
+GraphQL.NewtonsoftJson.dll
+GraphQL.Relay.dll
+GraphQL.Server.Core.dll
+GraphQL.Server.Transports.AspNetCore.dll
+GraphQL.Server.Transports.AspNetCore.NewtonsoftJson.dll
+GraphQL.Server.Transports.Subscriptions.Abstractions.dll
+GraphQL.Server.Transports.Subscriptions.WebSockets.dll
+GraphQL.SystemReactive.dll
+GraphQL-Parser.dll
+MediatR.dll
+MediatR.Extensions.Microsoft.DependencyInjection.dll
 Microsoft.Data.SqlClient.SNI.dll
 Nager.Country.dll
+PipelineNet.dll
+System.Reactive.Core.dll
+System.Reactive.dll
+System.Reactive.Linq.dll
+System.Reactive.xml
+TimeZoneConverter.dll
+VirtoCommerce.Tools.dll
+VirtoCommerce.Xapi.Core.dll
diff --git a/src/VirtoCommerce.Skyflow.Core/VirtoCommerce.Skyflow.Core.csproj b/src/VirtoCommerce.Skyflow.Core/VirtoCommerce.Skyflow.Core.csproj
@@ -10,6 +10,6 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.841.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.Skyflow.Data/VirtoCommerce.Skyflow.Data.csproj b/src/VirtoCommerce.Skyflow.Data/VirtoCommerce.Skyflow.Data.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <PackageReference Include="JWT" Version="10.1.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Skyflow.Core\VirtoCommerce.Skyflow.Core.csproj" />

diff --git a/src/VirtoCommerce.Skyflow.Web/Module.cs b/src/VirtoCommerce.Skyflow.Web/Module.cs
@@ -3,8 +3,8 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using VirtoCommerce.ExperienceApiModule.Core.Extensions;
-using VirtoCommerce.ExperienceApiModule.Core.Infrastructure;
+using VirtoCommerce.Xapi.Core.Extensions;
+using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.PaymentModule.Core.Services;
 using VirtoCommerce.Platform.Core.Modularity;
 using VirtoCommerce.Skyflow.Core;

diff --git a/src/VirtoCommerce.Skyflow.Web/VirtoCommerce.Skyflow.Web.csproj b/src/VirtoCommerce.Skyflow.Web/VirtoCommerce.Skyflow.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
@@ -7,9 +7,6 @@
     <!-- Project is not a test project -->
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="VirtoCommerce.ExperienceApiModule.Core" Version="3.800.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Skyflow.Core\VirtoCommerce.Skyflow.Core.csproj" />
     <ProjectReference Include="..\VirtoCommerce.Skyflow.Data\VirtoCommerce.Skyflow.Data.csproj" />

diff --git a/src/VirtoCommerce.Skyflow.Web/module.manifest b/src/VirtoCommerce.Skyflow.Web/module.manifest
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Skyflow</id>
-  <version>3.805.0</version>
+  <version>3.806.0</version>
   <version-tag></version-tag>
 
-  <platformVersion>3.800.0</platformVersion>
+  <platformVersion>3.841.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Payment" version="3.800.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.800.0" />
   </dependencies>
 
   <title>Skyflow</title>

diff --git a/src/VirtoCommerce.Skyflow.XApi/Commands/DeleteSkyflowCardCommand.cs b/src/VirtoCommerce.Skyflow.XApi/Commands/DeleteSkyflowCardCommand.cs
@@ -1,5 +1,5 @@
 using GraphQL.Types;
-using VirtoCommerce.ExperienceApiModule.Core.Infrastructure;
+using VirtoCommerce.Xapi.Core.Infrastructure;
 
 namespace VirtoCommerce.Skyflow.XApi.Commands;
 

diff --git a/src/VirtoCommerce.Skyflow.XApi/Commands/DeleteSkyflowCardCommandBuilder.cs b/src/VirtoCommerce.Skyflow.XApi/Commands/DeleteSkyflowCardCommandBuilder.cs
@@ -2,7 +2,7 @@
 using GraphQL.Types;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
-using VirtoCommerce.ExperienceApiModule.Core.BaseQueries;
+using VirtoCommerce.Xapi.Core.BaseQueries;
 
 namespace VirtoCommerce.Skyflow.XApi.Commands;
 

diff --git a/src/VirtoCommerce.Skyflow.XApi/Queries/SkyflowCardQuery.cs b/src/VirtoCommerce.Skyflow.XApi/Queries/SkyflowCardQuery.cs
@@ -1,7 +1,7 @@
 using GraphQL;
 using GraphQL.Types;
-using VirtoCommerce.ExperienceApiModule.Core.BaseQueries;
-using VirtoCommerce.ExperienceApiModule.Core.Extensions;
+using VirtoCommerce.Xapi.Core.BaseQueries;
+using VirtoCommerce.Xapi.Core.Extensions;
 
 namespace VirtoCommerce.Skyflow.XApi.Queries;
 

diff --git a/src/VirtoCommerce.Skyflow.XApi/Queries/SkyflowCardQueryBuilder.cs b/src/VirtoCommerce.Skyflow.XApi/Queries/SkyflowCardQueryBuilder.cs
@@ -1,6 +1,6 @@
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
-using VirtoCommerce.ExperienceApiModule.Core.BaseQueries;
+using VirtoCommerce.Xapi.Core.BaseQueries;
 using VirtoCommerce.Skyflow.XApi.Schemas;
 
 namespace VirtoCommerce.Skyflow.XApi.Queries;

diff --git a/src/VirtoCommerce.Skyflow.XApi/Queries/SkyflowCardQueryHandler.cs b/src/VirtoCommerce.Skyflow.XApi/Queries/SkyflowCardQueryHandler.cs
@@ -1,5 +1,7 @@
 using Microsoft.IdentityModel.Tokens;
-using VirtoCommerce.ExperienceApiModule.Core.Infrastructure;
+using VirtoCommerce.Xapi.Core.Infrastructure;
+using VirtoCommerce.PaymentModule.Core.Services;
+using VirtoCommerce.Platform.Core.Settings;
 using VirtoCommerce.Skyflow.Core.Services;
 
 namespace VirtoCommerce.Skyflow.XApi.Queries;

diff --git a/src/VirtoCommerce.Skyflow.XApi/Schemas/SkyflowCardResponseType.cs b/src/VirtoCommerce.Skyflow.XApi/Schemas/SkyflowCardResponseType.cs
@@ -1,5 +1,5 @@
 using GraphQL.Types;
-using VirtoCommerce.ExperienceApiModule.Core.Schemas;
+using VirtoCommerce.Xapi.Core.Schemas;
 using VirtoCommerce.Skyflow.XApi.Queries;
 
 namespace VirtoCommerce.Skyflow.XApi.Schemas;

diff --git a/src/VirtoCommerce.Skyflow.XApi/Schemas/SkyflowCardType.cs b/src/VirtoCommerce.Skyflow.XApi/Schemas/SkyflowCardType.cs
@@ -1,4 +1,4 @@
-using VirtoCommerce.ExperienceApiModule.Core.Schemas;
+using VirtoCommerce.Xapi.Core.Schemas;
 using VirtoCommerce.Skyflow.Core.Models;
 
 namespace VirtoCommerce.Skyflow.XApi.Schemas;

diff --git a/src/VirtoCommerce.Skyflow.XApi/VirtoCommerce.Skyflow.XApi.csproj b/src/VirtoCommerce.Skyflow.XApi/VirtoCommerce.Skyflow.XApi.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="VirtoCommerce.ExperienceApiModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Skyflow.Core\VirtoCommerce.Skyflow.Core.csproj" />

diff --git a/tests/VirtoCommerce.Skyflow.Tests/VirtoCommerce.Skyflow.Tests.csproj b/tests/VirtoCommerce.Skyflow.Tests/VirtoCommerce.Skyflow.Tests.csproj
@@ -8,7 +8,7 @@
     <SonarQubeTestProject>true</SonarQubeTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>