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

1 files changed, 29 insertions, 9 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index cab3d2bfc..90fe33958 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using Tango.Logging;
 using Tango.Settings;
+using Tango.Web;
 
 namespace Tango.MachineStudio.Common
 {
@@ -18,6 +20,12 @@ namespace Tango.MachineStudio.Common
             public WindowState State { get; set; }
         }
 
+        public enum WorkingEnvironment
+        {
+            Remote,
+            Local
+        }
+
         /// <summary>
         /// Gets or sets the last login email.
         /// </summary>
@@ -39,13 +47,6 @@ namespace Tango.MachineStudio.Common
         public String LastVirtualMachineSerialNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets the update service address.
-        /// </summary>
-        public String UpdateServiceAddress { get; set; }
-
-        public String MachineServiceAddress { get; set; }
-
-        /// <summary>
         /// Gets or sets the allow beta release.
         /// </summary>
         public bool AcceptBetaRelease { get; set; }
@@ -91,16 +92,35 @@ namespace Tango.MachineStudio.Common
         public String LastMainModuleName { get; set; }
 
         /// <summary>
+        /// Gets or sets the working environment.
+        /// </summary>
+        public WorkingEnvironment Environment { get; set; }
+
+        /// <summary>
+        /// Gets or sets the deployment slot.
+        /// </summary>
+        public DeploymentSlot DeploymentSlot { get; set; }
+
+        /// <summary>
+        /// Gets the machine service address.
+        /// </summary>
+        /// <returns></returns>
+        public String GetMachineServiceAddress()
+        {
+            return DeploymentSlot.ToAddress();
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="MachineStudio"/> class.
         /// </summary>
         public MachineStudioSettings()
         {
             LastBounds = new Rect();
             LoggingCategories = new List<LogCategory>();
-            UpdateServiceAddress = "http://twine01/MachineStudioUpdateService/MachineStudioUpdateService.svc";
-            MachineServiceAddress = "http://machineservice.twine-srv.com/";
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
+            Environment = WorkingEnvironment.Remote;
+            DeploymentSlot = DeploymentSlot.DEV;
         }
     }
 }