Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 13 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index f7c05c1a8..e5fe63d87 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using Tango.BL;
 using Tango.Logging;
 using Tango.PMR.Printing;
 using Tango.Settings;
@@ -108,6 +109,16 @@ namespace Tango.MachineStudio.Common
         public bool ByPassEnvironmentVersionCheck { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether to enable database entity caching.
+        /// </summary>
+        public ObservablesContextInMemoryCachingMode CachingMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum cache time for a single entity (when CachingMode is set Absolute or Relative).
+        /// </summary>
+        public TimeSpan MaximumCacheTime { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         public String MachineServiceAddress
@@ -136,6 +147,8 @@ namespace Tango.MachineStudio.Common
             Environment = WorkingEnvironment.Remote;
             DeploymentSlot = DeploymentSlot.DEV;
             JobUploadStrategy = JobUploadStrategy.Default;
+            MaximumCacheTime = TimeSpan.FromMinutes(5);
+            CachingMode = ObservablesContextInMemoryCachingMode.None;
         }
     }
 }