Merge branch 'release/3.17.0'

VirtoCommerce · Oct 3, 2023 · ee47aec · ee47aec
2 parents ef9c158 + 240399a
commit ee47aec
Show file tree

Hide file tree

Showing 232 changed files with 229 additions and 29,207 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,6 +39,12 @@ jobs:
           dotnet pack
           dotnet tool install -g VirtoCommerce.GlobalTool --add-source ./src/VirtoCommerce.Build/artifacts
 
+      - name: Set up Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Get changelog
         id: changelog
         uses: VirtoCommerce/vc-github-actions/changelog-generator@master

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
     <Copyright>Copyright © VirtoCommerce 2011-2022</Copyright>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>3.16.0</VersionPrefix>
+    <VersionPrefix>3.17.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Build.sln b/VirtoCommerce.Build.sln
@@ -5,9 +5,7 @@ VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtoCommerce.Build", "src\VirtoCommerce.Build\VirtoCommerce.Build.csproj", "{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArgoCD.Client", "src\ArgoCD.Client\ArgoCD.Client.csproj", "{1895FCF7-C5E2-42BD-8559-9526B43B919D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtoCommerce.Build.Tests", "src\VirtoCommerce.Build.Tests\VirtoCommerce.Build.Tests.csproj", "{9E6E4723-DBA4-4A4B-807D-F9184D792DCF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtoCommerce.Build.Tests", "src\VirtoCommerce.Build.Tests\VirtoCommerce.Build.Tests.csproj", "{9E6E4723-DBA4-4A4B-807D-F9184D792DCF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,10 +17,6 @@ Global
 		{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{826FB1DE-BF4F-4314-AA00-FC5BC7627D7F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1895FCF7-C5E2-42BD-8559-9526B43B919D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E6E4723-DBA4-4A4B-807D-F9184D792DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E6E4723-DBA4-4A4B-807D-F9184D792DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E6E4723-DBA4-4A4B-807D-F9184D792DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/docs/CLI-tools/package-management.md b/docs/CLI-tools/package-management.md
@@ -93,7 +93,7 @@ The `vc-package.json` file is used to maintain the list of installed modules wit
 - `vc-build install (with no args)`
 
 This target downloads and installs the platform and modules into the relevant folder with versions described in `vc-package.json`.
-If `vc-package.json` is not found in the local folder, the command will by default download and install the latest platform and module versions marked as `commerce`.
+If `vc-package.json` is not found in the local folder, the command will by default download and install the latest stable bundle. If -Edge parameter has been used then this target will download the latest available platform and modules marked as `commerce`.
 
 By default, the `install` target will install all modules listed as dependencies in `vc-package.json`.
 

diff --git a/docs/targets.md b/docs/targets.md
@@ -21,7 +21,9 @@ By default, install target will install all modules listed as dependencies in vc
 Path to vc-package.json, discovery and probing paths can be overridden with PackageManifestPath, DiscoveryPath, ProbingPath parameters. Also we can skip dependency solving with SkipDependencySolving parameter.
 Since version 2.0.0-beta0005 the -module parameter is case insensitive
 
-When you are using one of the source which requires the authorization you can pass tokens using these parameters: GithubToken, AzureToken, GitLabToken. 
+When you are using one of the source which requires the authorization you can pass tokens using these parameters: GithubToken, AzureToken, GitLabToken.
+
+Since version 3.17.0 this target installs stable versions of modules by default. If you need the latest available versions you should use -Edge parameter
 Examples:
 ```console
 vc-build install (with no args)
@@ -237,7 +239,7 @@ vc-build UpdateCloudEnvironment -CloudToken <your token> -ArgoConfigFile <path t
 :::
 ## SetEnvParameter
 Updates parameters of cloud environment
-Gets parameters: CloudToken, EnvironmentName, HelmParameters (Array)
+Gets parameters: CloudToken, EnvironmentName, HelmParameters (Array), Organization (optional)
 ```console
 vc-build SetEnvParameter -CloudToken <your token> -EnvironmentName <environment name> -HelmParameters platform.config.paramname=somevalue123
 ```

diff --git a/src/.DS_Store b/src/.DS_Store