aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-02-18 18:48:16 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-02-18 18:48:16 +0200
commit95b4e14bc4e06ffb94199f5ec4e0d2d9bebceeff (patch)
treede29ed87bd7c7b966d35b6f6bc8b13d65313c88c /Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs
parent99136fc92c8b75c3783f543051c065c28961d393 (diff)
downloadTango-95b4e14bc4e06ffb94199f5ec4e0d2d9bebceeff.tar.gz
Tango-95b4e14bc4e06ffb94199f5ec4e0d2d9bebceeff.zip
Working on new developer module.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs')
-rw-r--r--Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs
index fc7184be1..dedd1c628 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
using System.Linq;
using Tango.DAL.Remote.DB;
@@ -58,6 +60,7 @@ namespace Tango.Integration.Observables
/// </summary>
[Column("DEFAULT_CONFIGURATION_GUID")]
[ForeignKey("DefaultConfiguration")]
+
public String DefaultConfigurationGuid
{
get
@@ -77,6 +80,8 @@ namespace Tango.Integration.Observables
/// Gets or sets the machineversion configuration.
/// </summary>
+ [XmlIgnore]
+ [JsonIgnore]
public virtual Configuration DefaultConfiguration
{
get