2.0.0 (#19)

* VCI-128: Fix build project search * VCI-128: Fix module manifest search
VirtoCommerce · Aug 20, 2021 · 66924a8 · 66924a8
1 parent 64152b7
commit 66924a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -49,6 +49,7 @@ jobs:
         id: image
         with: 
           projectType: "platform"
+          releaseBranch: "main"
 
       - name: Add version suffix
         if: ${{ github.ref != 'refs/heads/main' }}

diff --git a/Build.cs b/Build.cs
@@ -220,8 +220,8 @@ public static int Main(string[] args)
         protected static AbsolutePath SamplesDirectory => RootDirectory / "samples";
 
         protected AbsolutePath ModulesLocalDirectory => ArtifactsDirectory / ModulesJsonDirectoryName;
-        protected Project WebProject => Solution?.AllProjects.FirstOrDefault(x => x.Name.EndsWith(".Web") && !x.Path.ToString().Contains("samples") || x.Name.EndsWith("VirtoCommerce.Storefront"));
-        protected AbsolutePath ModuleManifestFile => WebProject.Directory / "module.manifest";
+        protected Project WebProject => Solution?.AllProjects.FirstOrDefault(x => x.Name.EndsWith(".Web") && !x.Path.ToString().Contains("samples") || x.Name.EndsWith("VirtoCommerce.Storefront") || x.Name.EndsWith("_build"));
+        protected AbsolutePath ModuleManifestFile => WebProject?.Directory / "module.manifest";
         protected AbsolutePath ModuleIgnoreFile => RootDirectory / "module.ignore";
 
         protected Microsoft.Build.Evaluation.Project MSBuildProject => WebProject?.GetMSBuildProject();