From 164b93f56bee3d08f26830e467745a972647a2ad Mon Sep 17 00:00:00 2001 From: vc-ci Date: Mon, 13 Mar 2023 08:31:29 +0000 Subject: [PATCH 01/12] 3.212.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 ab996597..ad210189 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 3.211.0 + 3.212.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest index e4eae103..a15a8944 100644 --- a/src/VirtoCommerce.CoreModule.Web/module.manifest +++ b/src/VirtoCommerce.CoreModule.Web/module.manifest @@ -1,7 +1,7 @@  VirtoCommerce.Core - 3.211.0 + 3.212.0 3.286.0 Commerce core module From 8d1a33f85aa796d5e0d4244f04bf5d2bdf2b3392 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 28 Mar 2023 08:47:28 +0000 Subject: [PATCH 02/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 14 +++++++------- .github/workflows/module-release-hotfix.yml | 8 ++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index cc9fc4c3..1ac3c808 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.24 +# v3.200.26 name: Module CI on: @@ -154,9 +154,9 @@ jobs: id: artifactUrl run: | if [ '${{ github.ref }}' = 'refs/heads/master' ]; then - echo ::set-output name=download_url::${{ steps.githubRelease.outputs.downloadUrl }} + echo "artifactUrl=${{ steps.githubRelease.outputs.downloadUrl }}" >> $GITHUB_OUTPUT else - echo ::set-output name=download_url::${{ steps.blobRelease.outputs.packageUrl }} + echo "artifactUrl=${{ steps.blobRelease.outputs.packageUrl }}" >> $GITHUB_OUTPUT fi; - name: Create deployment matrix @@ -172,9 +172,9 @@ jobs: run: | if [[ "${{ github.event.head_commit.message }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - echo "::set-output name=result::false" + echo "name=result::false" >> $GITHUB_OUTPUT else - echo "::set-output name=result::true" + echo "name=result::true" >> $GITHUB_OUTPUT fi - name: Setup Git Credentials @@ -239,7 +239,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.24 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.26 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.26 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 f8ec1a67..33c14301 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.24 +# v3.200.26 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.26 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.26 with: uploadPackage: 'true' uploadDocker: 'false' @@ -43,7 +43,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.26 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 ab5587d3..18f16a36 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.24 +# v3.200.26 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.26 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.26 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.24 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.26 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5dd3f79b..3049ba98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.24 +# v3.200.26 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.24 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.26 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From b04795548b1260cf55dd7f0ee895bd73eba5ee9e Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 28 Mar 2023 10:58:17 +0000 Subject: [PATCH 03/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 1ac3c808..e4bfa4b6 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -172,9 +172,9 @@ jobs: run: | if [[ "${{ github.event.head_commit.message }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - echo "name=result::false" >> $GITHUB_OUTPUT + echo "result=false" >> $GITHUB_OUTPUT else - echo "name=result::true" >> $GITHUB_OUTPUT + echo "result=true" >> $GITHUB_OUTPUT fi - name: Setup Git Credentials From 86c74ac8a88264049931ab62290a2a702ef93eda Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 28 Mar 2023 11:20:54 +0000 Subject: [PATCH 04/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index e4bfa4b6..96351aa6 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -154,9 +154,9 @@ jobs: id: artifactUrl run: | if [ '${{ github.ref }}' = 'refs/heads/master' ]; then - echo "artifactUrl=${{ steps.githubRelease.outputs.downloadUrl }}" >> $GITHUB_OUTPUT + echo "download_url=${{ steps.githubRelease.outputs.downloadUrl }}" >> $GITHUB_OUTPUT else - echo "artifactUrl=${{ steps.blobRelease.outputs.packageUrl }}" >> $GITHUB_OUTPUT + echo "download_url=${{ steps.blobRelease.outputs.packageUrl }}" >> $GITHUB_OUTPUT fi; - name: Create deployment matrix From 90020c2369c99ded245c3ee50c63f96e086e7ed9 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Thu, 30 Mar 2023 13:17:50 +0000 Subject: [PATCH 05/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 8 ++++---- .github/workflows/module-release-hotfix.yml | 8 ++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 96351aa6..95308d3a 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.26 +# v3.200.27 name: Module CI on: @@ -57,7 +57,7 @@ jobs: steps: - name: Set up Node 18 - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: '18' @@ -239,7 +239,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.26 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.27 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.27 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 33c14301..7c250b18 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.26 +# v3.200.27 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 with: uploadPackage: 'true' uploadDocker: 'false' @@ -43,7 +43,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.27 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 18f16a36..c996768d 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.26 +# v3.200.27 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 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.26 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.27 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3049ba98..c1b234c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.26 +# v3.200.27 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.26 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.27 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From dba8fcabafa35098bb97a0acef7714c14a074b09 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 16 May 2023 06:53:10 +0000 Subject: [PATCH 06/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 6 +++--- .github/workflows/module-release-hotfix.yml | 8 ++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 95308d3a..7c909c5d 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Module CI on: @@ -239,7 +239,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.27 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.28 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.28 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 7c250b18..4c3d44e2 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 with: uploadPackage: 'true' uploadDocker: 'false' @@ -43,7 +43,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.28 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 c996768d..05e0dbd7 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 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.27 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.28 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1b234c7..f11d2482 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.28 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 8f50987064209ebc4cf7663bf8563b9b76121113 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 16 May 2023 07:11:53 +0000 Subject: [PATCH 07/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 6 +++--- .github/workflows/module-release-hotfix.yml | 8 ++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 7c909c5d..95308d3a 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.27 name: Module CI on: @@ -239,7 +239,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.28 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.27 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.27 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 4c3d44e2..7c250b18 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.27 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 with: uploadPackage: 'true' uploadDocker: 'false' @@ -43,7 +43,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.27 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 05e0dbd7..c996768d 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.27 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 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.28 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.27 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f11d2482..c1b234c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.27 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.27 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From eb462929b5786866170d034fad902c2e6f2403cc Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 16 May 2023 08:06:09 +0000 Subject: [PATCH 08/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 6 +++--- .github/workflows/module-release-hotfix.yml | 8 ++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 95308d3a..7c909c5d 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Module CI on: @@ -239,7 +239,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.27 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.28 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.28 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 7c250b18..4c3d44e2 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 with: uploadPackage: 'true' uploadDocker: 'false' @@ -43,7 +43,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.28 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 c996768d..05e0dbd7 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 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.27 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.28 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1b234c7..f11d2482 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.27 +# v3.200.28 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.27 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.28 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 17ebfa4c7098800ec4cc153c09d178a6346507a3 Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 16 May 2023 09:29:27 +0000 Subject: [PATCH 09/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 6 +++--- .github/workflows/module-release-hotfix.yml | 8 ++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index 7c909c5d..dc5364c5 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.29 name: Module CI on: @@ -239,7 +239,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.28 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.29 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.29 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 4c3d44e2..54f2683b 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.29 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.29 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.29 with: uploadPackage: 'true' uploadDocker: 'false' @@ -43,7 +43,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.29 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 05e0dbd7..86951813 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.29 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.29 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.29 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.28 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.29 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f11d2482..be2cd506 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.28 +# v3.200.29 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.28 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.29 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From 32a4100b0979a8efded35e39b9d92a44163023bb Mon Sep 17 00:00:00 2001 From: vc-ci Date: Tue, 6 Jun 2023 13:29:48 +0000 Subject: [PATCH 10/12] ci: Auto update Github Action workflows --- .github/workflows/module-ci.yml | 6 +++--- .github/workflows/module-release-hotfix.yml | 10 ++++++---- .github/workflows/publish-nugets.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index dc5364c5..c48db7a8 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,4 +1,4 @@ -# v3.200.29 +# v3.200.30 name: Module CI on: @@ -239,7 +239,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.29 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.30 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -259,7 +259,7 @@ jobs: (github.ref == 'refs/heads/dev')) && github.event_name == 'push' }} needs: ci - uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.30 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 54f2683b..7b95ce13 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,4 +1,4 @@ -# v3.200.29 +# v3.200.30 name: Release hotfix on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.30 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.30 with: uploadPackage: 'true' uploadDocker: 'false' @@ -28,6 +28,8 @@ jobs: get-metadata: runs-on: ubuntu-20.04 + env: + GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} outputs: changelog: ${{ steps.changelog.outputs.changelog }} steps: @@ -43,7 +45,7 @@ jobs: publish-github-release: needs: [build, test, get-metadata] - uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.30 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 86951813..fe559383 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,4 +1,4 @@ -# v3.200.29 +# v3.200.30 name: Publish nuget on: @@ -12,12 +12,12 @@ on: jobs: test: - uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.30 secrets: sonarToken: ${{ secrets.SONAR_TOKEN }} build: - uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.30 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.29 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.30 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index be2cd506..1d96b557 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# v3.200.29 +# v3.200.30 name: Release on: @@ -6,6 +6,6 @@ on: jobs: release: - uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.29 + uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.30 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file From d767567e386a3b5d3e26dcdbdc753c4fc2153e6c Mon Sep 17 00:00:00 2001 From: artem-dudarev Date: Wed, 19 Jul 2023 16:01:28 +0300 Subject: [PATCH 11/12] 3.400.0 --- Directory.Build.props | 2 +- src/VirtoCommerce.CoreModule.Web/module.manifest | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ad210189..debf9300 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 3.212.0 + 3.400.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest index a15a8944..a55163ef 100644 --- a/src/VirtoCommerce.CoreModule.Web/module.manifest +++ b/src/VirtoCommerce.CoreModule.Web/module.manifest @@ -1,7 +1,7 @@ - + VirtoCommerce.Core - 3.212.0 + 3.400.0 3.286.0 Commerce core module @@ -26,4 +26,4 @@ commerce false - \ No newline at end of file + From 011ab0218118d11ba2b6b92c33fc122c8912cb72 Mon Sep 17 00:00:00 2001 From: artem-dudarev Date: Wed, 19 Jul 2023 16:17:03 +0300 Subject: [PATCH 12/12] Update dependencies --- .editorconfig | 115 ++++++++++++++++-- Directory.Build.props | 6 +- VirtoCommerce.CoreModule.sln.DotSettings | 4 + .../VirtoCommerce.CoreModule.Core.csproj | 35 +++--- ...VirtoCommerce.CoreModule.Data.MySql.csproj | 20 +-- ...Commerce.CoreModule.Data.PostgreSql.csproj | 36 +++--- ...oCommerce.CoreModule.Data.SqlServer.csproj | 32 +++-- .../VirtoCommerce.CoreModule.Data.csproj | 42 +++---- src/VirtoCommerce.CoreModule.Web/Module.cs | 17 ++- .../VirtoCommerce.CoreModule.Web.csproj | 9 -- .../module.manifest | 2 +- .../VirtoCommerce.Tools.csproj | 22 ++-- 12 files changed, 206 insertions(+), 134 deletions(-) create mode 100644 VirtoCommerce.CoreModule.sln.DotSettings diff --git a/.editorconfig b/.editorconfig index 56d238d4..52a5b14d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,12 +3,24 @@ root = true [*] charset = utf-8 indent_style = space -indent_size = 4 +indent_size = 2 end_of_line = crlf trim_trailing_whitespace = true insert_final_newline = true -# Dotnet code style settings: +# Project files +[*.{csproj,props}] +insert_final_newline = false + +# HTML files +[*.{html,htm}] +insert_final_newline = false + +# Code +[*.{cs,js,ts,ps1,sh,bat,cmd}] +indent_size = 4 + +# Dotnet code style settings [*.{cs,vb}] # Sort using and Import directives with System.* appearing first @@ -24,16 +36,24 @@ dotnet_style_qualification_for_event = false:suggestion dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion dotnet_style_predefined_type_for_member_access = true:suggestion +# Use explicit accessibility modifiers +dotnet_style_require_accessibility_modifiers = true:suggestion + # Suggest more modern language features when available dotnet_style_object_initializer = true:suggestion dotnet_style_collection_initializer = true:suggestion dotnet_style_coalesce_expression = true:suggestion dotnet_style_null_propagation = true:suggestion dotnet_style_explicit_tuple_names = true:suggestion +dotnet_prefer_inferred_tuple_names = true:suggestion +dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion -# CSharp code style settings: +# CSharp code style settings [*.cs] +# Prefer curly braces even for one line of code +csharp_prefer_braces = true:suggestion + # Prefer "var" everywhere csharp_style_var_for_built_in_types = true:suggestion csharp_style_var_when_type_is_apparent = true:suggestion @@ -55,6 +75,9 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion csharp_style_inlined_variable_declaration = true:suggestion csharp_style_throw_expression = true:suggestion csharp_style_conditional_delegate_call = true:suggestion +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion # Newline settings csharp_new_line_before_open_brace = all @@ -63,12 +86,84 @@ csharp_new_line_before_catch = true csharp_new_line_before_finally = true csharp_new_line_before_members_in_object_initializers = true csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_between_query_expression_clauses = true -#JSON code style settings -[*.json] -indent_style = space -indent_size = 2 +csharp_indent_case_contents = true +csharp_indent_switch_labels = true +csharp_indent_labels = flush_left + +csharp_space_after_cast = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_parentheses = false + +csharp_preserve_single_line_statements = false +csharp_preserve_single_line_blocks = true +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_style_namespace_declarations = block_scoped:silent +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent + +[*.{cs,vb}] +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case -#HTML code style settings -[*.html] -insert_final_newline = false \ No newline at end of file +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_style_operator_placement_when_wrapping = beginning_of_line +tab_width = 4 +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_simplified_interpolation = true:suggestion +dotnet_style_namespace_match_folder = true:suggestion diff --git a/Directory.Build.props b/Directory.Build.props index debf9300..d8f0a949 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,5 @@ - + + 3.400.0 @@ -6,4 +7,7 @@ $(VersionSuffix)-$(BuildNumber) + + true + diff --git a/VirtoCommerce.CoreModule.sln.DotSettings b/VirtoCommerce.CoreModule.sln.DotSettings new file mode 100644 index 00000000..f0f57862 --- /dev/null +++ b/VirtoCommerce.CoreModule.sln.DotSettings @@ -0,0 +1,4 @@ + + True + True + diff --git a/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj b/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj index ae431cfe..982f3e3a 100644 --- a/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj +++ b/src/VirtoCommerce.CoreModule.Core/VirtoCommerce.CoreModule.Core.csproj @@ -1,21 +1,18 @@ - - Common the e-commerce domain functionality - net6.0 - true - 1591 - True - true - true - true - snupkg - - - 1701;1702;1705;1591 - - - - - - + + Common the e-commerce domain functionality + net6.0 + true + 1591 + True + true + true + true + snupkg + + + + + + \ 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 5c14011c..660b8183 100644 --- a/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj +++ b/src/VirtoCommerce.CoreModule.Data.MySql/VirtoCommerce.CoreModule.Data.MySql.csproj @@ -1,25 +1,17 @@ - net6.0 enable enable - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + 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 e1f295a5..4339dfb0 100644 --- a/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/VirtoCommerce.CoreModule.Data.PostgreSql.csproj @@ -1,22 +1,18 @@ - - - net6.0 - enable - enable - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + net6.0 + enable + enable + + + + 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 0a2d755f..092a4151 100644 --- a/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.CoreModule.Data.SqlServer/VirtoCommerce.CoreModule.Data.SqlServer.csproj @@ -1,19 +1,17 @@ - - - net6.0 - enable - enable - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + net6.0 + enable + enable + + + + 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 75269434..da7bb239 100644 --- a/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj +++ b/src/VirtoCommerce.CoreModule.Data/VirtoCommerce.CoreModule.Data.csproj @@ -1,25 +1,21 @@ - - net6.0 - 1591 - Common the e-commerce domain functionality - True - true - true - true - snupkg - - - - - - - - - - - - - - + + net6.0 + 1591 + Common the e-commerce domain functionality + True + true + true + true + snupkg + + + + + + + + + + \ No newline at end of file diff --git a/src/VirtoCommerce.CoreModule.Web/Module.cs b/src/VirtoCommerce.CoreModule.Web/Module.cs index 1864dc28..d14e0088 100644 --- a/src/VirtoCommerce.CoreModule.Web/Module.cs +++ b/src/VirtoCommerce.CoreModule.Web/Module.cs @@ -1,9 +1,9 @@ using System; using System.IO; -using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; @@ -14,10 +14,13 @@ using VirtoCommerce.CoreModule.Core.Package; using VirtoCommerce.CoreModule.Core.Seo; using VirtoCommerce.CoreModule.Data.Currency; +using VirtoCommerce.CoreModule.Data.MySql; using VirtoCommerce.CoreModule.Data.Package; +using VirtoCommerce.CoreModule.Data.PostgreSql; using VirtoCommerce.CoreModule.Data.Repositories; using VirtoCommerce.CoreModule.Data.Seo; using VirtoCommerce.CoreModule.Data.Services; +using VirtoCommerce.CoreModule.Data.SqlServer; using VirtoCommerce.CoreModule.Web.ExportImport; using VirtoCommerce.Platform.Core.Common; using VirtoCommerce.Platform.Core.ExportImport; @@ -25,17 +28,14 @@ using VirtoCommerce.Platform.Core.Security; using VirtoCommerce.Platform.Core.Settings; using VirtoCommerce.Platform.Data.Extensions; -using VirtoCommerce.CoreModule.Data.PostgreSql; -using VirtoCommerce.CoreModule.Data.MySql; -using VirtoCommerce.CoreModule.Data.SqlServer; -using Microsoft.EntityFrameworkCore; namespace VirtoCommerce.CoreModule.Web { public class Module : IModule, IExportSupport, IImportSupport, IHasConfiguration { - public ManifestModuleInfo ModuleInfo { get; set; } private IApplicationBuilder _appBuilder; + + public ManifestModuleInfo ModuleInfo { get; set; } public IConfiguration Configuration { get; set; } public void Initialize(IServiceCollection serviceCollection) @@ -80,8 +80,8 @@ public void PostInitialize(IApplicationBuilder appBuilder) var settingsRegistrar = appBuilder.ApplicationServices.GetRequiredService(); settingsRegistrar.RegisterSettings(ModuleConstants.Settings.AllSettings, ModuleInfo.Id); - var permissionsProvider = appBuilder.ApplicationServices.GetRequiredService(); - permissionsProvider.RegisterPermissions(ModuleConstants.Security.Permissions.AllPermissions.Select(x => new Permission { GroupName = "Core", Name = x }).ToArray()); + var permissionsRegistrar = appBuilder.ApplicationServices.GetRequiredService(); + permissionsRegistrar.RegisterPermissions(ModuleInfo.Id, "Core", ModuleConstants.Security.Permissions.AllPermissions); var mvcJsonOptions = appBuilder.ApplicationServices.GetService>(); mvcJsonOptions.Value.SerializerSettings.Converters.Add(new ConditionJsonConverter()); @@ -115,4 +115,3 @@ public async Task ImportAsync(Stream inputStream, ExportImportOptions options, A } } } - diff --git a/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj b/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj index f4d97345..ed900d8c 100644 --- a/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj +++ b/src/VirtoCommerce.CoreModule.Web/VirtoCommerce.CoreModule.Web.csproj @@ -7,9 +7,6 @@ 1591 Library - - 1701;1702;1705;1591 - @@ -22,12 +19,6 @@ - - - - - - diff --git a/src/VirtoCommerce.CoreModule.Web/module.manifest b/src/VirtoCommerce.CoreModule.Web/module.manifest index a55163ef..b0d032f2 100644 --- a/src/VirtoCommerce.CoreModule.Web/module.manifest +++ b/src/VirtoCommerce.CoreModule.Web/module.manifest @@ -3,7 +3,7 @@ VirtoCommerce.Core 3.400.0 - 3.286.0 + 3.400.0 Commerce core module Common e-commerce domain functionality diff --git a/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj b/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj index c0ac2f01..765885fb 100644 --- a/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj +++ b/src/VirtoCommerce.Tools/VirtoCommerce.Tools.csproj @@ -1,13 +1,13 @@ - - net6.0 - 1591 - true - true - true - snupkg - - - - + + net6.0 + 1591 + true + true + true + snupkg + + + + \ No newline at end of file