Skip to content

Commit

Permalink
Merge branch 'release/3.800.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
krankenbro committed Apr 15, 2024
2 parents 098a007 + 105b17f commit 4ec513c
Show file tree
Hide file tree
Showing 60 changed files with 1,012 additions and 624 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [3.800.0] - 2024-04-15
- **Minor Fix:** Resolved a minor issue.
- **Parameter Replacement:** Deprecated `sonar.login` parameter replaced.
- **New Feature:** Added `MakeLatest` parameter.
- **Enhancement:** Minor fixes for `CompleteRelease` target.
- **Path Correction:** Fixed relative to absolute path conversion.
- **Documentation Update:** Updated `targets.md`.
- **Parameter Update:** Replaced `ArgoConfigFile` with `Manifest` parameter.
- **Enhancement:** Added switch for user-friendly authentication provider selection.
- **Bug Fix:** Corrected path escaping in `CompleteRelease` target.
- **Target Removal:** Removed obsolete target.

## [3.16.0] - 2023-08-24
### Added
- Organization parameter for SetEnvParameter target
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Copyright>Copyright © VirtoCommerce 2011-2022</Copyright>
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>3.21.0</VersionPrefix>
<VersionPrefix>3.800.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
12 changes: 12 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Copyright (c) Virto Solutions LTD.  All rights reserved.

Licensed under the Virto Commerce Open Software License (the "License"); you
may not use this file except in compliance with the License. You may
obtain a copy of the License at

https://virtocommerce.com/open-source-license

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
12 changes: 12 additions & 0 deletions docs/CLI-tools/package-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ This command downloads and installs the platform or modules into the relevant fo
"Id": "42920184"
}
]
},
{
"Name": "Local",
"Modules": [
{
"Path": "C:/projects/vc/vc-module-saas/artifacts/VirtoCommerce.SaaS_3.214.0.zip",
"Id": "OptionalForThisSource"
},
{
"Path": "C:\\projects\\vc\\vc-module-catalog\\artifacts\\VirtoCommerce.Catalog"
}
]
}
],
"ManifestVersion": "2.0",
Expand Down
94 changes: 78 additions & 16 deletions docs/targets.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ vc-build clean
Executes dotnet restore
```console
vc-build restore
vc-build restore -NugetConfig <path to nuget config>
```
:::
:::
Expand Down Expand Up @@ -140,6 +141,8 @@ vc-build WebPackBuild
Compresses an artifact to the archive and filters excess files
```console
vc-build compress
vc-build compress -configuration Release
vc-build Compress -NugetConfig <path to nuget config>
```
:::
:::
Expand Down Expand Up @@ -213,14 +216,6 @@ vc-build BuildAndPush -DockerRegistryUrl https://myregistry.com -DockerUsername
```
:::
:::
## ArgoUpdateApplication
Updates Applications in ArgoCD
Gets parameters: ArgoServer, ArgoToken(or as an alternative - ARGO_TOKEN environment variable), ArgoConfigFile
```console
vc-build ArgoUpdateApplication -ArgoConfigFile ./environments.yml -ArgoServer https://argoserver.com
```
:::
:::
## Configure
Validates and updates a connection string in the appsettings.json
Gets parameters: Sql, Redis, AzureBlob, AppsettingsPath (./appsettings.json by default)
Expand All @@ -229,26 +224,93 @@ vc-build Configure -Sql "MsSql connection string" -Redis "Redis connection stri
```
:::
:::
## UpdateCloudEnvironment
## CloudEnvUpdate
Updates Applications in Cloud
Gets parameters: CloudToken, ArgoConfigFile
Gets parameters: CloudToken, Manifest
```console
vc-build UpdateCloudEnvironment -CloudToken <your token> -ArgoConfigFile <path to application manifest>
vc-build CloudEnvUpdate -CloudToken <your token> -Manifest <path to application manifest>
```
:::
:::
## SetEnvParameter
## CloudEnvSetParameter
Updates parameters of cloud environment
Gets parameters: CloudToken, EnvironmentName, HelmParameters (Array), Organization (optional)
```console
vc-build SetEnvParameter -CloudToken <your token> -EnvironmentName <environment name> -HelmParameters platform.config.paramname=somevalue123
vc-build CloudEnvSetParameter -CloudToken <your token> -EnvironmentName <environment name> -HelmParameters platform.config.paramname=somevalue123
```
:::
:::
## WaitForStatus
## CloudEnvStatus
Waits for health and/or sync statuses of the Environment
Gets parameters: CloudToken, EnvironmentName, HelmParameters (Array)
Gets parameters: CloudToken, EnvironmentName, HealthStatus, SyncStatus
```console
vc-build CloudEnvStatus -CloudToken <your token> -EnvironmentName <environment name> -HealthStatus Healthy -SyncStatus Progressing
```
:::
:::
## CloudAuth
This target saves a token for accessing the VirtoCloud portal, eliminating the need to use the CloudToken parameter with every call to targets in the Cloud group.
Gets parameters: AzureAD (optional)
```console
vc-build CloudAuth
vc-build CloudAuth -AzureAD
```
:::
:::
## CloudInit
This target creates a new environment. It additionally accepts the ServicePlan parameter to specify the service plan (default value is F1).
```console
vc-build CloudInit -EnvironmentName <EnvName>
vc-build CloudInit -EnvironmentName <EnvName> -ServicePlan F1
```
:::
:::
## CloudEnvList
List Environments with Statuses
```console
vc-build CloudEnvList
```
:::
:::
## CloudEnvRestart
Restart Environment
```console
vc-build CloudEnvRestart -EnvironmentName <EnvName>
```
:::
:::
## CloudEnvStatus
Waits for health and/or sync statuses of the Environment
Gets parameters: CloudToken, EnvironmentName, HealthStatus, SyncStatus
```console
vc-build CloudEnvStatus -CloudToken <your token> -EnvironmentName <environment name> -HealthStatus Healthy -SyncStatus Progressing
```
:::
:::
## CloudEnvLogs
Show Environment’s Logs
```console
vc-build CloudEnvLogs -EnvironmentName <EnvName>
```
:::
:::
## CloudDown
Delete Environment
```console
vc-build CloudDown -EnvironmentName <EnvName>
```
:::
:::
## CloudDeploy
Deploy Custom Image to the Existing Environment
```console
vc-build CloudDeploy -EnvironmentName <EnvName> -DockerUsername <username of docker hub>
```
:::
:::
## CloudUp
Deploy Custom Image to the New Environment
```console
vc-build WaitForStatus -CloudToken <your token> -EnvironmentName <environment name> -HealthStatus Healthy
vc-build CloudUp -EnvironmentName <EnvName> -DockerUsername <username of docker hub>
```
:::
Binary file added logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions shelltests/packages.test
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Install Bundle #4
vc-build install -stable -v 4
# Install Bundle #5
vc-build install -stable -v 5
>>>2
>>>= 0

# Update to Bundle #5
vc-build update -v 5
# Update to Bundle #6
vc-build update -v 6
>>>2
>>>= 0

Expand Down
6 changes: 4 additions & 2 deletions src/VirtoCommerce.Build.Tests/PackageManagerTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Extensions;
using PlatformTools;
using PlatformTools.Modules;
using VirtoCommerce.Build.PlatformTools;

namespace VirtoCommerce.Build.Tests
Expand Down Expand Up @@ -76,7 +78,7 @@ public void ToFile_SavesManifestToFile()
var path = "./test-vc-package.json";

// Act
PackageManager.ToFile(manifest, path);
PackageManager.ToFile(manifest, path.ToAbsolutePath());

// Assert
Assert.True(File.Exists(path));
Expand All @@ -91,7 +93,7 @@ public void FromFile_LoadsManifestFromFile()
// Arrange
var manifest = PackageManager.CreatePackageManifest("1.0.0");
var path = "./test-vc-package.json";
PackageManager.ToFile(manifest, path);
PackageManager.ToFile(manifest, path.ToAbsolutePath());

// Act
var loadedManifest = PackageManager.FromFile(path);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Loading

0 comments on commit 4ec513c

Please sign in to comment.