diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 07374e7541..3cd9c80365 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -122,6 +122,9 @@ namespace osu.Desktop.Deploy uploadBuild(version); + //reset assemblyinfo. + updateAssemblyInfo("0.0.0"); + write("Done!", ConsoleColor.White); Console.ReadLine(); } diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs index e3cffc1804..6c34838130 100644 --- a/osu.Desktop/Overlays/VersionManager.cs +++ b/osu.Desktop/Overlays/VersionManager.cs @@ -1,6 +1,7 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System.Diagnostics; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -13,6 +14,7 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Textures; using osu.Game.Graphics; using OpenTK; +using OpenTK.Graphics; namespace osu.Desktop.Overlays { @@ -35,7 +37,18 @@ namespace osu.Desktop.Overlays Origin = Anchor.BottomCentre; Alpha = 0; + bool isDebug = false; + Debug.Assert(isDebug = true); + var asm = Assembly.GetEntryAssembly().GetName(); + string version; + if (asm.Version.Major == 0) + { + version = @"local " + (isDebug ? @"debug" : @"release"); + } + else + version = $@"{asm.Version.Major}.{asm.Version.Minor}.{asm.Version.Build}"; + Children = new Drawable[] { new FlowContainer @@ -60,7 +73,8 @@ namespace osu.Desktop.Overlays }, new OsuSpriteText { - Text = $@"{asm.Version.Major}.{asm.Version.Minor}.{asm.Version.Build}" + Colour = isDebug ? colours.Red : Color4.White, + Text = version }, } }, diff --git a/osu.Desktop/Properties/AssemblyInfo.cs b/osu.Desktop/Properties/AssemblyInfo.cs index c078b4caf5..17329d8ac0 100644 --- a/osu.Desktop/Properties/AssemblyInfo.cs +++ b/osu.Desktop/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2017 ppy Pty Ltd . +// Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System.Reflection; @@ -25,5 +25,5 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("55e28cb2-7b6c-4595-8dcc-9871d8aad7e9")] -[assembly: AssemblyVersion("2017.212.0")] -[assembly: AssemblyFileVersion("2017.212.0")] +[assembly: AssemblyVersion("0.0.0")] +[assembly: AssemblyFileVersion("0.0.0")]