Skip to content

Commit 76721c2

Browse files
committed
Fix bug where same ver diff os did not work
Closes #643
1 parent e486a50 commit 76721c2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,9 @@ public string GetPathToAppCastOutput(string desiredOutputDirectory, string sourc
511511
var productName = _opts.ProductName;
512512
if (useExistingAppCastItems)
513513
{
514+
Console.WriteLine("Grabbing items from existing app cast...", Color.LightBlue);
514515
var (existingItems, existingProductName) = GetItemsAndProductNameFromExistingAppCast(outputAppCastFileName, _opts.OverwriteOldItemsInAppcast);
516+
Console.WriteLine("{0} pre-existing item(s) found in a previously created app cast and are being added to the output", existingItems.Count, Color.LightBlue);
515517
items.AddRange(existingItems);
516518
if (!string.IsNullOrWhiteSpace(existingProductName))
517519
{
@@ -547,7 +549,7 @@ public string GetPathToAppCastOutput(string desiredOutputDirectory, string sourc
547549
}
548550
var semVerLikeVersion = SemVerLike.Parse(productVersion);
549551

550-
var itemFoundInAppcast = items.Where(x => x.SemVerLikeVersion != null && x.SemVerLikeVersion.Equals(semVerLikeVersion)).FirstOrDefault();
552+
var itemFoundInAppcast = items.Where(x => x.SemVerLikeVersion != null && x.SemVerLikeVersion.Equals(semVerLikeVersion) && x.OperatingSystem == _opts.OperatingSystem?.Trim()).FirstOrDefault();
551553
if (itemFoundInAppcast != null && _opts.OverwriteOldItemsInAppcast)
552554
{
553555
Console.WriteLine($"Removing existing app cast item with version {semVerLikeVersion} so we can add the version on disk to the app cast...");
@@ -559,6 +561,7 @@ public string GetPathToAppCastOutput(string desiredOutputDirectory, string sourc
559561
var item = CreateAppCastItemFromFile(fileInfo, productName ?? "", semVerLikeVersion, usesChangelogs, _opts.ChangeLogFileNamePrefix, _opts.Channel);
560562
if (item != null)
561563
{
564+
Console.WriteLine("Adding item to app cast with title: {0}, version: {1}, operating system: {1}", item.Title, item.Version, item.OperatingSystem);
562565
items.Add(item);
563566
}
564567
}

0 commit comments

Comments
 (0)