From dcdee2479e0dc709835e97853bb9db0349210336 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 15 Nov 2018 16:21:13 +0200 Subject: Machine Studio v3.5.70 Stable. Added stable/beta release modes. Handle corrupted log file names. --- .../MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 31e297cd1..58dfc17c2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -367,6 +367,7 @@ namespace Tango.MachineStudio.UI.ViewModels Email = _authenticationProvider.CurrentUser.Email, Password = _authenticationProvider.CurrentUser.Password, Version = _applicationManager.Version.ToString(), + AcceptBetaRelease = _settings.AcceptBetaRelease, }); IsUpdateAvailable = response.IsUpdateAvailable; -- cgit v1.3.1 From 0c5b05f3a17810f42125c5b28c752762eb9b7e7e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 19 Nov 2018 14:26:05 +0200 Subject: Machine Studio v3.5.71 --- .../Build/Shortcuts/Machine Studio.lnk | Bin 1532 -> 1532 bytes .../Properties/AssemblyInfo.cs | 2 +- .../TFS/TeamFoundationServiceExtendedClient.cs | 27 ++++++++++++++++++--- .../ViewModels/MainViewVM.cs | 12 ++++++++- 4 files changed, 35 insertions(+), 6 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs') diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index 7875a2732..6336d80ca 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ 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 1591de4ac..6c3f5fc27 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.70.18305")] +[assembly: AssemblyVersion("3.5.71.18305")] [assembly: ComVisible(false)] \ No newline at end of file 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 6753fec73..0ff66f355 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.IO; using System.Linq; +using System.Security.Authentication; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -23,6 +24,7 @@ namespace Tango.MachineStudio.UI.TFS public class TeamFoundationServiceExtendedClient : TeamFoundationServiceClient { private TemporaryFolder _tempFolder; + private String user_email; public Project Project { get; private set; } @@ -52,6 +54,8 @@ namespace Tango.MachineStudio.UI.TFS { if (user != null) { + user_email = user.Email; + Task.Factory.StartNew(async () => { Thread.Sleep(5000); @@ -72,9 +76,18 @@ namespace Tango.MachineStudio.UI.TFS if (Project != null) { IStudioApplicationManager app = TangoIOC.Default.GetInstance(); - var items = await GetWorkItemsCreatedBy(Project, GetUserTeamMember()); - items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("
", "").Replace("
", "")); - ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < app.Version).ToObservableCollection(); + var member = GetUserTeamMember(); + + if (member != null) + { + var items = await GetWorkItemsCreatedBy(Project, member); + items.Where(x => x.StepsToReproduce != null).ToList().ForEach(x => x.StepsToReproduce = x.StepsToReproduce.Replace("
", "").Replace("
", "")); + ResolvedWorkItems = items.Where(x => x.State == State.Resolved && x.ResolvedReason == ResolvedReason.Fixed && x.IsBuildVersionValid && x.FoundInBuildVersion < app.Version).ToObservableCollection(); + } + else + { + LogManager.Default.Log($"User '{user_email}' is not part of the VSTS team.", LogCategory.Warning); + } } } catch (Exception ex) @@ -130,6 +143,12 @@ namespace Tango.MachineStudio.UI.TFS item.Iteration = Project.Iterations.FirstOrDefault(); TeamMember currentUser = GetUserTeamMember(); + + if (currentUser == null) + { + throw LogManager.Default.Log(new AuthenticationException($"User '{user_email}' is not part of the Tango VSTS team. Please contact your administrator.")); + } + item.CreatedBy = currentUser; item.ChangedBy = currentUser; item.AuthorizedAs = currentUser; @@ -207,7 +226,7 @@ namespace Tango.MachineStudio.UI.TFS machineView.PanelColumnDefinition.Width = new GridLength(0); machineView.stackHeader.Visibility = Visibility.Collapsed; machineView.Background = System.Windows.Media.Brushes.White; - + var machineDesignerVM = new MachineDesigner.ViewModels.MainViewVM(); machineDesignerVM.SetSelectedMachine(machine); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 58dfc17c2..70378a4d5 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -804,7 +804,17 @@ namespace Tango.MachineStudio.UI.ViewModels private void ReportIssue() { - var bug = TFSClient.CreateBug(); + Tango.TFS.WorkItem bug = null; + + try + { + bug = TFSClient.CreateBug(); + } + catch (Exception ex) + { + _notificationProvider.ShowError(ex.Message); + return; + } _notificationProvider.ShowModalDialog(new ReportIssueViewVM(TFSClient.Project, bug), async (vm) => { -- cgit v1.3.1