From 635b9a0c02aeb7814b8b9692cbf8c69451a9d4c9 Mon Sep 17 00:00:00 2001 From: JLChnToZ Date: Wed, 20 Nov 2024 14:38:52 +0800 Subject: [PATCH 1/2] Fix latest package resolution --- PackageBuilder/Build.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PackageBuilder/Build.cs b/PackageBuilder/Build.cs index 7b50690..9714473 100644 --- a/PackageBuilder/Build.cs +++ b/PackageBuilder/Build.cs @@ -16,6 +16,7 @@ using VRC.PackageManagement.Core.Types.Packages; using ProductHeaderValue = Octokit.ProductHeaderValue; using ListingSource = VRC.PackageManagement.Automation.Multi.ListingSource; +using SemVer = SemanticVersioning.Version; namespace VRC.PackageManagement.Automation { @@ -234,7 +235,7 @@ ListingSource MakeListingSourceFromManifest(VRCPackageManifest manifest) Serilog.Log.Information($"Made listingInfo {JsonConvert.SerializeObject(listingInfo, JsonWriteOptions)}"); - var latestPackages = packages.OrderByDescending(p => p.Version).DistinctBy(p => p.Id).ToList(); + var latestPackages = packages.OrderByDescending(p => new SemVer(p.Version, true)).DistinctBy(p => p.Id).ToList(); Serilog.Log.Information($"LatestPackages: {JsonConvert.SerializeObject(latestPackages, JsonWriteOptions)}"); var formattedPackages = latestPackages.ConvertAll(p => new { Name = p.Id, From d6dfc27299378b3bffaf9607b591f37bcf881892 Mon Sep 17 00:00:00 2001 From: JLChnToZ Date: Sat, 23 Nov 2024 14:33:21 +0800 Subject: [PATCH 2/2] Update to use VPMVersion --- PackageBuilder/Build.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PackageBuilder/Build.cs b/PackageBuilder/Build.cs index 9714473..26603a3 100644 --- a/PackageBuilder/Build.cs +++ b/PackageBuilder/Build.cs @@ -16,7 +16,7 @@ using VRC.PackageManagement.Core.Types.Packages; using ProductHeaderValue = Octokit.ProductHeaderValue; using ListingSource = VRC.PackageManagement.Automation.Multi.ListingSource; -using SemVer = SemanticVersioning.Version; +using VPMVersion = VRC.PackageManagement.Core.Types.VPMVersion.Version; namespace VRC.PackageManagement.Automation { @@ -235,7 +235,7 @@ ListingSource MakeListingSourceFromManifest(VRCPackageManifest manifest) Serilog.Log.Information($"Made listingInfo {JsonConvert.SerializeObject(listingInfo, JsonWriteOptions)}"); - var latestPackages = packages.OrderByDescending(p => new SemVer(p.Version, true)).DistinctBy(p => p.Id).ToList(); + var latestPackages = packages.OrderByDescending(p => new VPMVersion(p.Version, true)).DistinctBy(p => p.Id).ToList(); Serilog.Log.Information($"LatestPackages: {JsonConvert.SerializeObject(latestPackages, JsonWriteOptions)}"); var formattedPackages = latestPackages.ConvertAll(p => new { Name = p.Id,