merge

1 files changed, 16 insertions, 57 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs
index b84d11c37..26d6425bf 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.BugReporting/TFS/TeamFoundationServicePPCClient.cs
@@ -13,8 +13,6 @@ using Tango.PPC.Common.Connection;
 using Tango.TFS;
 using Tango.Core.ExtensionMethods;
 using Tango.Core.Helpers;
-using Tango.Settings;
-using Tango.PPC.Common;
 
 namespace Tango.PPC.BugReporting.TFS
 {
@@ -55,21 +53,6 @@ namespace Tango.PPC.BugReporting.TFS
             }
         }
 
-        private string[] GetLogFiles(FileLogger logger)
-        {
-            string[] fileEntries = new string[1];
-            fileEntries[0] = logger.LogFile;
-            string fileName = Path.GetFileNameWithoutExtension(logger.LogFile);
-            int indexPos = fileName.IndexOf(FileLogger.FILE_SET_EXTENSION);
-            if (indexPos > 0)
-            {
-                string extension = Path.GetExtension(logger.LogFile);
-                fileName = fileName.Substring(0, indexPos);
-                fileEntries = Directory.GetFiles(logger.Folder, $"{fileName}*{extension}").Where(x => Path.GetFileName(x).StartsWith(logger.Tag)).OrderBy(x => x.Length).ThenBy(x => x).ToArray();
-            }
-            return fileEntries;
-        }
-
         public async Task SubmitBug(String title, String steps, TeamMember createdBy, TeamMember assignedTo, Severity severity)
         {
             LogManager.Log("Submitting bug report...");
@@ -97,7 +80,6 @@ namespace Tango.PPC.BugReporting.TFS
                 item.Severity = severity;
                 item.State = State.New;
                 item.Type = WorkItemType.Bug;
-                item.Environment = SettingsManager.Default.GetOrCreate<PPCSettings>().DeploymentSlot.ToDescription();
 
                 FileLogger appFileLogger = LogManager.Default.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger;
                 FileLogger embeddedFileLogger = MachineOperator.EmbeddedLogManager.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger;
@@ -105,54 +87,31 @@ namespace Tango.PPC.BugReporting.TFS
                 if (appFileLogger != null)
                 {
                     LogManager.Log($"Attaching application log file ${appFileLogger.LogFile}");
-                    string[] logFiles = GetLogFiles(appFileLogger);
-                    foreach (string file in logFiles)
+
+                    var appLogFile = tempFolder.CreateImaginaryFile();
+                    File.Copy(appFileLogger.LogFile, appLogFile.Path);
+
+                    item.Attachments.Add(new Attachment()
                     {
-                        var appLogFile = tempFolder.CreateImaginaryFile();
-                        File.Copy(file, appLogFile.Path);
-                        item.Attachments.Add(new Attachment()
-                        {
-                            Description = "Application Log File",
-                            FilePath = appLogFile.Path,
-                            Name = Path.GetFileName(file),
-                        });
-                    }
+                        Description = "Application Log File",
+                        FilePath = appLogFile.Path,
+                        Name = Path.GetFileName(appFileLogger.LogFile),
+                    });
                 }
 
                 if (embeddedFileLogger != null && File.Exists(embeddedFileLogger.LogFile))
                 {
                     LogManager.Log($"Attaching embedded log file ${embeddedFileLogger.LogFile}");
 
-                    string[] logFiles = GetLogFiles(embeddedFileLogger);
-                    foreach (string file in logFiles)
-                    {
-                        var embeddedLogFile = tempFolder.CreateImaginaryFile();
-                        File.Copy(file, embeddedLogFile.Path);
-                        item.Attachments.Add(new Attachment()
-                        {
-                            Description = "Embedded Log File",
-                            FilePath = embeddedLogFile.Path,
-                            Name = Path.GetFileName(file),
-                        });
-                    }
-                }
+                    var embeddedLogFile = tempFolder.CreateImaginaryFile();
+                    File.Copy(embeddedFileLogger.LogFile, embeddedLogFile.Path);
 
-                //Add session log file..
-                if (MachineOperator.EnableSessionLogFile)
-                {
-                    var file = MachineOperator.SessionLogger.LogFile;
-
-                    if (file != null && File.Exists(file))
+                    item.Attachments.Add(new Attachment()
                     {
-                        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),
-                        });
-                    }
+                        Description = "Embedded Log File",
+                        FilePath = embeddedLogFile.Path,
+                        Name = Path.GetFileName(embeddedFileLogger.LogFile),
+                    });
                 }
 
                 SystemInformationModel sysModel = new SystemInformationModel();