aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-07-25 15:44:00 +0300
committerAvi Levkovich <avi@twine-s.com>2018-07-25 15:44:00 +0300
commit76fb3f86bfaceb75220752cd5ef792eb3be464cc (patch)
tree76755bbae2bbe4ece5f474a11424a918dbf33b5b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher
parentcaf4be8968eed6738fdaa2486fa08ba601c45be4 (diff)
parentd5a855a3980a835460befab0acc36caa7f0230b7 (diff)
downloadTango-76fb3f86bfaceb75220752cd5ef792eb3be464cc.tar.gz
Tango-76fb3f86bfaceb75220752cd5ef792eb3be464cc.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs3
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs2
2 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 00bd895f3..8d2d617f0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -2,6 +2,7 @@
using Ionic.Zip;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
@@ -124,7 +125,7 @@ namespace Tango.MachineStudio.Publisher
private void UpdateVersions()
{
- CurrentVersion = typeof(MainWindowVM).Assembly.GetName().Version.ToString();
+ CurrentVersion = FileVersionInfo.GetVersionInfo(Core.Helpers.AssemblyHelper.GetCurrentAssemblyFolder() + "\\Tango.MachineStudio.UI.exe").ProductVersion;
LatestVersion = _client.GetLatestVersion();
}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
index e1e39d3aa..404cc4ae4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
[assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
[assembly: AssemblyTitle("Tango - Machine Studio Publish Utility")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.2.1411")]
[assembly: ComVisible(false)] \ No newline at end of file