From b1665cdb75b126db9970eb1db525c558d17369ba Mon Sep 17 00:00:00 2001 From: Toru the Red Fox Date: Sat, 23 Jul 2022 13:32:13 +0100 Subject: [PATCH] lbp2 beta tweaks --- .gitignore | 1 + ProjectLighthouse/Helpers/VersionHelper.cs | 5 +- ProjectLighthouse/ProjectLighthouse.csproj | 20 ++++ .../Properties/Resources.Designer.cs | 63 +++++++++++ ProjectLighthouse/Properties/Resources.resx | 101 ++++++++++++++++++ 5 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 ProjectLighthouse/Properties/Resources.Designer.cs create mode 100644 ProjectLighthouse/Properties/Resources.resx diff --git a/.gitignore b/.gitignore index 2783648d..b766f916 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ gitBranch.txt gitVersion.txt gitRemotes.txt gitUnpushed.txt +gitRevCount.txt logs/* npTicket* diff --git a/ProjectLighthouse/Helpers/VersionHelper.cs b/ProjectLighthouse/Helpers/VersionHelper.cs index 212eb091..a8c99231 100644 --- a/ProjectLighthouse/Helpers/VersionHelper.cs +++ b/ProjectLighthouse/Helpers/VersionHelper.cs @@ -12,6 +12,8 @@ public static class VersionHelper { CommitHash = ResourceHelper.ReadManifestFile("gitVersion.txt"); Branch = ResourceHelper.ReadManifestFile("gitBranch.txt"); + string rawRevision = ResourceHelper.ReadManifestFile("gitRevCount.txt"); + Revision = (Branch == "main") ? $"r{rawRevision}" : $"{Branch}_r{rawRevision}"; string remotesFile = ResourceHelper.ReadManifestFile("gitRemotes.txt"); @@ -54,7 +56,8 @@ public static class VersionHelper public static string CommitHash { get; set; } public static string Branch { get; set; } - public static string FullVersion => $"Project Lighthouse {Branch}@{CommitHash} {Build} ({ServerConfiguration.Instance.Customization.ServerName})"; + public static string Revision { get; set; } + public static string FullVersion => $"{ServerConfiguration.Instance.Customization.ServerName} {Revision}";//$"Project Lighthouse {Branch}@{CommitHash} {Build} ({ServerConfiguration.Instance.Customization.ServerName})"; public static bool IsDirty => CommitHash.EndsWith("-dirty") || CommitsOutOfDate != 1 || CommitHash == "invalid" || Branch == "invalid"; public static int CommitsOutOfDate { get; set; } public static bool CanCheckForUpdates { get; set; } diff --git a/ProjectLighthouse/ProjectLighthouse.csproj b/ProjectLighthouse/ProjectLighthouse.csproj index 19fe6d67..b6723275 100644 --- a/ProjectLighthouse/ProjectLighthouse.csproj +++ b/ProjectLighthouse/ProjectLighthouse.csproj @@ -47,6 +47,10 @@ Always + + + + Always @@ -54,8 +58,24 @@ + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + diff --git a/ProjectLighthouse/Properties/Resources.Designer.cs b/ProjectLighthouse/Properties/Resources.Designer.cs new file mode 100644 index 00000000..7392bd4e --- /dev/null +++ b/ProjectLighthouse/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace LBPUnion.ProjectLighthouse.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LBPUnion.ProjectLighthouse.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/ProjectLighthouse/Properties/Resources.resx b/ProjectLighthouse/Properties/Resources.resx new file mode 100644 index 00000000..4fdb1b6a --- /dev/null +++ b/ProjectLighthouse/Properties/Resources.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file