diff --git a/Pilz/AppVersion.cs b/Pilz/AppVersion.cs index fc62e8b..1e5465a 100644 --- a/Pilz/AppVersion.cs +++ b/Pilz/AppVersion.cs @@ -124,42 +124,42 @@ public class AppVersion(Version version, int build, AppChannel channel) : ICompa string? versionStr; // 1.14.2-beta.1 - if (Regex.Match(input, @"(?[0-9.]+)-(?[a-zA-Z]+)\.(?\d+)$") is { Success: true } matchTPN) + if (Regex.Match(input, @"^(?[0-9.]+)-(?[a-zA-Z]+)\.(?\d+)$") is { Success: true } matchTPN) { versionStr = matchTPN.Groups["v"].Value; channelStr = matchTPN.Groups["c"].Value; buildStr = matchTPN.Groups["n"].Value; } // 1.14.2-beta.1 - else if (Regex.Match(input, @"(?[0-9.]+)-(?[a-zA-Z]+)(?\d+)$") is { Success: true } matchTN) + else if (Regex.Match(input, @"^(?[0-9.]+)-(?[a-zA-Z]+)(?\d+)$") is { Success: true } matchTN) { versionStr = matchTN.Groups["v"].Value; channelStr = matchTN.Groups["c"].Value; buildStr = matchTN.Groups["n"].Value; } // 1.14.2-beta - else if (Regex.Match(input, @"(?[0-9.]+)-(?[a-zA-Z]+)$") is { Success: true } matchT) + else if (Regex.Match(input, @"^(?[0-9.]+)-(?[a-zA-Z]+)$") is { Success: true } matchT) { versionStr = matchT.Groups["v"].Value; channelStr = matchT.Groups["c"].Value; buildStr = null; } // 1.14.2 Beta 1 - else if (Regex.Match(input, @"(?[0-9.]+)-(?[a-zA-Z]+)\.(?\d+)$") is { Success: true } matchDN) + else if (Regex.Match(input, @"^(?[0-9.]+)-(?[a-zA-Z]+)\.(?\d+)$") is { Success: true } matchDN) { versionStr = matchDN.Groups["v"].Value; channelStr = matchDN.Groups["c"].Value; buildStr = matchDN.Groups["n"].Value; } // 1.14.2 Beta - else if (Regex.Match(input, @"(?[0-9.]+)-(?[a-zA-Z]+)$") is { Success: true } matchD) + else if (Regex.Match(input, @"^(?[0-9.]+)-(?[a-zA-Z]+)$") is { Success: true } matchD) { versionStr = matchD.Groups["v"].Value; channelStr = matchD.Groups["c"].Value; buildStr = null; } // 1.14.2 - else if (Regex.Match(input, @"(?[0-9.]+)$") is { Success: true } matchV) + else if (Regex.Match(input, @"^(?[0-9.]+)(\+[a-zA-Z0-9]+)?$") is { Success: true } matchV) { versionStr = matchV.Groups["v"].Value; channelStr = null; diff --git a/Pilz/Pilz.csproj b/Pilz/Pilz.csproj index 8a48748..459bbf7 100644 --- a/Pilz/Pilz.csproj +++ b/Pilz/Pilz.csproj @@ -5,7 +5,7 @@ latest enable annotations - 2.7.4 + 2.7.5