Skip to content

Commit fce61cb

Browse files
ksavosteevksavosteev
authored
Merge branch 'dev' into feat/VCST-114
2 parents 23dde14 + d7e9dda commit fce61cb

29 files changed

+825
-186
lines changed

‎.github/workflows/platform-ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# v3.200.35
1+
# v3.800.0
22
name: Platform CI
33

44
on:
@@ -166,7 +166,7 @@ jobs:
166166

167167
- name: Swagger validation
168168
uses: VirtoCommerce/vc-github-actions/docker-env@master
169-
if: ${{ github.ref == 'refs/heads/dev-turnoff' }}
169+
if: ${{ github.ref == 'refs/heads/dev' }}
170170
with:
171171
githubUser: ${{ env.GITHUB_ACTOR }}
172172
githubToken: ${{ env.GITHUB_TOKEN }}
@@ -285,7 +285,7 @@ jobs:
285285
needs: 'ci'
286286
if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
287287
(github.event_name == 'workflow_dispatch')}}
288-
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.200.35
288+
uses: VirtoCommerce/.github/.github/workflows/e2e.yml@v3.800.0
289289
with:
290290
katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
291291
katalonRepoBranch: 'dev'
@@ -304,7 +304,7 @@ jobs:
304304
(github.ref == 'refs/heads/dev')) &&
305305
github.event_name == 'push' }}
306306
needs: ci
307-
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.200.35
307+
uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@v3.800.0
308308
with:
309309
releaseSource: platform
310310
platformVer: ${{ needs.ci.outputs.version }}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# v3.200.35
1+
# v3.800.0
22
name: Release hotfix
33

44
on:
@@ -12,12 +12,12 @@ on:
1212

1313
jobs:
1414
test:
15-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35
15+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.0
1616
secrets:
1717
sonarToken: ${{ secrets.SONAR_TOKEN }}
1818

1919
build:
20-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35
20+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.0
2121
with:
2222
uploadPackage: 'true'
2323
uploadDocker: 'true'
@@ -46,7 +46,7 @@ jobs:
4646
publish-docker:
4747
needs:
4848
[build, get-metadata]
49-
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.200.35
49+
uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.0
5050
with:
5151
fullKey: ${{ needs.build.outputs.dockerFullKey }}
5252
shortKey: '${{ needs.build.outputs.dockerShortKey }}-'
@@ -60,7 +60,7 @@ jobs:
6060
publish-github-release:
6161
needs:
6262
[build, test, get-metadata]
63-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35
63+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.0
6464
with:
6565
fullKey: ${{ needs.build.outputs.packageFullKey }}
6666
changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

‎.github/workflows/publish-nugets.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# v3.200.35
1+
# v3.800.0
22
name: Publish nuget
33

44
on:
@@ -12,12 +12,12 @@ on:
1212

1313
jobs:
1414
test:
15-
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.200.35
15+
uses: VirtoCommerce/.github/.github/workflows/test-and-sonar.yml@v3.800.0
1616
secrets:
1717
sonarToken: ${{ secrets.SONAR_TOKEN }}
1818

1919
build:
20-
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.200.35
20+
uses: VirtoCommerce/.github/.github/workflows/build.yml@v3.800.0
2121
with:
2222
uploadPackage: 'true'
2323
uploadDocker: 'false'
@@ -28,7 +28,7 @@ jobs:
2828
publish-nuget:
2929
needs:
3030
[build, test]
31-
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.200.35
31+
uses: VirtoCommerce/.github/.github/workflows/publish-github.yml@v3.800.0
3232
with:
3333
fullKey: ${{ needs.build.outputs.packageFullKey }}
3434
forceGithub: false

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# v3.200.35
1+
# v3.800.0
22
name: Release
33

44
on:
55
workflow_dispatch:
66

77
jobs:
88
release:
9-
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.200.35
9+
uses: VirtoCommerce/.github/.github/workflows/release.yml@v3.800.0
1010
secrets:
1111
envPAT: ${{ secrets.REPO_TOKEN }}

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<PropertyGroup>
12-
<VersionPrefix>3.801.0</VersionPrefix>
12+
<VersionPrefix>3.805.0</VersionPrefix>
1313
<VersionSuffix></VersionSuffix>
1414
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
1515
<NoWarn>$(NoWarn);S3875;S4457</NoWarn>

‎DockerCompose/ModulesDevelop/Platform.Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ RUN apt-get update && apt-get install -y openssh-server dos2unix
88
COPY wait-for-it.sh /wait-for-it.sh
99
RUN dos2unix /wait-for-it.sh && chmod +x /wait-for-it.sh
1010

11+
EXPOSE 80
12+
ENV ASPNETCORE_HTTP_PORTS=80
1113
ENTRYPOINT ["dotnet", "VirtoCommerce.Platform.Web.dll"]

‎docs/developer-guide/create-new-module.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ The command calls the template engine to create the artifacts on disk based on t
3737
| --Author (or -A) | Your name | string | Optional| John Doe |
3838
| --CompanyName (or -C) | Your company name| string | Optional | VirtoCommerce |
3939
| --ModuleName (or -M) | Your module name | string | Optional | newModule |
40-
| --PlatformVersion (or -P) | Required Platform Version | string | Optional | 3.84.0 |
41-
| --PlatformNuGetPackageVersion (or -Pl) | Required Platform NuGet Package Version | string | Optional | 3.84.0 |
40+
| --PlatformVersion (or -P) | Required Platform Version | string | Optional | 3.800.0 |
41+
| --PlatformNuGetPackageVersion (or -Pl) | Required Platform NuGet Package Version | string | Optional | 3.800.0 |
4242

4343
## Build
4444
Virto Commerce CLI should be used to build, test and create a module package.
@@ -71,4 +71,3 @@ If the module is installed properly, you should see the new module in the list o
7171
* [Essential modularity](../fundamentals/essential-modularity.md)
7272
* [Virto Commerce CLI](https://docs.virtocommerce.org/CLI-tools/introduction/)
7373
* [Virto Commerce Module Template on GitHub](https://github.com/VirtoCommerce/vc-cli-module-template)
74-
* [VC-Build problem on .NET 5.0 and .NET 6.0](https://www.virtocommerce.org/t/vc-build-problem-on-net-5-and-net6/276)

‎docs/getting-started/deploy-from-precompiled-binaries-windows.md

+20-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Use this guide to <a class="crosslink" href="https://virtocommerce.com/ecommerce
33

44
## Prerequisites
55

6-
* [Prerequisites for .NET 6.0 on Windows](https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#dependencies)
7-
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
6+
* [Prerequisites for .NET 8.0 on Windows](https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net80#dependencies)
7+
* [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)
88
* [Microsoft SQL Server](https://www.microsoft.com/en-us/sql-server/sql-server-downloads)
99

1010
> Please switch SQL server authentication to mixed mode
@@ -36,7 +36,7 @@ vc-build install
3636
```
3737
Also you can specify the platform version:
3838
```console
39-
vc-build install -platform -version 3.240.0
39+
vc-build install -platform -version 3.800.0
4040
```
4141
Check out [vc-build for packages management](https://github.com/VirtoCommerce/vc-build/blob/main/docs/CLI-tools/package-management.md) for more info.
4242

@@ -78,8 +78,17 @@ dotnet.exe VirtoCommerce.Platform.Web.dll
7878
The output in the console will say something like:
7979

8080
```console
81-
Now listening on: http://localhost:5000
82-
Now listening on: https://localhost:5001
81+
[19:38:43] Virto Commerce is loading OK
82+
[19:38:45] Getting server certificate OK
83+
[19:38:47] Initializing module catalog OK
84+
[19:39:40] Loading modules OK
85+
[19:39:40] Registering API controllers OK
86+
[19:39:46] Post initializing modules
87+
[19:39:51 INF] Welcome to Virto Commerce 3.800.0.0!
88+
[19:39:51 INF] Now listening on: http://localhost:5000
89+
[19:39:52 INF] Application started. Press Ctrl+C to shut down.
90+
[19:39:52 INF] Hosting environment: Production
91+
...
8392
```
8493

8594
### Run on HTTP schema
@@ -92,6 +101,12 @@ Now listening on: https://localhost:5001
92101

93102
### First Run
94103

104+
The default HTTPS address and port have been removed from Kestrel in .NET 7. Users must now manually bind to HTTPS and specify the address and port explicitly, [through one of the following means](https://learn.microsoft.com/en-us/dotnet/core/compatibility/aspnet-core/7.0/https-binding-kestrel).
105+
106+
```console
107+
dotnet VirtoCommerce.Platform.Web.dll --urls=https://localhost:5000
108+
```
109+
95110
* Open `https://localhost:5001` url in your browser. "Your connection is not private" might appear. Click "Advanced" and "Proceed to ...".
96111
Read more on removing this error and using a self-signed certificate: [Trust the ASP.NET Core HTTPS development certificate](https://www.hanselman.com/blog/DevelopingLocallyWithASPNETCoreUnderHTTPSSSLAndSelfSignedCerts.aspx)
97112
* The application will create and initialize database on the first request. After that you should see the sign in page. Use the following credentials:

‎docs/getting-started/email-sending-settings.md

+13-30
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,40 @@ Virto Commerce allows to send email notifications. To use this functionality the
33

44
## How to configure email notifications
55

6-
### Gmail.com
6+
### Smtp
77
If use **_gmail.com_** then need to do:
88

99
1. Turn on `Allow less secure apps` here: https://www.google.com/settings/security/lesssecureapps
1010
1. Set Gateway is `Smtp` in **_Notifications_** options in **_Appsettings.json_** or **_Notifications:Gateway_** in **_Azure_**
1111
1. Then customize **_Smtp options_**:
1212
1. Fill **_SmtpServer_** `smtp.gmail.com` and **_Port_** `587`
13-
2. Turn `ON` SSL: **_EnableSsl_** set **_true_**
14-
3. Set **_Login_** and **_Password_**
13+
2. Set **_Login_** and **_Password_**
1514
* like this in **_appsttings.json_**:
1615
```json
16+
"Gateway": "Smtp",
17+
"DefaultSender": "[email protected]",
1718
"Smtp": {
18-
"SmtpServer": "smtp.gmail.com",
19-
"Port": 587,
20-
"EnableSsl": true,
21-
"Login": "[email protected]",
22-
"Password": "qwerty"
19+
"SmtpServer": "smtp.gmail.com",
20+
"Port": 587,
21+
"Login": "[email protected]",
22+
"Password": "**** **** **** ****",
23+
"ForceSslTls": false
2324
}
2425
```
2526
* or in **_Azure_**:
2627
* **_Notifications:Smtp:SmtpServer_** set `smtp.gmail.com`
2728
* **_Notifications:Smtp:Port_** set `587`
2829
* **_Notifications:Smtp:EnableSsl_** set `true`
29-
* **_Notifications:Smtp:Login_** set `[email protected]`
30-
* **_Notifications:Smtp:Password_** set `qwerty`
31-
32-
### Sendgrid SMTP
33-
If use another SMTP server like **_sendgrid.net_** then need to do:
34-
35-
1. Set Gateway is `Smtp` in **_Notifications_** options in **_Appsettings.json_** or **_Notifications:Gateway_** in **_Azure_**
36-
3. Then customize **_Smtp options_**:
37-
1. Fill SmtpServer `smtp.gmail.com` and Port `587`
38-
2. Turn `OFF` SSL: **_EnableSsl_** set **_false_**
39-
> NOTE: should read prerequiments in the SMTP server site and read the [article](https://docs.microsoft.com/en-us/dotnet/api/system.net.mail.smtpclient.enablessl?view=netcore-3.0)
40-
3. Set **_Login_** and **_Password_**
41-
like this in **_appsttings.json_**:
42-
```json
43-
"Smtp": {
44-
"SmtpServer": "smtp.sendgrid.net",
45-
"Port": 25,
46-
"EnableSsl": false,
47-
"Login": "[email protected]",
48-
"Password": "qwerty"
49-
}
50-
```
30+
* **_Notifications:Smtp:Login_** set `[email protected]`
31+
* **_Notifications:Smtp:Password_** set `**** **** **** ****`
5132

5233
### SendGrid's API
5334
1. Set Gateway is `SendGrid` **_Notifications_** options in **_Appsettings.json_** or **_Azure_**
5435
2. Then fill apikey in **_SendGrid options_**
5536
* looks like this in **_appsetting.json_**:
5637
```json
38+
"Gateway": "Smtp",
39+
"DefaultSender": "[email protected]",
5740
"SendGrid": {
5841
"ApiKey": "testapikey"
5942
}

‎docs/getting-started/lessons/lesson1.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Lesson 1 - How to deploy and configure Virto Commerce
33
description: Lesson 1 - How to deploy and configure Virto Commerce
44
layout: docs
5-
date: 2023-03-23
5+
date: 2024-01-12
66
priority: 1
77
---
88
## Summary
@@ -16,8 +16,8 @@ Use this guide to [deploy](https://virtocommerce.com/ecommerce-hosting) and conf
1616
## Prerequisites
1717

1818
* [Microsoft SQL Server 2019 or later](https://www.microsoft.com/en-us/sql-server/) with SQL Management Studio(free MS SQL Express would be enough)
19-
* [Prerequisites for .NET 6 on Windows](https://learn.microsoft.com/en-us/dotnet/core/install/windows)
20-
* [.NET 6 Runtime](https://dotnet.microsoft.com/download/dotnet/6.0/runtime)
19+
* [Prerequisites for .NET 8 on Windows](https://learn.microsoft.com/en-us/dotnet/core/install/windows)
20+
* [.NET 8 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0/runtime)
2121

2222
## Initial configuration of Virto Commerce Platform (backend)
2323

‎docs/index.md

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
# Overview
22

3-
Virto Commerce is an open-source platform for extensible e-commerce applications.
3+
Virto Commerce is an Open-Source B2B Innovation Platform.
44

55
Complex digital commerce solutions for B2B, B2C or B2B2C businesses, marketplaces and derived SaaS commerce platforms.
66

77
Virto Commerce architecture was designed on principles: Microservices, API-first, Cloud-native, Headless, and Advanced Extensibility.
88

99
## News Digests
10+
!!! done "Virto Commerce .NET8 Released"
11+
Virto Commerce on NET 8 (3.800+) introduces a significant technical update by transitioning the platform to .NET8.
12+
This update focuses on enhancing performance and stability while maintaining backward compatibility.
13+
It involves updating the Target Framework to .NET 8 and integrating the latest LTS releases of third-party libraries.
14+
Importantly, no code refactoring or alterations to the API and internal structure have been made.
15+
We published stable 7 release on NET 6 and stable 8 on NET8 at same time.
16+
17+
[Continue reading ...](https://docs.virtocommerce.org/release-information/update-to-version-3-800/update-platform-and-modules-to-3-800/)
18+
19+
1020
!!! done "January"
1121
* Redesigned Storefront UI
1222
* Updated xApi and other modules
@@ -126,10 +136,12 @@ The module can use a lot of out-of-the-box additional services from Virto Commer
126136
1. **Log/Monitoring** - The module has native integration with Azure Application Insights service, as Native monitoring tool for .NET Core applications.
127137

128138
## Scalability
139+
129140
In the cloud, the Virto Commerce Applications can be easily scaled to support peak demand and long-term business growth.
130141
With auto-scale, you no longer have to worry about scaling services manually.
131142

132143
## Extensibility
144+
133145
Unlimited extensibility is an indisputable advantage of Virto Commerce. This means end-user solution developers can adapt or replace Virto Commerce modules with their own functionality. This adaptation can be done in an elegant and simple way without workarounds.
134146

135147
Three types of vendor-made extensions guarantee “seamless delivery”. Virto Commerce guarantees that these ways of extensibility are sufficient to build an ecommerce solution of any complexity on top of it.
@@ -157,8 +169,8 @@ In our work, we always try to use advanced technologies. Our decision to choose
157169

158170
Virto Commerce uses the following stack of technologies:
159171

160-
* .NET 6
161-
* ASP.NET Core 6
172+
* .NET 8
173+
* ASP.NET Core 8
162174
* Entity Framework Core as primary ORM
163175
* ASP.NET Core Identity for authentication and authorization
164176
* OpenIddict for OAuth authorization
@@ -169,9 +181,12 @@ Virto Commerce uses the following stack of technologies:
169181
and more
170182

171183
## Supported Databases
184+
172185
Virto Commerce is built with DB agnostic architecture and supports the following databases:
173186

174187
* Microsoft SQL Server 2019 or above
175188
* MySql Server 8 or above
176189
* PostgreSQL 12 or above
190+
* Redis 7
191+
* Node.JS 20.11.0 LTS
177192

‎docs/media/updatenet8-step1-run-ps1-script.png

26.3 KB
Loading

‎docs/media/updatenet8-step2-ps1-script-result.png

96.3 KB
Loading

‎docs/media/updatenet8-step3-modified-files.png

35.5 KB
Loading

‎docs/media/updatenet8-step4-build.png

38.8 KB
Loading

‎docs/products/products-virto3-versions.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Click the hyperlink with the version name to see what versions of modules are in
33

44
| Product | Version | GA (Mainstream Support Phase) | End of support (Extended Support Phase) | End of life (Sustaining Support Phase) |
55
|--------- |--------- |---- | ------- | ---- |
6+
|Virto Commerce platform core pack |[v3-2024-S8](v3-2024-S8.md) |2024-01-01|2024-07-01 |2024-10-01 |
7+
|Virto Commerce platform integration pack|[v3-2024-S8](v3-2024-S8.md) |2024-01-01|2024-07-01 |2024-10-01 |
8+
|Virto Commerce platform enterprise pack|[v3-2024-S8](v3-2024-S8.md) |2024-01-01|2024-07-01 |2024-10-01 |
9+
|Virto Commerce platform core pack |[v3-2024-S7](v3-2024-S7.md) |2024-01-01|2024-07-01 |2024-10-01 |
10+
|Virto Commerce platform integration pack|[v3-2024-S7](v3-2024-S7.md) |2024-01-01|2024-07-01 |2024-10-01 |
11+
|Virto Commerce platform enterprise pack|[v3-2024-S7](v3-2024-S7.md) |2024-01-01|2024-07-01 |2024-10-01 |
612
|Virto Commerce platform core pack |[v3-2023-S6](v3-2023-S6.md) |2023-10-01|2024-05-01 |2024-08-01 |
713
|Virto Commerce platform integration pack|[v3-2023-S6](v3-2023-S6.md) |2023-10-01|2024-05-01 |2024-08-01 |
814
|Virto Commerce platform enterprise pack|[v3-2023-S6](v3-2023-S6.md) |2023-10-01|2024-05-01 |2024-08-01 |

0 commit comments

Comments
 (0)