Merge branch 'release/3.806.0'

VirtoCommerce · Oct 29, 2024 · a54ce49 · a54ce49
2 parents 7dcf6e4 + 3a78045
commit a54ce49
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
     <Copyright>Copyright © VirtoCommerce 2011-2022</Copyright>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>3.805.0</VersionPrefix>
+    <VersionPrefix>3.806.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs b/src/VirtoCommerce.Build/PlatformTools/Build.PackageManager.cs
@@ -537,7 +537,7 @@ private static ManifestModuleInfo LoadModuleInfo(ModuleItem module, ManifestModu
                  PackageManager.ToFile(packageManifest, PackageManifestPath);
                  if (PlatformVersion.CurrentVersion == null)
                  {
-                     var platformRelease = await GithubManager.GetPlatformRelease(null);
+                     var platformRelease = await GithubManager.GetPlatformRelease();
                      PlatformVersion.CurrentVersion = SemanticVersion.Parse(platformRelease.TagName);
                  }
                  localModulesCatalog.Reload();

diff --git a/src/VirtoCommerce.Build/PlatformTools/GithubManager.cs b/src/VirtoCommerce.Build/PlatformTools/GithubManager.cs
@@ -12,7 +12,7 @@ internal static class GithubManager
         private static readonly string _platformRepo = "vc-platform";
         private static readonly GitHubClient _client = new GitHubClient(new ProductHeaderValue("vc-build"));
 
-        public static Task<Release> GetPlatformRelease(string releaseTag)
+        public static Task<Release> GetPlatformRelease(string releaseTag = null)
         {
             return string.IsNullOrEmpty(releaseTag)
                 ? GetLatestReleaseAsync(_githubUser, _platformRepo)
@@ -37,11 +37,12 @@ private static async Task<Release> GetLatestReleaseAsync(string repoUser, string
         {
             var releases = await _client.Repository.Release.GetAll(repoUser, repoName, new ApiOptions
             {
-                PageSize = 5,
+                PageSize = 50,
                 PageCount = 1,
+
             });
 
-            var release = releases.OrderByDescending(r => new Version(r.TagName.Trim())).FirstOrDefault();
+            var release = releases.Where(r => !r.Prerelease).OrderByDescending(r => new Version(r.TagName.Trim())).FirstOrDefault();
             return release;
         }
 

diff --git a/src/VirtoCommerce.Build/PlatformTools/Modules/ExtModuleCatalog.cs b/src/VirtoCommerce.Build/PlatformTools/Modules/ExtModuleCatalog.cs
@@ -25,7 +25,7 @@ public static async Task<ExternalModuleCatalog> GetCatalog(IOptions<ExternalModu
         {
             if (_catalog == null)
             {
-                var platformRelease = await GithubManager.GetPlatformRelease(null);
+                var platformRelease = await GithubManager.GetPlatformRelease();
                 PlatformVersion.CurrentVersion = SemanticVersion.Parse(platformRelease.TagName); // workaround to see all modules in the external catalog
                 var client = new ExternalModulesClient(options);
                 var logger = new LoggerFactory().CreateLogger<ExternalModuleCatalog>();