Skip to content

Commit

Permalink
Merge branch 'release/3.18.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Oct 3, 2023
2 parents ee47aec + a0327ce commit 82a0c7e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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.17.0</VersionPrefix>
<VersionPrefix>3.18.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
7 changes: 3 additions & 4 deletions src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,10 @@ private async Task<ManifestBase> OpenOrCreateManifest(string packageManifestPath
if (!isEdge)
{
SkipDependencySolving = true;
if (File.Exists(packageManifestPath))
if(!File.Exists(packageManifestPath))
{
Assert.Fail($"Manifest already exists at {packageManifestPath}");
}
await DownloadBundleManifest(BundleName, packageManifestPath);
await DownloadBundleManifest(BundleName, packageManifestPath);
}
packageManifest = PackageManager.FromFile(packageManifestPath);
}
else if (!File.Exists(packageManifestPath) && File.Exists(platformWebDllPath))
Expand Down

0 comments on commit 82a0c7e

Please sign in to comment.