This commit is contained in:
Pilzinsel64
2025-12-09 10:17:29 +01:00
parent 528c97094c
commit b940686cdd
2 changed files with 7 additions and 7 deletions

View File

@@ -124,42 +124,42 @@ public class AppVersion(Version version, int build, AppChannel channel) : ICompa
string? versionStr; string? versionStr;
// 1.14.2-beta.1 // 1.14.2-beta.1
if (Regex.Match(input, @"(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)\.(?<n>\d+)$") is { Success: true } matchTPN) if (Regex.Match(input, @"^(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)\.(?<n>\d+)$") is { Success: true } matchTPN)
{ {
versionStr = matchTPN.Groups["v"].Value; versionStr = matchTPN.Groups["v"].Value;
channelStr = matchTPN.Groups["c"].Value; channelStr = matchTPN.Groups["c"].Value;
buildStr = matchTPN.Groups["n"].Value; buildStr = matchTPN.Groups["n"].Value;
} }
// 1.14.2-beta.1 // 1.14.2-beta.1
else if (Regex.Match(input, @"(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)(?<n>\d+)$") is { Success: true } matchTN) else if (Regex.Match(input, @"^(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)(?<n>\d+)$") is { Success: true } matchTN)
{ {
versionStr = matchTN.Groups["v"].Value; versionStr = matchTN.Groups["v"].Value;
channelStr = matchTN.Groups["c"].Value; channelStr = matchTN.Groups["c"].Value;
buildStr = matchTN.Groups["n"].Value; buildStr = matchTN.Groups["n"].Value;
} }
// 1.14.2-beta // 1.14.2-beta
else if (Regex.Match(input, @"(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)$") is { Success: true } matchT) else if (Regex.Match(input, @"^(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)$") is { Success: true } matchT)
{ {
versionStr = matchT.Groups["v"].Value; versionStr = matchT.Groups["v"].Value;
channelStr = matchT.Groups["c"].Value; channelStr = matchT.Groups["c"].Value;
buildStr = null; buildStr = null;
} }
// 1.14.2 Beta 1 // 1.14.2 Beta 1
else if (Regex.Match(input, @"(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)\.(?<n>\d+)$") is { Success: true } matchDN) else if (Regex.Match(input, @"^(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)\.(?<n>\d+)$") is { Success: true } matchDN)
{ {
versionStr = matchDN.Groups["v"].Value; versionStr = matchDN.Groups["v"].Value;
channelStr = matchDN.Groups["c"].Value; channelStr = matchDN.Groups["c"].Value;
buildStr = matchDN.Groups["n"].Value; buildStr = matchDN.Groups["n"].Value;
} }
// 1.14.2 Beta // 1.14.2 Beta
else if (Regex.Match(input, @"(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)$") is { Success: true } matchD) else if (Regex.Match(input, @"^(?<v>[0-9.]+)-(?<c>[a-zA-Z]+)$") is { Success: true } matchD)
{ {
versionStr = matchD.Groups["v"].Value; versionStr = matchD.Groups["v"].Value;
channelStr = matchD.Groups["c"].Value; channelStr = matchD.Groups["c"].Value;
buildStr = null; buildStr = null;
} }
// 1.14.2 // 1.14.2
else if (Regex.Match(input, @"(?<v>[0-9.]+)$") is { Success: true } matchV) else if (Regex.Match(input, @"^(?<v>[0-9.]+)(\+[a-zA-Z0-9]+)?$") is { Success: true } matchV)
{ {
versionStr = matchV.Groups["v"].Value; versionStr = matchV.Groups["v"].Value;
channelStr = null; channelStr = null;

View File

@@ -5,7 +5,7 @@
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>annotations</Nullable> <Nullable>annotations</Nullable>
<Version>2.7.4</Version> <Version>2.7.5</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">