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

7 files changed, 20 insertions, 29 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 53171a1a3..bdd341592 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -33,7 +33,7 @@ namespace Tango.MachineStudio.UI
         private WpfGlobalExceptionTrapper exceptionTrapper;
         private LogManager LogManager = LogManager.Default;
 
-        protected override void OnStartup(StartupEventArgs e)
+        protected override void OnStartup(StartupEventArgs e) 
         {
 
 #if DEBUG
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 5cdfd162a..20e399b44 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,4 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
+[assembly: AssemblyVersion("2.0.8.18204")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs
index 5ff36aae1..c035ee88d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.Designer.cs
@@ -59,14 +59,5 @@ namespace Tango.MachineStudio.UI.Properties {
                 resourceCulture = value;
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        internal static string BuildDate {
-            get {
-                return ResourceManager.GetString("BuildDate", resourceCulture);
-            }
-        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx
index 32307e87f..1af7de150 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/Resources.resx
@@ -117,8 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
deleted file mode 100644
index d7f0f1ad3..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ /dev/null
@@ -1 +0,0 @@
-19-Jul-18 14:12:44.53 
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");
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 4d581795b..630a02ee0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -133,8 +133,8 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <EmbeddedResource Include="Console\CodeTemplate.cs" />
-    <Compile Include="..\..\Versioning\MachineStudio.cs">
-      <Link>MachineStudio.cs</Link>
+    <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Console\ConsoleManager.cs" />
     <Compile Include="Console\ConsoleOnExecuteParameters.cs" />
@@ -488,14 +488,10 @@
     <Resource Include="Images\settings.png" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Versioning\CoreChangeLog.txt">
-      <Link>ChangeLogs\CoreChangeLog.txt</Link>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\..\Versioning\MachineStudioChangeLog.txt">
-      <Link>ChangeLogs\MachineStudioChangeLog.txt</Link>
+    <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt">
+      <Link>ChangeLog.txt</Link>
     </EmbeddedResource>
     <Content Include="Html\HTML Templates\Thread Break.html" />
-    <Resource Include="Resources\BuildDate.txt" />
     <Resource Include="machine.ico" />
     <Resource Include="Images\bug-resolved.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -505,12 +501,13 @@
     <EmbeddedResource Include="TFS\SystemInformationTemplate.cshtml" />
     <Resource Include="Images\bug.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Debug $(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk"
 
-echo %25date%25 %25time%25 &gt; "$(ProjectDir)\Resources\BuildDate.txt"
-
 RD /S /Q "$(TargetDir)cs\"
 RD /S /Q "$(TargetDir)da\"
 RD /S /Q "$(TargetDir)de\"
@@ -563,4 +560,9 @@ RD /S /Q "$(TargetDir)nb-NO\"</PostBuildEvent>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file