aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-07 10:36:45 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-07 10:36:45 +0300
commit2ad0535760d78d0aaf2fe555a63c1fea86bf2710 (patch)
treed3f8335d40c1d0adcb31d1aa2b621e7e8ce6cf9d /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parent8c9dcb78af71f508c6ac70e0ca602727a5325b90 (diff)
parentd3aab2244dc51f3f8f8e0dea2d1514f79ff3b95c (diff)
downloadTango-2ad0535760d78d0aaf2fe555a63c1fea86bf2710.tar.gz
Tango-2ad0535760d78d0aaf2fe555a63c1fea86bf2710.zip
remote
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs6
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)
{