From 4b95b6c19bdf18e50068285b3b0a8a8ab0a7b4ce Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 24 Apr 2019 19:30:23 +0300
Subject: Machine Studio v4.0.13.0 PPC v1.0.11.0

---
 .../Tango.MachineStudio.Developer/Views/RunningJobView.xaml       | 8 +++++++-
 .../Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs  | 7 +++++--
 .../Tango.MachineStudio.UI/Properties/AssemblyInfo.cs             | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index dbe0d835b..d0f0c2af6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -194,7 +194,13 @@
                                 <DataGridTextColumn SortDirection="Descending" Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" />
                                 <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" />
                                 <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" />
-                                <DataGridTextColumn Header="MESSAGE" Width="1*" Binding="{Binding Description,Converter={StaticResource StringToEllipsisConverter},ConverterParameter=100}" />
+                                <DataGridTemplateColumn Header="MESSAGE" Width="1*">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Height="20" Text="{Binding Description,Converter={StaticResource StringToEllipsisConverter},ConverterParameter=100}" TextWrapping="NoWrap"></TextBlock>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
                             </DataGrid.Columns>
                         </DataGrid>
                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
index fb5fbc27c..92326f26f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Publish/MachineStudioPublisher.cs
@@ -201,8 +201,10 @@ namespace Tango.MachineStudio.Common.Publish
 
                     using (ZipFile zip = new ZipFile())
                     {
-                        zip.AddDirectory(Path.Combine(folder, "x86"), "/x86");
-                        zip.AddDirectory(Path.Combine(folder, "x64"), "/x64");
+                        foreach (var directory in Directory.GetDirectories(folder))
+                        {
+                            zip.AddDirectory(directory, $"/{Path.GetFileName(directory)}");
+                        }
 
                         var files = Directory.GetFiles(folder, "*.*", SearchOption.TopDirectoryOnly).ToList();
 
@@ -219,6 +221,7 @@ namespace Tango.MachineStudio.Common.Publish
                             }
                         };
 
+                        zip.ParallelDeflateThreshold = -1;
                         zip.Save(tempFile);
                     }
 
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 e50641d8d..a1601d9de 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("4.0.12.0")]
+[assembly: AssemblyVersion("4.0.13.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
-- 
cgit v1.3.1