Merge branch 'release/3.812.0'

VirtoCommerce · Oct 1, 2024 · 208786f · 208786f
2 parents 022139a + 6cdb60e
commit 208786f
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 50 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,8 +1,8 @@
 # Common settings
 
-.github/* @mvktsk @Vectorfield4
-.gitignore @mvktsk @Vectorfield4
-.dockerignore @mvktsk @Vectorfield4
+.github/* @VirtoCommerce/platform
+.gitignore @VirtoCommerce/platform
+.dockerignore @VirtoCommerce/platform
 
 # Main Code and Tests
 
@@ -13,4 +13,4 @@ tests/* @VirtoCommerce/platform
 VirtoCommerce.Platform.sln  @VirtoCommerce/platform
 
 # Docs
-docs/* @zashchitnik-kuka
+docs/* @VirtoCommerce/platform
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.811.0</VersionPrefix>
+    <VersionPrefix>3.812.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj b/src/VirtoCommerce.MarketingModule.Core/VirtoCommerce.MarketingModule.Core.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.802.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.851.0" />
+    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.853.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.MarketingModule.Data.MySql/VirtoCommerce.MarketingModule.Data.MySql.csproj b/src/VirtoCommerce.MarketingModule.Data.MySql/VirtoCommerce.MarketingModule.Data.MySql.csproj
@@ -9,7 +9,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.851.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.853.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.MarketingModule.Data\VirtoCommerce.MarketingModule.Data.csproj" />

diff --git a/...erce.MarketingModule.Data.PostgreSql/VirtoCommerce.MarketingModule.Data.PostgreSql.csproj b/...erce.MarketingModule.Data.PostgreSql/VirtoCommerce.MarketingModule.Data.PostgreSql.csproj
@@ -10,7 +10,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.851.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.853.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.MarketingModule.Data\VirtoCommerce.MarketingModule.Data.csproj" />

diff --git a/...mmerce.MarketingModule.Data.SqlServer/VirtoCommerce.MarketingModule.Data.SqlServer.csproj b/...mmerce.MarketingModule.Data.SqlServer/VirtoCommerce.MarketingModule.Data.SqlServer.csproj
@@ -9,7 +9,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.851.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.853.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.MarketingModule.Data\VirtoCommerce.MarketingModule.Data.csproj" />

diff --git a/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj b/src/VirtoCommerce.MarketingModule.Data/VirtoCommerce.MarketingModule.Data.csproj
@@ -11,12 +11,12 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.851.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.851.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.851.0" />
+    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.830.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.853.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj b/src/VirtoCommerce.MarketingModule.Web/VirtoCommerce.MarketingModule.Web.csproj
@@ -15,7 +15,7 @@
     <None Remove="node_modules\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.808.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/src/VirtoCommerce.MarketingModule.Web/module.manifest b/src/VirtoCommerce.MarketingModule.Web/module.manifest
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Marketing</id>
-  <version>3.811.0</version>
+  <version>3.812.0</version>
   <version-tag />
 
-  <platformVersion>3.851.0</platformVersion>
+  <platformVersion>3.853.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Assets" version="3.800.0" />
-    <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
-    <dependency id="VirtoCommerce.Core" version="3.800.0" />
-    <dependency id="VirtoCommerce.Customer" version="3.800.0" />
-    <dependency id="VirtoCommerce.Orders" version="3.800.0" />
-    <dependency id="VirtoCommerce.Payment" version="3.800.0" />
-    <dependency id="VirtoCommerce.Shipping" version="3.800.0" />
-    <dependency id="VirtoCommerce.Store" version="3.800.0" />
+    <dependency id="VirtoCommerce.Assets" version="3.808.0" />
+    <dependency id="VirtoCommerce.Catalog" version="3.822.0" />
+    <dependency id="VirtoCommerce.Core" version="3.808.0" />
+    <dependency id="VirtoCommerce.Customer" version="3.817.0" />
+    <dependency id="VirtoCommerce.Orders" version="3.830.0" />
+    <dependency id="VirtoCommerce.Payment" version="3.804.0" />
+    <dependency id="VirtoCommerce.Shipping" version="3.802.0" />
+    <dependency id="VirtoCommerce.Store" version="3.809.0" />
   </dependencies>
 
   <title>Marketing</title>
@@ -25,7 +25,7 @@
   <owners>
     <owner>Virto Commerce</owner>
   </owners>
-  <projectUrl>https://virtocommerce.com/apps/extensions/virto-marketing-module</projectUrl>
+  <projectUrl>https://github.com/VirtoCommerce/vc-module-marketing</projectUrl>
   <iconUrl>Modules/$(VirtoCommerce.Marketing)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
   <releaseNotes>Third version.</releaseNotes>

diff --git a/...dule.Benchmark.IsSatisfiedBy/VirtoCommerce.MarketingModule.Benchmark.IsSatisfiedBy.csproj b/...dule.Benchmark.IsSatisfiedBy/VirtoCommerce.MarketingModule.Benchmark.IsSatisfiedBy.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/....Benchmark.PromoConditions/VirtoCommerce.MarketingModule.Benchmark.PromoConditions.csproj b/....Benchmark.PromoConditions/VirtoCommerce.MarketingModule.Benchmark.PromoConditions.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/...dule.Benchmark.PromoPolicies/VirtoCommerce.MarketingModule.Benchmark.PromoPolicies.csproj b/...dule.Benchmark.PromoPolicies/VirtoCommerce.MarketingModule.Benchmark.PromoPolicies.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
-    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.MarketingModule.Core\VirtoCommerce.MarketingModule.Core.csproj" />

diff --git a/tests/VirtoCommerce.MarketingModule.Test/VirtoCommerce.MarketingModule.Test.csproj b/tests/VirtoCommerce.MarketingModule.Test/VirtoCommerce.MarketingModule.Test.csproj
@@ -8,16 +8,16 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="VirtoCommerce.Testing" Version="3.851.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.console" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+    <PackageReference Include="VirtoCommerce.Testing" Version="3.853.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.console" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/VirtoCommerce.MarketingModule.Test/VirtoCommerce.MarketingModule.Tests.csproj b/tests/VirtoCommerce.MarketingModule.Test/VirtoCommerce.MarketingModule.Tests.csproj
@@ -4,16 +4,16 @@
     <noWarn>1591</noWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="VirtoCommerce.Testing" Version="3.825.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.console" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+    <PackageReference Include="VirtoCommerce.Testing" Version="3.853.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.console" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>