diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-23 13:25:37 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-23 13:25:37 +0300 |
| commit | 658d3d07ed46c6fdb7276b614a93b78c3e02060f (patch) | |
| tree | 17f5ad6851a497d1af97f239cc48268638d7e08e /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 44f71ccd29edeeb13621996659232fca4554faf1 (diff) | |
| download | Tango-658d3d07ed46c6fdb7276b614a93b78c3e02060f.tar.gz Tango-658d3d07ed46c6fdb7276b614a93b78c3e02060f.zip | |
Fixed some issues with MS 3.0
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs | 7 |
2 files changed, 3 insertions, 6 deletions
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 3e03d33f8..9599dd8cf 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/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")] -[assembly: AssemblyVersion("3.0.25.18235")] +[assembly: AssemblyVersion("3.0.30.18235")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs index 6dbc99591..c5831f701 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/UpdateViewVM.cs @@ -294,9 +294,6 @@ namespace Tango.MachineStudio.UI.ViewModels } } - //Copy new updater utility to app path. - File.Copy(Path.Combine(_newPackageTempFolder, "Tango.MachineStudio.Updater.exe"), Path.Combine(_appPath, "Tango.MachineStudio.Updater.exe"), true); - TangoIOC.Default.GetInstance<MainViewVM>().DisableCheckForUpdates = true; Status = UpdateStatus.UpdateCompleted; } @@ -322,9 +319,9 @@ namespace Tango.MachineStudio.UI.ViewModels try { Process p = new Process(); - p.StartInfo.FileName = _appPath + "\\Tango.MachineStudio.Updater.exe"; + p.StartInfo.FileName = _newPackageTempFolder + "\\Tango.MachineStudio.Updater.exe"; p.StartInfo.UseShellExecute = true; - p.StartInfo.Arguments = _newPackageTempFolder; + p.StartInfo.Arguments = _appPath; p.Start(); } catch (Exception ex) |