From b50b7ddb4c231810d17e0141bb77437718b10110 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 1 Jan 2019 14:30:20 +0200
Subject: Some more work on environments...

---
 .../Tango.MachineStudio.Common/DeploymentSlots.cs  | 23 ----------------------
 .../MachineStudioSettings.cs                       |  7 ++++---
 .../Tango.MachineStudio.Common.csproj              |  7 +++++--
 .../Update/CheckForUpdatesRequest.cs               |  4 +---
 .../Update/UploadCompletedRequest.cs               |  4 ++--
 5 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/DeploymentSlots.cs

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/DeploymentSlots.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/DeploymentSlots.cs
deleted file mode 100644
index b2bfabd54..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/DeploymentSlots.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.MachineStudio.Common
-{
-    public enum DeploymentSlots
-    {
-        [Description("https://machineservice-dev.twine-srv.com")]
-        Development,
-        [Description("https://machineservice-test.twine-srv.com")]
-        Testing,
-        [Description("https://machineservice-process.twine-srv.com")]
-        Process,
-        [Description("https://machineservice-stage.twine-srv.com")]
-        Staging,
-        [Description("https://machineservice.twine-srv.com")]
-        Production
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index cbaeb9d2e..90fe33958 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using Tango.Logging;
 using Tango.Settings;
+using Tango.Web;
 
 namespace Tango.MachineStudio.Common
 {
@@ -98,7 +99,7 @@ namespace Tango.MachineStudio.Common
         /// <summary>
         /// Gets or sets the deployment slot.
         /// </summary>
-        public DeploymentSlots DeploymentSlot { get; set; }
+        public DeploymentSlot DeploymentSlot { get; set; }
 
         /// <summary>
         /// Gets the machine service address.
@@ -106,7 +107,7 @@ namespace Tango.MachineStudio.Common
         /// <returns></returns>
         public String GetMachineServiceAddress()
         {
-            return DeploymentSlot.ToDescription();
+            return DeploymentSlot.ToAddress();
         }
 
         /// <summary>
@@ -119,7 +120,7 @@ namespace Tango.MachineStudio.Common
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
             Environment = WorkingEnvironment.Remote;
-            DeploymentSlot = DeploymentSlots.Development;
+            DeploymentSlot = DeploymentSlot.DEV;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 58a0d5f7e..704223d17 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -94,7 +94,6 @@
     <Compile Include="Controls\TableGrid.cs" />
     <Compile Include="Converters\PermissionToVisibilityConverter.cs" />
     <None Include="Converters\SecondsToGraphPointsConverter.cs" />
-    <Compile Include="DeploymentSlots.cs" />
     <Compile Include="Diagnostics\DefaultDiagnosticsFrameProvider.cs" />
     <Compile Include="Diagnostics\IDiagnosticsFrameProvider.cs" />
     <Compile Include="EventLogging\DefaultEventLogger.cs" />
@@ -269,6 +268,10 @@
       <Project>{9652f972-2bd1-4283-99cb-fc6240434c17}</Project>
       <Name>Tango.Video</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Web\Tango.Web.csproj">
+      <Project>{5001990f-977b-48ff-b217-0236a5022ad8}</Project>
+      <Name>Tango.Web</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="bip.wav" />
@@ -309,7 +312,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesRequest.cs
index cf06e678d..ce700adbf 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesRequest.cs
@@ -8,10 +8,8 @@ using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    public class CheckForUpdatesRequest : WebRequestMessage
+    public class CheckForUpdatesRequest : WebRequestSecureMessage
     {
-        public String Token { get; set; }
-
         public String Version { get; set; }
 
         public bool AcceptBetaRelease { get; set; }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedRequest.cs
index fc478db50..d23d57351 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedRequest.cs
@@ -8,8 +8,8 @@ using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    public class UploadCompletedRequest : WebRequestMessage
+    public class UploadCompletedRequest : WebRequestSecureMessage
     {
-        public String Token { get; set; }
+        
     }
 }
-- 
cgit v1.3.1