From b40b0c3f582dead879cbef0f834e3b7bc896d568 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Fri, 26 Apr 2024 09:50:38 +0000 Subject: [PATCH 1/3] 3.806.0 --- Directory.Build.props | 2 +- src/VirtoCommerce.NotificationsModule.Web/module.manifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f183eb8..9223f27 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.805.0 + 3.806.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.NotificationsModule.Web/module.manifest b/src/VirtoCommerce.NotificationsModule.Web/module.manifest index 03a8bb0..1dc00f3 100644 --- a/src/VirtoCommerce.NotificationsModule.Web/module.manifest +++ b/src/VirtoCommerce.NotificationsModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Notifications - 3.805.0 + 3.806.0 3.800.0 From 253829b9b3452e710458b2ca09046e99fb1700b2 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Wed, 1 May 2024 03:49:14 +0000 Subject: [PATCH 2/3] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 9 +++++---- .github/workflows/module-release-hotfix.yml | 11 ++++++----- .github/workflows/publish-nugets.yml | 10 +++++----- .github/workflows/release.yml | 6 +++--- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index f835ed5..1634061 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Module CI on: @@ -241,7 +241,8 @@ 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.800.5 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.6 + with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +260,7 @@ jobs: deploy-cloud: if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.6 with: releaseSource: module moduleId: ${{ needs.ci.outputs.moduleId }} diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml index c966578..9b1b8b4 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6 with: uploadPackage: 'true' uploadDocker: 'false' @@ -46,11 +46,12 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6 with: fullKey: ${{ needs.build.outputs.packageFullKey }} changeLog: '${{ needs.get-metadata.outputs.changeLog }}' incrementPatch: ${{ github.event.inputs.incrementPatch }} + makeLatest: 'false' secrets: envPAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml index c31a678..4b92b88 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6 with: uploadPackage: 'true' uploadDocker: 'false' @@ -29,7 +29,7 @@ jobs: publish-nuget: needs: [build, test] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b9ed86..e2f7f30 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.5 -# https://virtocommerce.atlassian.net/browse/VCST-571 +# v3.800.6 +# https://virtocommerce.atlassian.net/browse/VCST-915 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.5 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.6 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 70219de67fbaf727eeb766262b41e07760a3a72e Mon Sep 17 00:00:00 2001 From: artem-dudarev Date: Thu, 16 May 2024 09:55:50 +0200 Subject: [PATCH 3/3] Update platform --- .../VirtoCommerce.NotificationsSampleModule.Tests.csproj | 2 +- .../VirtoCommerce.NotificationsModule.Core.csproj | 2 +- .../VirtoCommerce.NotificationsModule.Data.MySql.csproj | 3 +-- ...rtoCommerce.NotificationsModule.Data.PostgreSql.csproj | 3 +-- ...irtoCommerce.NotificationsModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.NotificationsModule.Data.csproj | 4 ++-- src/VirtoCommerce.NotificationsModule.Web/Module.cs | 8 +++----- src/VirtoCommerce.NotificationsModule.Web/module.manifest | 2 +- .../VirtoCommerce.NotificationsModule.Tests.csproj | 2 +- 9 files changed, 12 insertions(+), 16 deletions(-) diff --git a/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj b/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj index 2d83bc0..c0727d7 100644 --- a/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj +++ b/samples/VirtoCommerce.NotificationsSampleModule.Tests/VirtoCommerce.NotificationsSampleModule.Tests.csproj @@ -4,7 +4,7 @@ false - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj b/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj index cf073fb..cc7de40 100644 --- a/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj +++ b/src/VirtoCommerce.NotificationsModule.Core/VirtoCommerce.NotificationsModule.Core.csproj @@ -11,6 +11,6 @@ - + diff --git a/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj b/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj index 9de5531..8b085e1 100644 --- a/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data.MySql/VirtoCommerce.NotificationsModule.Data.MySql.csproj @@ -3,14 +3,13 @@ net8.0 enable enable - NU5104 all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj b/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj index 09b4d56..85cf8d0 100644 --- a/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data.PostgreSql/VirtoCommerce.NotificationsModule.Data.PostgreSql.csproj @@ -9,8 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj b/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj index d696278..a1c4eba 100644 --- a/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data.SqlServer/VirtoCommerce.NotificationsModule.Data.SqlServer.csproj @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj b/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj index 4974509..6c5dfa1 100644 --- a/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj +++ b/src/VirtoCommerce.NotificationsModule.Data/VirtoCommerce.NotificationsModule.Data.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/VirtoCommerce.NotificationsModule.Web/Module.cs b/src/VirtoCommerce.NotificationsModule.Web/Module.cs index fba0712..813eae3 100644 --- a/src/VirtoCommerce.NotificationsModule.Web/Module.cs +++ b/src/VirtoCommerce.NotificationsModule.Web/Module.cs @@ -27,8 +27,8 @@ using VirtoCommerce.NotificationsModule.Smtp; using VirtoCommerce.NotificationsModule.TemplateLoader.FileSystem; using VirtoCommerce.NotificationsModule.Twilio; -using VirtoCommerce.Platform.Core.Bus; using VirtoCommerce.Platform.Core.Common; +using VirtoCommerce.Platform.Core.Events; using VirtoCommerce.Platform.Core.ExportImport; using VirtoCommerce.Platform.Core.JsonConverters; using VirtoCommerce.Platform.Core.Modularity; @@ -48,7 +48,7 @@ public class Module : IModule, IExportSupport, IImportSupport, IHasConfiguration public void Initialize(IServiceCollection serviceCollection) { - serviceCollection.AddDbContext((provider, options) => + serviceCollection.AddDbContext(options => { var databaseProvider = Configuration.GetValue("DatabaseProvider", "SqlServer"); var connectionString = Configuration.GetConnectionString(ModuleInfo.Id) ?? Configuration.GetConnectionString("VirtoCommerce"); @@ -169,9 +169,7 @@ public void PostInitialize(IApplicationBuilder appBuilder) notificationDbContext.Database.Migrate(); } - var handlerRegistrar = appBuilder.ApplicationServices.GetService(); - handlerRegistrar.RegisterHandler((message, _) => appBuilder.ApplicationServices.GetService().Handle(message)); - + appBuilder.RegisterEventHandler(); var defaultTemplatesDirectory = Path.Combine(ModuleInfo.FullPhysicalPath, "NotificationTemplates"); var registrar = appBuilder.ApplicationServices.GetService(); diff --git a/src/VirtoCommerce.NotificationsModule.Web/module.manifest b/src/VirtoCommerce.NotificationsModule.Web/module.manifest index 1dc00f3..37c0163 100644 --- a/src/VirtoCommerce.NotificationsModule.Web/module.manifest +++ b/src/VirtoCommerce.NotificationsModule.Web/module.manifest @@ -3,7 +3,7 @@ VirtoCommerce.Notifications 3.806.0 - 3.800.0 + 3.825.0 diff --git a/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj b/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj index dce2819..db799af 100644 --- a/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj +++ b/tests/VirtoCommerce.NotificationsModule.Tests/VirtoCommerce.NotificationsModule.Tests.csproj @@ -4,7 +4,7 @@ 1591 - + runtime; build; native; contentfiles; analyzers; buildtransitive all