Skip to content

Commit ec67818

Browse files
vc-civc-ci
committed
Merge branch 'release/3.806.0'
2 parents 4580bf0 + 5f875f6 commit ec67818

File tree

15 files changed

+66
-55
lines changed

15 files changed

+66
-55
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ csharp_preserve_single_line_statements = false
102102
csharp_preserve_single_line_blocks = true
103103
csharp_using_directive_placement = outside_namespace:silent
104104
csharp_prefer_simple_using_statement = true:suggestion
105-
csharp_style_namespace_declarations = block_scoped:silent
105+
csharp_style_namespace_declarations = file_scoped:silent
106106
csharp_style_prefer_method_group_conversion = true:silent
107107
csharp_style_prefer_top_level_statements = true:silent
108108
csharp_style_expression_bodied_lambdas = true:silent

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Common settings
22

3-
.github/* @mvktsk @Vectorfield4
4-
.gitignore @mvktsk @Vectorfield4
5-
.dockerignore @mvktsk @Vectorfield4
3+
.github/* @VirtoCommerce/platform
4+
.gitignore @VirtoCommerce/platform
5+
.dockerignore @VirtoCommerce/platform
66

77
# Main Code and Tests
88

@@ -13,4 +13,4 @@ tests/* @VirtoCommerce/platform
1313
VirtoCommerce.Platform.sln @VirtoCommerce/platform
1414

1515
# Docs
16-
docs/* @zashchitnik-kuka
16+
docs/* @VirtoCommerce/platform

‎.github/workflows/module-ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.6
2-
# https://virtocommerce.atlassian.net/browse/VCST-915
1+
# v3.800.9
2+
# https://virtocommerce.atlassian.net/browse/VCST-1260
33
name: Module CI
44

55
on:
@@ -241,7 +241,7 @@ jobs:
241241
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
242242
(github.event_name == 'workflow_dispatch')}}
243243
needs: 'ci'
244-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.6
244+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.9
245245

246246
with:
247247
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
@@ -260,7 +260,7 @@ jobs:
260260
deploy-cloud:
261261
if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
262262
needs: ci
263-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.6
263+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.9
264264
with:
265265
releaseSource: module
266266
moduleId: ${{ needs.ci.outputs.moduleId }}

‎.github/workflows/module-release-hotfix.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.6
2-
# https://virtocommerce.atlassian.net/browse/VCST-915
1+
# v3.800.9
2+
# https://virtocommerce.atlassian.net/browse/VCST-1260
33
name: Release hotfix
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
4646
publish-github-release:
4747
needs:
4848
[build, test, get-metadata]
49-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6
49+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9
5050
with:
5151
fullKey: ${{ needs.build.outputs.packageFullKey }}
5252
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

‎.github/workflows/publish-nugets.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# v3.800.6
2-
# https://virtocommerce.atlassian.net/browse/VCST-915
1+
# v3.800.9
2+
# https://virtocommerce.atlassian.net/browse/VCST-1260
33
name: Publish nuget
44

55
on:
@@ -13,12 +13,12 @@ on:
1313

1414
jobs:
1515
test:
16-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.6
16+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.9
1717
secrets:
1818
sonarToken: ${{ secrets.SONAR_TOKEN }}
1919

2020
build:
21-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.6
21+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.9
2222
with:
2323
uploadPackage: 'true'
2424
uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
2929
publish-nuget:
3030
needs:
3131
[build, test]
32-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.6
32+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.9
3333
with:
3434
fullKey: ${{ needs.build.outputs.packageFullKey }}
3535
forceGithub: false

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# v3.800.6
2-
# https://virtocommerce.atlassian.net/browse/VCST-915
1+
# v3.800.9
2+
# https://virtocommerce.atlassian.net/browse/VCST-1260
33
name: Release
44

55
on:
66
workflow_dispatch:
77

88
jobs:
99
release:
10-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.6
10+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.9
1111
secrets:
1212
envPAT: ${{ secrets.REPO_TOKEN }}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<!-- These properties will be shared for all projects -->
44
<PropertyGroup>
5-
<VersionPrefix>3.805.0</VersionPrefix>
5+
<VersionPrefix>3.806.0</VersionPrefix>
66
<VersionSuffix></VersionSuffix>
77
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
88
</PropertyGroup>

‎src/VirtoCommerce.SubscriptionModule.Core/VirtoCommerce.SubscriptionModule.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
18-
<PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
19-
<PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.801.0" />
20-
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.825.0" />
18+
<PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
19+
<PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.830.0" />
20+
<PackageReference Include="VirtoCommerce.Platform.Core" Version="3.853.0" />
2121
</ItemGroup>
2222
</Project>

‎src/VirtoCommerce.SubscriptionModule.Data.MySql/VirtoCommerce.SubscriptionModule.Data.MySql.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
12-
<PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.825.0" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.853.0" />
1317
</ItemGroup>
1418
<ItemGroup>
1519
<ProjectReference Include="..\VirtoCommerce.SubscriptionModule.Data\VirtoCommerce.SubscriptionModule.Data.csproj" />

‎src/VirtoCommerce.SubscriptionModule.Data.PostgreSql/VirtoCommerce.SubscriptionModule.Data.PostgreSql.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
12-
<PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.825.0" />
12+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.853.0" />
1317
</ItemGroup>
1418
<ItemGroup>
1519
<ProjectReference Include="..\VirtoCommerce.SubscriptionModule.Data\VirtoCommerce.SubscriptionModule.Data.csproj" />

0 commit comments

Comments
 (0)