h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 17:27:48 +08:00
Code Issues Releases Wiki Activity

Reset local version and explicitly show release/debug builds.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-15 13:40:13 +09:00
parent bd4902a532
commit 25e7a08cca
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Desktop.Deploy/Program.cs
View File

@ -122,6 +122,9 @@ namespace osu.Desktop.Deploy
uploadBuild(version); uploadBuild(version);
//reset assemblyinfo.
updateAssemblyInfo("0.0.0");
write("Done!", ConsoleColor.White); write("Done!", ConsoleColor.White);
Console.ReadLine(); Console.ReadLine();
} }

16
osu.Desktop/Overlays/VersionManager.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Diagnostics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -13,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Game.Graphics; using osu.Game.Graphics;
using OpenTK; using OpenTK;
using OpenTK.Graphics;
namespace osu.Desktop.Overlays namespace osu.Desktop.Overlays
{ {
@ -35,7 +37,18 @@ namespace osu.Desktop.Overlays
Origin = Anchor.BottomCentre; Origin = Anchor.BottomCentre;
Alpha = 0; Alpha = 0;
bool isDebug = false;
Debug.Assert(isDebug = true);
var asm = Assembly.GetEntryAssembly().GetName(); 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[] Children = new Drawable[]
{ {
new FlowContainer new FlowContainer
@ -60,7 +73,8 @@ namespace osu.Desktop.Overlays
}, },
new OsuSpriteText new OsuSpriteText
{ {
Text = $@"{asm.Version.Major}.{asm.Version.Minor}.{asm.Version.Build}" Colour = isDebug ? colours.Red : Color4.White,
Text = version
}, },
} }
}, },

6
osu.Desktop/Properties/AssemblyInfo.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Reflection; 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 // 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: Guid("55e28cb2-7b6c-4595-8dcc-9871d8aad7e9")]
[assembly: AssemblyVersion("2017.212.0")] [assembly: AssemblyVersion("0.0.0")]
[assembly: AssemblyFileVersion("2017.212.0")] [assembly: AssemblyFileVersion("0.0.0")]