diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-10-21 12:01:25 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-10-21 12:01:25 +0300 |
| commit | 91082afaed2e859e42bad9b06739075689e71b3e (patch) | |
| tree | 481ca7875d76d36f8372657826ce487fb795cca3 | |
| parent | 0c0812bf93ab73acdadf5301098898d63577d903 (diff) | |
| download | Tango-91082afaed2e859e42bad9b06739075689e71b3e.tar.gz Tango-91082afaed2e859e42bad9b06739075689e71b3e.zip | |
Machine Studio v3.5.52
| -rw-r--r-- | Software/DB/PPC/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/PPC/Tango_log.ldf | bin | 20578304 -> 20578304 bytes | |||
| -rw-r--r-- | Software/DB/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/Tango_log.ldf | bin | 15400960 -> 15400960 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs | 9 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/Notes/Tango.Notes/VMWare/License Key.txt | 1 |
8 files changed, 11 insertions, 2 deletions
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex 6af5b96da..0aa50731d 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex 4c4ede525..ece8dfff7 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 114bcfd58..988b4343e 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 900c37347..4b8126aa0 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs index 9989aa091..feb1e41b3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -41,7 +41,14 @@ namespace Tango.MachineStudio.UI { InitializeComponent(); - _is_testing = TestHelper.IsRunningUnderTestStudio(); + try + { + _is_testing = TestHelper.IsRunningUnderTestStudio(); + } + catch (Exception ex) + { + LogManager.Log(ex, LogCategory.Warning, "An error occurred while trying to get the parent process of machine studio."); + } if (!_is_testing) { 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 075832b06..d4690c6b5 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.5.51.18238")] +[assembly: AssemblyVersion("3.5.52.18238")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj index 75d1f4bf8..66f30b1a4 100644 --- a/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj +++ b/Software/Visual_Studio/Notes/Tango.Notes/Tango.Notes.csproj @@ -47,6 +47,7 @@ <Content Include="PPC\Remote Debugging.txt" /> <Content Include="PPC\Windows 10 LTSB.txt" /> <Content Include="PPC\Touch.txt" /> + <Content Include="VMWare\License Key.txt" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> diff --git a/Software/Visual_Studio/Notes/Tango.Notes/VMWare/License Key.txt b/Software/Visual_Studio/Notes/Tango.Notes/VMWare/License Key.txt new file mode 100644 index 000000000..918865947 --- /dev/null +++ b/Software/Visual_Studio/Notes/Tango.Notes/VMWare/License Key.txt @@ -0,0 +1 @@ +1N2AJ-6Z01K-H8UD9-080RK-1T9K4
\ No newline at end of file |