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 f9421a3..22e3547 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 1634061..d52007c 100644 --- a/.github/workflows/module-ci.yml +++ b/.github/workflows/module-ci.yml @@ -1,5 +1,5 @@ -# v3.800.6 -# https://virtocommerce.atlassian.net/browse/VCST-915 +# v3.800.9 +# https://virtocommerce.atlassian.net/browse/VCST-1260 name: Module CI on: @@ -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.6 + uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9 with: katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon' @@ -260,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.6 + 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 42ed2a1..75b3c0a 100644 --- a/.github/workflows/module-release-hotfix.yml +++ b/.github/workflows/module-release-hotfix.yml @@ -1,5 +1,5 @@ -# v3.800.6 -# https://virtocommerce.atlassian.net/browse/VCST-915 +# 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.6 + 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.6 + uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9 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.6 + uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9 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 c683367..cf3023d 100644 --- a/.github/workflows/publish-nugets.yml +++ b/.github/workflows/publish-nugets.yml @@ -1,5 +1,5 @@ -# v3.800.6 -# https://virtocommerce.atlassian.net/browse/VCST-915 +# 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.6 + 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.6 + 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.6 + 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 ee43ae2..2234fc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,5 @@ -# v3.800.6 -# https://virtocommerce.atlassian.net/browse/VCST-915 +# 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.6 + 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 346fc89..2204046 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 3.804.0 + 3.805.0 $(VersionSuffix)-$(BuildNumber) diff --git a/src/VirtoCommerce.InventoryModule.Core/VirtoCommerce.InventoryModule.Core.csproj b/src/VirtoCommerce.InventoryModule.Core/VirtoCommerce.InventoryModule.Core.csproj index be82450..a288a9f 100644 --- a/src/VirtoCommerce.InventoryModule.Core/VirtoCommerce.InventoryModule.Core.csproj +++ b/src/VirtoCommerce.InventoryModule.Core/VirtoCommerce.InventoryModule.Core.csproj @@ -15,8 +15,8 @@ - - - + + + \ No newline at end of file diff --git a/src/VirtoCommerce.InventoryModule.Data.MySql/VirtoCommerce.InventoryModule.Data.MySql.csproj b/src/VirtoCommerce.InventoryModule.Data.MySql/VirtoCommerce.InventoryModule.Data.MySql.csproj index 6210bab..d028252 100644 --- a/src/VirtoCommerce.InventoryModule.Data.MySql/VirtoCommerce.InventoryModule.Data.MySql.csproj +++ b/src/VirtoCommerce.InventoryModule.Data.MySql/VirtoCommerce.InventoryModule.Data.MySql.csproj @@ -5,11 +5,15 @@ enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/VirtoCommerce.InventoryModule.Data.PostgreSql/VirtoCommerce.InventoryModule.Data.PostgreSql.csproj b/src/VirtoCommerce.InventoryModule.Data.PostgreSql/VirtoCommerce.InventoryModule.Data.PostgreSql.csproj index 5f9ad5d..c465870 100644 --- a/src/VirtoCommerce.InventoryModule.Data.PostgreSql/VirtoCommerce.InventoryModule.Data.PostgreSql.csproj +++ b/src/VirtoCommerce.InventoryModule.Data.PostgreSql/VirtoCommerce.InventoryModule.Data.PostgreSql.csproj @@ -5,11 +5,15 @@ enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/VirtoCommerce.InventoryModule.Data.SqlServer/VirtoCommerce.InventoryModule.Data.SqlServer.csproj b/src/VirtoCommerce.InventoryModule.Data.SqlServer/VirtoCommerce.InventoryModule.Data.SqlServer.csproj index 39f4c55..f9225c4 100644 --- a/src/VirtoCommerce.InventoryModule.Data.SqlServer/VirtoCommerce.InventoryModule.Data.SqlServer.csproj +++ b/src/VirtoCommerce.InventoryModule.Data.SqlServer/VirtoCommerce.InventoryModule.Data.SqlServer.csproj @@ -5,11 +5,15 @@ enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/VirtoCommerce.InventoryModule.Data/VirtoCommerce.InventoryModule.Data.csproj b/src/VirtoCommerce.InventoryModule.Data/VirtoCommerce.InventoryModule.Data.csproj index 344ded5..54e5c45 100644 --- a/src/VirtoCommerce.InventoryModule.Data/VirtoCommerce.InventoryModule.Data.csproj +++ b/src/VirtoCommerce.InventoryModule.Data/VirtoCommerce.InventoryModule.Data.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/VirtoCommerce.InventoryModule.Web/module.manifest b/src/VirtoCommerce.InventoryModule.Web/module.manifest index 24a968d..ae2ebae 100644 --- a/src/VirtoCommerce.InventoryModule.Web/module.manifest +++ b/src/VirtoCommerce.InventoryModule.Web/module.manifest @@ -1,13 +1,13 @@ VirtoCommerce.Inventory - 3.804.0 + 3.805.0 - 3.825.0 + 3.853.0 - - - + + + Inventory Simplify inventory management functionality @@ -17,7 +17,7 @@ Virto Commerce - https://virtocommerce.com/apps/extensions/virto-inventory-module + https://github.com/VirtoCommerce/vc-module-inventory Modules/$(VirtoCommerce.Inventory)/Content/logo.png false Copyright © 2011-2024 Virto Commerce. All rights reserved diff --git a/tests/VirtoCommerce.InventoryModule.Tests/VirtoCommerce.InventoryModule.Tests.csproj b/tests/VirtoCommerce.InventoryModule.Tests/VirtoCommerce.InventoryModule.Tests.csproj index 9201dee..f1020c9 100644 --- a/tests/VirtoCommerce.InventoryModule.Tests/VirtoCommerce.InventoryModule.Tests.csproj +++ b/tests/VirtoCommerce.InventoryModule.Tests/VirtoCommerce.InventoryModule.Tests.csproj @@ -10,18 +10,18 @@ all - - - - - + + + + + - - + + all runtime; build; native; contentfiles; analyzers - + all runtime; build; native; contentfiles; analyzers