Skip to content

Commit 24787b5

Browse files
committed
App cast gen - See if OS is same when checking version
1 parent 14aca92 commit 24787b5

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/NetSparkle.Tools.AppCastGenerator/JsonAppCastMaker.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public override (List<AppCastItem>, string?) GetItemsAndProductNameFromExistingA
5959
{
6060
Console.WriteLine("Found an item in the app cast: version {0} (short version = {1}; title = {3}) -- os = {2}",
6161
currentItem.Version, currentItem.ShortVersion, currentItem.OperatingSystem, currentItem.Title);
62-
var itemFound = items.Where(x => x.Version != null && x.Version == currentItem.Version?.Trim()).FirstOrDefault();
62+
var itemFound = items.Where(x => x.Version != null && x.Version == currentItem.Version?.Trim() && x.OperatingSystem == currentItem.OperatingSystem?.Trim()).FirstOrDefault();
6363
if (itemFound == null)
6464
{
6565
items.Add(currentItem);

src/NetSparkle.Tools.AppCastGenerator/NetSparkle.Tools.AppCastGenerator.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<PostBuildEvent />
51-
<AssemblyVersion>2.8.0.0</AssemblyVersion>
52-
<FileVersion>2.8.0.0</FileVersion>
51+
<AssemblyVersion>2.8.1.0</AssemblyVersion>
52+
<FileVersion>2.8.1.0</FileVersion>
5353
<PackageId>NetSparkleUpdater.Tools.AppCastGenerator</PackageId>
54-
<Version>2.8.0</Version>
54+
<Version>2.8.1</Version>
5555
<Authors>Deadpikle</Authors>
5656
<PackageReadmeFile>README.md</PackageReadmeFile>
5757
<PackageLicenseExpression>MIT</PackageLicenseExpression>

src/NetSparkle.Tools.AppCastGenerator/XMLAppCastMaker.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public override (List<AppCastItem>, string?) GetItemsAndProductNameFromExistingA
7171
var currentItem = xmlGenerator.ReadAppCastItem(item);
7272
Console.WriteLine("Found an item in the app cast: version {0} ({1}) -- os = {2}",
7373
currentItem.Version, currentItem.ShortVersion, currentItem.OperatingSystem);
74-
var itemFound = items.Where(x => x.Version != null && x.Version == currentItem.Version?.Trim()).FirstOrDefault();
74+
var itemFound = items.Where(x => x.Version != null && x.Version == currentItem.Version?.Trim()
75+
&& x.OperatingSystem == currentItem.OperatingSystem?.Trim()).FirstOrDefault();
7576
if (itemFound == null)
7677
{
7778
items.Add(currentItem);

0 commit comments

Comments
 (0)