diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-02 17:15:51 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-02 17:15:51 +0300 |
| commit | 75a25525976e0537e714fb2ed77acb891cfb308a (patch) | |
| tree | fe56ed1c7cbfc932f62947fcfba408df8b761492 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | 66cf568417836f0d6d6d3b7ecbb3a0df5cc65b6c (diff) | |
| parent | 706cc1daaea7e42dc3ad1e4587d61db042809de0 (diff) | |
| download | Tango-75a25525976e0537e714fb2ed77acb891cfb308a.tar.gz Tango-75a25525976e0537e714fb2ed77acb891cfb308a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
2 files changed, 6 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs index 8347c3144..79c032967 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs @@ -218,7 +218,7 @@ namespace Tango.MachineStudio.Common.EventLogging } } - LogManager.Log("Logging event " + machineEvent.EventType.Name + " - " + machineEvent.Description); + LogManager.Log("Logging event " + machineEvent.EventType.Name); machineEvent.MachineGuid = _application.Machine.Guid; machineEvent.UserGuid = _authentication.CurrentUser.Guid; machineEvent.User = _authentication.CurrentUser; 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); } |