diff --git a/.editorconfig b/.editorconfig index 52a5b14..d467f1b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -102,7 +102,7 @@ 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_namespace_declarations = file_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 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8b003de..a675a49 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,8 +1,8 @@ # Common settings -.github/* @mvktsk @Vectorfield4 -.gitignore @mvktsk @Vectorfield4 -.dockerignore @mvktsk @Vectorfield4 +.github/* @VirtoCommerce/platform +.gitignore @VirtoCommerce/platform +.dockerignore @VirtoCommerce/platform # Main Code and Tests @@ -13,4 +13,4 @@ tests/* @VirtoCommerce/platform VirtoCommerce.Platform.sln @VirtoCommerce/platform # Docs -docs/* @zashchitnik-kuka +docs/* @VirtoCommerce/platform diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml index c798dd1..d52007c 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.9 +# https://virtocommerce.atlassian.net/browse/VCST-1260 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,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.4 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9 + with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' katalonRepoBranch: 'dev' @@ -257,11 +258,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.9 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 3b77412..967db97 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.9 +# https://virtocommerce.atlassian.net/browse/VCST-1260 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.9 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.9 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.4 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9 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 f84ef4b..655f9ba 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.9 +# https://virtocommerce.atlassian.net/browse/VCST-1260 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.9 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.9 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.9 with: fullKey: ${{ needs.build.outputs.packageFullKey }} forceGithub: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0216cc..cb4030e 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.9 +# https://virtocommerce.atlassian.net/browse/VCST-1260 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.9 secrets: envPAT: ${{ secrets.REPO_TOKEN }} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 4d4d530..6f0f7ba 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 4.801.0 + 4.802.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj b/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj index a411eb5..a3dfec8 100644 --- a/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj +++ b/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core/VirtoCommerce.GoogleEcommerceAnalyticsModule.Core.csproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.csproj b/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.csproj index 080cf8c..59e8c07 100644 --- a/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.csproj +++ b/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data/VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/module.manifest b/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/module.manifest index f0e4994..297aeb0 100644 --- a/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/module.manifest +++ b/src/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/module.manifest @@ -1,14 +1,14 @@ VirtoCommerce.GoogleEcommerceAnalytics - 4.801.0 + 4.802.0 - - 3.813.0 + + 3.853.0 - + - + Google Analytics @@ -25,7 +25,7 @@ Virto Commerce - https://virtocommerce.com/apps/extensions/google-ecommerce-analytics-module + https://github.com/VirtoCommerce/vc-module-google-ecommerce-analytics Modules/$(VirtoCommerce.GoogleEcommerceAnalytics)/Content/logo.png false First version. diff --git a/tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests.csproj b/tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests.csproj index 13b9e8b..99cf757 100644 --- a/tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests.csproj +++ b/tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests.csproj @@ -4,14 +4,14 @@ false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + +