diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-06 16:12:38 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-06 16:12:38 +0300 |
| commit | 778408ff6140099aace10a915bc0296d71f967fe (patch) | |
| tree | 40bbfabe96128d777f793f0b8d14b059d0f88ce2 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 65d06cf7d023cfed8a1619cb2f81279b1d5096f8 (diff) | |
| parent | ce34a07e9ae75c9172425322248dc2fd1754852e (diff) | |
| download | Tango-778408ff6140099aace10a915bc0296d71f967fe.tar.gz Tango-778408ff6140099aace10a915bc0296d71f967fe.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
2 files changed, 4 insertions, 4 deletions
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 2d1a79111..ea359e8bb 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("2.2.15.18214")] +[assembly: AssemblyVersion("2.4.18.18218")] [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 dbae25e70..6225e1480 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs @@ -86,7 +86,7 @@ namespace Tango.MachineStudio.UI.TFS public async Task<WorkItem> CloseWorkItem(WorkItem workItem) { await SetWorkItemState(Project, workItem, State.Closed); - var updated = await AddWorkItemComment(Project, workItem, GetUserTeamMember(), "Bug has been verified and closed by " + GetUserTeamMember().DisplayName + " (via Tango Software)."); + var updated = await AddWorkItemComment(Project, workItem, GetUserTeamMember(), "Bug has been verified and closed by " + GetUserTeamMember().DisplayName + " (via Machine Studio)."); ResolvedWorkItems.Remove(workItem); return updated; } @@ -94,7 +94,7 @@ namespace Tango.MachineStudio.UI.TFS public async Task<WorkItem> ReactivateWorkItem(WorkItem workItem) { await SetWorkItemState(Project, workItem, State.New); - var updated = await AddWorkItemComment(Project, workItem, GetUserTeamMember(), "Bug has been reactivated by " + GetUserTeamMember().DisplayName + " (via Tango Software)."); + var updated = await AddWorkItemComment(Project, workItem, GetUserTeamMember(), "Bug has been reactivated by " + GetUserTeamMember().DisplayName + " (via Machine Studio)."); updated = await SetWorkItemAssignment(Project, updated, workItem.ResolvedBy); ResolvedWorkItems.Remove(workItem); return updated; @@ -219,7 +219,7 @@ namespace Tango.MachineStudio.UI.TFS Name = "Machine Configuration.jpg" }); - sysModel.ConfigurationString = machine.Configuration.CloneConfiguration().ToJsonString(nameof(Configuration.MachinesConfigurations), nameof(Configuration.MachineVersions)); + sysModel.ConfigurationString = machine.Configuration.Clone().ToJsonString(nameof(Configuration.MachinesConfigurations), nameof(Configuration.MachineVersions)); if (app.ConnectedMachine.CurrentProcessParameters != null) { |