Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 6 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index fdad31251..4290a9b71 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -56,6 +56,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     {
                         TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationStarted());
                     };
+
+                    LogManager.LogReferencedAssemblies();
                 });
             });
         }
@@ -135,7 +137,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return typeof(DefaultStudioApplicationManager).Assembly.GetName().Version.ToString();
+                return AssemblyHelper.GetCurrentAssemblyVersion().ToString(3);
             }
         }
 
@@ -264,7 +266,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return typeof(ExtendedObject).Assembly.GetName().Version.ToString();
+                return typeof(ExtendedObject).Assembly.GetName().Version.ToString(3); 
             }
         }
 
@@ -275,7 +277,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return Properties.Resources.BuildDate;
+                return AssemblyHelper.GetCurrentAssemblyBuildDate().ToShortDateString();
             }
         }
 
@@ -286,7 +288,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
         {
             get
             {
-                return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.MachineStudioChangeLog.txt") + Environment.NewLine + Environment.NewLine + Environment.NewLine + EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLogs.CoreChangeLog.txt");
+                return EmbeddedResourceHelper.GetEmbeddedResourceText("Tango.MachineStudio.UI.ChangeLog.txt");
             }
         }
     }