Merge branch 'dev' into IBB2B-588

VirtoCommerce · Jan 31, 2024 · eaa692d · eaa692d
2 parents e93c9f5 + e2ec82f
commit eaa692d
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 69 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.800.0
 name: Module CI
 
 on:
@@ -202,18 +202,6 @@ jobs:
         with:
           packageUrl: ${{ steps.artifactUrl.outputs.download_url }}
 
-      - name: Update virtocommerce.com
-        if: ${{ github.ref == 'refs/heads/master' }}
-        uses: VirtoCommerce/vc-github-actions/update-virtocommercecom@master
-        with:
-          githubToken: ${{ secrets.REPO_TOKEN }}
-          login: ${{ secrets.VIRTOCOMMERCE_APP_ID }}
-          password: ${{ secrets.VIRTOCOMMERCE_SECRET }}
-          moduleId: ${{ steps.artifact_ver.outputs.moduleId }}
-          moduleDescription: ${{ steps.artifact_ver.outputs.moduleDescription }}
-          projectUrl: ${{ steps.artifact_ver.outputs.projectUrl }}
-          iconUrl: ${{ steps.artifact_ver.outputs.iconUrl }}
-
       - name: Parse Jira Keys from All Commits
         uses: VirtoCommerce/vc-github-actions/get-jira-keys@master
         if: always()
@@ -252,7 +240,7 @@ jobs:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
         (github.event_name == 'workflow_dispatch')}}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.0
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
       katalonRepoBranch: 'dev'
@@ -272,7 +260,7 @@ jobs:
         (github.ref == 'refs/heads/dev')) && 
         github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.0
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.800.0
 name: Release hotfix
 
 on:
@@ -12,12 +12,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.0
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.0
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -45,7 +45,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.0
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml
@@ -1,4 +1,4 @@
-# v3.200.35
+# v3.800.0
 name: Publish nuget
 
 on:
@@ -12,12 +12,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.0
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.0
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -28,7 +28,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.0
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,11 +1,11 @@
-# v3.200.35
+# v3.800.0
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.35
+    uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.0
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,11 +2,11 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.403.0</VersionPrefix>
+    <VersionPrefix>3.801.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.SitemapsModule.Core/VirtoCommerce.SitemapsModule.Core.csproj b/src/VirtoCommerce.SitemapsModule.Core/VirtoCommerce.SitemapsModule.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>true</IsPackable>
     <noWarn>1591</noWarn>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -9,8 +9,8 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
   </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.SitemapsModule.Data.MySql/VirtoCommerce.SitemapsModule.Data.MySql.csproj b/src/VirtoCommerce.SitemapsModule.Data.MySql/VirtoCommerce.SitemapsModule.Data.MySql.csproj
@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <noWarn>NU5104</noWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.SitemapsModule.Data\VirtoCommerce.SitemapsModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...mmerce.SitemapsModule.Data.PostgreSql/VirtoCommerce.SitemapsModule.Data.PostgreSql.csproj b/...mmerce.SitemapsModule.Data.PostgreSql/VirtoCommerce.SitemapsModule.Data.PostgreSql.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="6.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
+    <PackageReference Include="Npgsql" Version="8.0.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.SitemapsModule.Data\VirtoCommerce.SitemapsModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...Commerce.SitemapsModule.Data.SqlServer/VirtoCommerce.SitemapsModule.Data.SqlServer.csproj b/...Commerce.SitemapsModule.Data.SqlServer/VirtoCommerce.SitemapsModule.Data.SqlServer.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.SitemapsModule.Data\VirtoCommerce.SitemapsModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/VirtoCommerce.SitemapsModule.Data/Repositories/SitemapDbContext.cs b/src/VirtoCommerce.SitemapsModule.Data/Repositories/SitemapDbContext.cs
@@ -2,10 +2,11 @@
 using EntityFrameworkCore.Triggers;
 using Microsoft.EntityFrameworkCore;
 using VirtoCommerce.SitemapsModule.Data.Models;
+using VirtoCommerce.Platform.Data.Infrastructure;
 
 namespace VirtoCommerce.SitemapsModule.Data.Repositories
 {
-    public class SitemapDbContext : DbContextWithTriggers
+    public class SitemapDbContext : DbContextBase
     {
         public SitemapDbContext(DbContextOptions<SitemapDbContext> options)
             : base(options)

diff --git a/src/VirtoCommerce.SitemapsModule.Data/VirtoCommerce.SitemapsModule.Data.csproj b/src/VirtoCommerce.SitemapsModule.Data/VirtoCommerce.SitemapsModule.Data.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>true</IsPackable>
     <noWarn>1591</noWarn>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -9,13 +9,13 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.408.0" />
-    <PackageReference Include="VirtoCommerce.ContentModule.Core" Version="3.407.0" />
-    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.405.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.414.0" />
-    <PackageReference Include="VirtoCommerce.Tools" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.AssetsModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.ContentModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Tools" Version="3.800.0" />
     <PackageReference Include="YamlDotNet" Version="5.2.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/VirtoCommerce.SitemapsModule.Web/VirtoCommerce.SitemapsModule.Web.csproj b/src/VirtoCommerce.SitemapsModule.Web/VirtoCommerce.SitemapsModule.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <noWarn>1591</noWarn>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -15,7 +15,7 @@
     <None Remove="node_modules\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.414.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.800.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.SitemapsModule.Core\VirtoCommerce.SitemapsModule.Core.csproj" />

diff --git a/src/VirtoCommerce.SitemapsModule.Web/module.manifest b/src/VirtoCommerce.SitemapsModule.Web/module.manifest
@@ -1,17 +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.Sitemaps</id>
-  <version>3.403.0</version>
+  <version>3.801.0</version>
   <version-tag />
-  <platformVersion>3.414.0</platformVersion>
+
+  <platformVersion>3.800.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Assets" version="3.400.0" />
-    <dependency id="VirtoCommerce.Catalog" version="3.408.0" />
-    <dependency id="VirtoCommerce.Content" version="3.407.0" />
-    <dependency id="VirtoCommerce.Core" version="3.400.0" />
-    <dependency id="VirtoCommerce.Customer" version="3.405.0" />
-    <dependency id="VirtoCommerce.Store" version="3.401.0" />
+    <dependency id="VirtoCommerce.Assets" version="3.800.0" />
+    <dependency id="VirtoCommerce.Catalog" version="3.800.0" />
+    <dependency id="VirtoCommerce.Content" version="3.800.0" />
+    <dependency id="VirtoCommerce.Core" version="3.800.0" />
+    <dependency id="VirtoCommerce.Customer" version="3.800.0" />
+    <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>
+
   <title>Sitemap Generator</title>
   <description>Simplifies the process of generating sitemaps for online stores</description>
   <authors>
@@ -24,7 +26,7 @@
   <iconUrl>Modules/$(VirtoCommerce.Sitemaps)/Content/logo.png</iconUrl>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2011-2023 Virto Commerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>sitemaps</tags>
   <assemblyFile>VirtoCommerce.SitemapsModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.SitemapsModule.Web.Module, VirtoCommerce.SitemapsModule.Web</moduleType>

diff --git a/tests/VirtoCommerce.SitemapsModule.Tests/VirtoCommerce.SitemapsModule.Tests.csproj b/tests/VirtoCommerce.SitemapsModule.Tests/VirtoCommerce.SitemapsModule.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <noWarn>1591</noWarn>
   </PropertyGroup>
@@ -13,10 +13,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.SitemapsModule.Core\VirtoCommerce.SitemapsModule.Core.csproj" />