From 2d6c44e45b2e6b9fcb76f162a3d4b8add59c9586 Mon Sep 17 00:00:00 2001
From: Christian Kratky <christian.kratky@googlemail.com>
Date: Thu, 16 Apr 2020 12:48:26 +0200
Subject: [PATCH] MQTTnet.Server: Fix version detection.

---
 Source/MQTTnet.Server/Controllers/ServerController.cs | 4 +++-
 Source/MQTTnet.Server/MQTTnet.Server.csproj           | 2 +-
 Source/MQTTnet.Server/Program.cs                      | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Source/MQTTnet.Server/Controllers/ServerController.cs b/Source/MQTTnet.Server/Controllers/ServerController.cs
index cf53bbaf..65ea0d84 100644
--- a/Source/MQTTnet.Server/Controllers/ServerController.cs
+++ b/Source/MQTTnet.Server/Controllers/ServerController.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
 using System.Reflection;
 
 namespace MQTTnet.Server.Controllers
@@ -12,7 +13,8 @@ namespace MQTTnet.Server.Controllers
         [HttpGet]
         public ActionResult<string> GetVersion()
         {
-            return Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
+            var fileVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
+            return fileVersion.ProductVersion.ToString();
         }
     }
 }
diff --git a/Source/MQTTnet.Server/MQTTnet.Server.csproj b/Source/MQTTnet.Server/MQTTnet.Server.csproj
index 967086ae..1ac001ec 100644
--- a/Source/MQTTnet.Server/MQTTnet.Server.csproj
+++ b/Source/MQTTnet.Server/MQTTnet.Server.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <StartupObject></StartupObject>
+    <StartupObject>MQTTnet.Server.Program</StartupObject>
     <UserSecretsId>c564f0de-28b4-45bf-b726-4d665d705653</UserSecretsId>
   </PropertyGroup>
 
diff --git a/Source/MQTTnet.Server/Program.cs b/Source/MQTTnet.Server/Program.cs
index 6ef1e948..571df2bf 100644
--- a/Source/MQTTnet.Server/Program.cs
+++ b/Source/MQTTnet.Server/Program.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Server.Web;
 using System;
+using System.Diagnostics;
 using System.Reflection;
 
 namespace MQTTnet.Server
@@ -58,8 +59,11 @@ namespace MQTTnet.Server
             Console.WriteLine(@"https://github.com/chkr1011/MQTTnet");
 
             Console.ForegroundColor = ConsoleColor.White;
+
+            var fileVersion = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
+
             Console.WriteLine($@"
-Version:    {Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion}
+Version:    {fileVersion.ProductVersion}
 License:    MIT (read LICENSE file)
 Sponsoring: https://opencollective.com/mqttnet
 Support:    https://github.com/chkr1011/MQTTnet/issues