diff --git a/src/NetSparkle.Tests.AppCastGenerator/AppCastMakerTests.cs b/src/NetSparkle.Tests.AppCastGenerator/AppCastMakerTests.cs index c787d6cc..0db03558 100644 --- a/src/NetSparkle.Tests.AppCastGenerator/AppCastMakerTests.cs +++ b/src/NetSparkle.Tests.AppCastGenerator/AppCastMakerTests.cs @@ -142,6 +142,7 @@ public void CanGetVersionFromName() Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("appsetup2.10.1.exe")); // #623 + Assert.Equal("1.3.0", AppCastMaker.GetVersionFromName("setup-something-1.3.0.dmg")); Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("app-setup-2.10.1.exe")); Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("my-app-setup-2.10.1.exe")); Assert.Equal("2.10.1", AppCastMaker.GetVersionFromName("my-app-setup-2.10.1.exe")); diff --git a/src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs b/src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs index fa74fa4f..996b27a6 100644 --- a/src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs +++ b/src/NetSparkle.Tools.AppCastGenerator/AppCastMaker.cs @@ -137,7 +137,6 @@ private static string RemoveTextBlockFromRight(string input) tempSegment = string.IsNullOrWhiteSpace(tempSegment) ? segment : segment + "." + tempSegment; tempSegment = tempSegment.Trim('.'); - if (ContainsValidVersionInfo(tempSegment)) { lastValidVersionLeft = tempSegment; @@ -207,7 +206,7 @@ private static string RemoveTextBlockFromRight(string input) // Handle a sampling of complex extensions and remove them if they exist List extensionPatterns = [@"\.tar\.gz$", @"\.tar$", @"\.gz$", @"\.zip$", @"\.txt$", - @"\.exe$", @"\.bin$", @"\.msi$", @"\.excel", @"\.mcdx", @"\.pdf", @"\.dll", @"\.ted"]; + @"\.exe$", @"\.bin$", @"\.msi$", @"\.excel", @"\.mcdx", @"\.pdf", @"\.dll", @"\.ted", @"\.dmg"]; // handle user-defined extensions if (extensions != null) {