From 5ad5e113d4aa0b70699a1a7a1f7b17d347de55ad Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 5 Mar 2024 13:14:52 +0000 Subject: [PATCH 1/4] 3.806.0 --- Directory.Build.props | 2 +- src/VirtoCommerce.CoreModule.Web/module.manifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 22040461..d7980b9f 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.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest index e75de8d3..0dd9a5a4 100644 --- a/src/VirtoCommerce.CoreModule.Web/module.manifest +++ b/src/VirtoCommerce.CoreModule.Web/module.manifest @@ -1,7 +1,7 @@ VirtoCommerce.Core - 3.805.0 + 3.806.0 3.800.0 Commerce core module From cafcaeb10776151b860b90a0ff5f215843d0fab8 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Thu, 25 Apr 2024 03:39:02 +0000 Subject: [PATCH 2/4] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 34 ++++++++++----------- .github/workflows/module-release-hotfix.yml | 10 +++--- .github/workflows/publish-nugets.yml | 10 +++--- .github/workflows/release.yml | 6 ++-- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index c798dd14..f835ed5a 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Module CI on: @@ -15,10 +15,10 @@ on: - '**/cloudDeploy.json' - samples/** branches: - [master, dev] + [master, main, dev] pull_request: branches: - [master, dev] + [master, main, dev] paths-ignore: - 'docs/**' - 'build/**' @@ -69,7 +69,7 @@ jobs: java-version: '17' - name: Set RELEASE_STATUS - if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }} + if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && github.event_name == 'push' }} run: | echo "RELEASE_STATUS=true" >> $GITHUB_ENV @@ -99,7 +99,7 @@ jobs: echo "VERSION_SUFFIX=${{ steps.artifact_ver.outputs.suffix }}" >> $GITHUB_ENV fi; - name: Add version suffix - if: ${{ github.ref != 'refs/heads/master' }} + if: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/add-version-suffix@master with: versionSuffix: ${{ env.VERSION_SUFFIX }} @@ -128,11 +128,11 @@ jobs: run: vc-build Compress -skip Clean+Restore+Compile+Test - name: Publish Nuget - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/publish-nuget@master - name: Publish to Blob - if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') }} + if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/main') }} id: blobRelease uses: VirtoCommerce/vc-github-actions/publish-blob-release@master with: @@ -157,7 +157,7 @@ jobs: downloadComment: 'Artifact URL:' - name: Publish Github Release - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} id: githubRelease with: changelog: ${{ steps.changelog.outputs.changelog }} @@ -167,14 +167,14 @@ jobs: - name: Set artifactUrl value id: artifactUrl run: | - if [ '${{ github.ref }}' = 'refs/heads/master' ]; then + if [ '${{ github.ref }}' = 'refs/heads/master' ] || [ '${{ github.ref }}' = 'refs/heads/main' ]; then echo "download_url=${{ steps.githubRelease.outputs.downloadUrl }}" >> $GITHUB_OUTPUT else echo "download_url=${{ steps.blobRelease.outputs.packageUrl }}" >> $GITHUB_OUTPUT fi; - name: Create deployment matrix - if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'}} + if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/cloud-create-deploy-matrix@master id: deployment-matrix with: @@ -192,13 +192,13 @@ jobs: fi - name: Setup Git Credentials - if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }} + if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/setup-git-credentials-github@master with: githubToken: ${{ secrets.REPO_TOKEN }} - name: Publish Manifest - if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' }} + if: ${{ (github.ref == 'refs/heads/dev' && github.event_name != 'workflow_dispatch') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} uses: VirtoCommerce/vc-github-actions/publish-manifest@master with: packageUrl: ${{ steps.artifactUrl.outputs.download_url }} @@ -241,7 +241,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.800.4 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.5 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -257,11 +257,9 @@ jobs: katalonApiKey: ${{ secrets.KATALON_API_KEY }} deploy-cloud: - if: ${{ ((github.ref == 'refs/heads/master') || - (github.ref == 'refs/heads/dev')) && - github.event_name == 'push' }} + 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.4 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.5 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 b8ac0707..641c1e40 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Release hotfix on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 with: uploadPackage: 'true' uploadDocker: 'false' @@ -46,7 +46,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 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 index 76dffa45..830ccdbe 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Publish nuget on: @@ -13,12 +13,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.5 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.5 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.4 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.5 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 036f4c50..ff627dc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.4 -# https://virtocommerce.atlassian.net/browse/VCST-488 +# v3.800.5 +# https://virtocommerce.atlassian.net/browse/VCST-571 name: Release on: @@ -7,6 +7,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.4 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.5 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 51d0a586d48d7542165f21c18cace2f849a2da94 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Wed, 1 May 2024 03:48:54 +0000 Subject: [PATCH 3/4] 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 f835ed5a..16340610 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 641c1e40..42ed2a10 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 830ccdbe..c6833673 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 ff627dc7..ee43ae23 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 82c9fb4db3f136928b4a766330017f893baa3f5f Mon Sep 17 00:00:00 2001 From: artem-dudarev Date: Thu, 16 May 2024 00:28:56 +0200 Subject: [PATCH 4/4] Update platform --- .../VirtoCommerce.CoreModule.Core.csproj | 2 +- .../VirtoCommerce.CoreModule.Data.MySql.csproj | 3 +-- .../VirtoCommerce.CoreModule.Data.PostgreSql.csproj | 3 +-- .../VirtoCommerce.CoreModule.Data.SqlServer.csproj | 2 +- .../VirtoCommerce.CoreModule.Data.csproj | 2 +- src/VirtoCommerce.CoreModule.Web/module.manifest | 2 +- .../VirtoCommerce.CoreModule.Tests.csproj | 2 +- .../VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj b/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj index 3582409d..a0235e31 100644 --- a/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj +++ b/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj b/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj index cc052507..c0247c54 100644 --- a/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj +++ b/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj @@ -3,14 +3,13 @@ net8.0 enable enable - NU5104 all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj b/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj index 7e6c1d58..37426f4d 100644 --- a/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj @@ -9,8 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + diff --git a/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj b/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj index 8347ebce..6b2f31a8 100644 --- a/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj b/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj index 11fbc8a2..05a48a58 100644 --- a/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj +++ b/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest index 0dd9a5a4..a194de69 100644 --- a/src/VirtoCommerce.CoreModule.Web/module.manifest +++ b/src/VirtoCommerce.CoreModule.Web/module.manifest @@ -3,7 +3,7 @@ VirtoCommerce.Core 3.806.0 - 3.800.0 + 3.825.0 Commerce core module Common e-commerce domain functionality diff --git a/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj b/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj index cb04207c..a21b70a2 100644 --- a/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj +++ b/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj @@ -4,7 +4,7 @@ 1591 - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj b/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj index d85bb7fd..910ffc28 100644 --- a/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj +++ b/tests/VirtoCommerce.Tools.Tests/VirtoCommerce.Tools.Tests.csproj @@ -4,7 +4,7 @@ 1591 - + runtime; build; native; contentfiles; analyzers; buildtransitive all