diff --git a/Builders/AndroidBuilder.cs b/Builders/AndroidBuilder.cs index e6f6e8e..21f7cb1 100644 --- a/Builders/AndroidBuilder.cs +++ b/Builders/AndroidBuilder.cs @@ -2,6 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using System.IO; +using System.Linq; using osu.Desktop.Deploy.Uploaders; namespace osu.Desktop.Deploy.Builders @@ -36,7 +37,7 @@ public override void Build() + $" -p:AndroidSigningStorePass={codeSigningPassword}"; } - string[] versionParts = Version.Split('.'); + string[] versionParts = Version.Split('-').First().Split('.'); string versionCode = versionParts[0].PadLeft(4, '0') + versionParts[1].PadLeft(4, '0') + versionParts[2].PadLeft(1, '0'); RunDotnetPublish($"-p:ApplicationVersion={versionCode} {codeSigningArguments}"); diff --git a/Program.cs b/Program.cs index 7346463..b487dbf 100644 --- a/Program.cs +++ b/Program.cs @@ -99,6 +99,10 @@ public static void Main(string[] args) if (args.Length > 2 && !string.IsNullOrEmpty(args[2])) Enum.TryParse(args[2], true, out targetPlatform); + // ensure version has a suffix + if (version.Split('-').Length == 1) + version = $"{version}-lazer"; + Console.ResetColor(); Console.WriteLine($"Increment Version: {IncrementVersion}"); Console.WriteLine($"Signing Certificate: {WindowsCodeSigningMetadataPath}");