From 1b22753c99829babf36c95b2a62f51f6edceac5f Mon Sep 17 00:00:00 2001 From: glopesdev Date: Tue, 16 Jul 2024 06:14:52 +0100 Subject: [PATCH] Drop version build metadata for official releases --- Bonsai.Core/WorkflowBuilder.cs | 10 ++++++++-- Bonsai.Editor/AboutBox.cs | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Bonsai.Core/WorkflowBuilder.cs b/Bonsai.Core/WorkflowBuilder.cs index 58a43759..53b07a72 100644 --- a/Bonsai.Core/WorkflowBuilder.cs +++ b/Bonsai.Core/WorkflowBuilder.cs @@ -200,8 +200,14 @@ void IXmlSerializable.WriteXml(XmlWriter writer) writer = new XmlExtensionWriter(writer, genericTypes); var assembly = Assembly.GetExecutingAssembly(); - var versionInfo = FileVersionInfo.GetVersionInfo(assembly.Location); - writer.WriteAttributeString(VersionAttributeName, versionInfo.ProductVersion); + var version = FileVersionInfo.GetVersionInfo(assembly.Location).ProductVersion; +#if BUILD_KIND_OFFICIAL_RELEASE + // Drop build metadata for official releases + var plus = version.IndexOf('+'); + if (plus >= 0) + version = version.Substring(0, plus); +#endif + writer.WriteAttributeString(VersionAttributeName, version); var namespaceDeclarations = GetXmlSerializerNamespaces(types); foreach (var qname in namespaceDeclarations) diff --git a/Bonsai.Editor/AboutBox.cs b/Bonsai.Editor/AboutBox.cs index 442d3ee7..a30a103b 100644 --- a/Bonsai.Editor/AboutBox.cs +++ b/Bonsai.Editor/AboutBox.cs @@ -60,7 +60,12 @@ public string AssemblyVersion { get { - return FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion; + var productVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion; +#if BUILD_KIND_OFFICIAL_RELEASE + return SemanticVersion.Parse(productVersion).ToString(); +#else + return productVersion; +#endif } }