merge conflicts

1 files changed, 14 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
index b3e121253..bfd5b0557 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
@@ -241,6 +241,20 @@ namespace Tango.MachineStudio.UI.TFS
                 }
             }
 
+            //Add session log file..
+            if (MachineOperator.EnableSessionLogFile)
+            {
+                var file = MachineOperator.SessionLogger.LogFile;
+                var sessionLogFile = _tempFolder.CreateImaginaryFile();
+                File.Copy(file, sessionLogFile.Path);
+                item.Attachments.Add(new Attachment()
+                {
+                    Description = "Session Log File",
+                    FilePath = sessionLogFile.Path,
+                    Name = Path.GetFileName(file),
+                });
+            }
+
             SystemInformationModel sysModel = new SystemInformationModel();
             sysModel.ApplicationVersion = app.Version.ToString();
             sysModel.EmbeddedVersion = "N/A";