Skip to content

Commit

Permalink
Merge branch 'fix/3.21.1' of https://github.com/VirtoCommerce/vc-build
Browse files Browse the repository at this point in the history
…into fix/3.21.1
  • Loading branch information
krankenbro committed Mar 25, 2024
2 parents 670e8e7 + 505b1b0 commit 0209b65
Show file tree
Hide file tree
Showing 57 changed files with 828 additions and 561 deletions.
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.5</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
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.
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 0209b65

Please sign in to comment.