aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2019-09-19 11:26:07 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2019-09-19 11:26:07 +0300
commit0286fc4f7675459d660ec7a1b6a6a149376ad74e (patch)
tree8249643164d766e402ceb72211d5341b9f36136f /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parentc87fdf91d84a21ea5d1e3824166e11e645bb10ec (diff)
parent92b892d44f224e8c841e6ec83f38c7b5238aa075 (diff)
downloadTango-0286fc4f7675459d660ec7a1b6a6a149376ad74e.tar.gz
Tango-0286fc4f7675459d660ec7a1b6a6a149376ad74e.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs6
1 files changed, 6 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 fba037a6e..31b330c3f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/TFS/TeamFoundationServiceExtendedClient.cs
@@ -245,6 +245,12 @@ namespace Tango.MachineStudio.UI.TFS
}
}
+ if (app.Machine != null && app.ConnectedMachine != null && app.ConnectedMachine.DeviceInformation != null)
+ {
+ item.EmbeddedVersion = app.ConnectedMachine.DeviceInformation.Version;
+ item.MachineSerialNumber = app.Machine.SerialNumber;
+ }
+
String html = String.Empty;
using (var stream = EmbeddedResourceHelper.GetEmbeddedResourceStream("Tango.MachineStudio.UI.TFS.SystemInformationTemplate.cshtml"))