From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Web/CheckForUpdatesResponse.cs                  |  2 --
 .../Web/DownloadLatestPPCVersionRequest.cs          | 14 --------------
 .../Web/DownloadLatestPPCVersionResponse.cs         | 21 ---------------------
 .../Web/DownloadLatestVersionResponse.cs            |  2 --
 .../Tango.MachineStudio.Common/Web/LoginMethod.cs   | 17 -----------------
 .../Tango.MachineStudio.Common/Web/LoginRequest.cs  |  1 -
 .../Tango.MachineStudio.Common/Web/LoginResponse.cs |  1 -
 .../Web/MachineStudioWebClientBase.cs               | 18 ------------------
 8 files changed, 76 deletions(-)
 delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionRequest.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionResponse.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs

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

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/CheckForUpdatesResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/CheckForUpdatesResponse.cs
index b78047c85..51608e6c4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/CheckForUpdatesResponse.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/CheckForUpdatesResponse.cs
@@ -17,7 +17,5 @@ namespace Tango.MachineStudio.Common.Web
         public String Comments { get; set; }
 
         public String BlobAddress { get; set; }
-
-        public String CdnAddress { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionRequest.cs
deleted file mode 100644
index 24d465e69..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionRequest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.Transport.Web;
-
-namespace Tango.MachineStudio.Common.Web
-{
-    public class DownloadLatestPPCVersionRequest : WebRequestMessage
-    {
-        public String SerialNumber { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionResponse.cs
deleted file mode 100644
index 2cc6b731a..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestPPCVersionResponse.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.Core;
-using Tango.Transport.Web;
-
-namespace Tango.MachineStudio.Common.Web
-{
-    public class DownloadLatestPPCVersionResponse : WebResponseMessage
-    {
-        public String Version { get; set; }
-
-        public String BlobAddress { get; set; }
-
-        public String CdnAddress { get; set; }
-
-        public DataSource DataSource { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestVersionResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestVersionResponse.cs
index 60251d455..3209b9a2f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestVersionResponse.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/DownloadLatestVersionResponse.cs
@@ -12,7 +12,5 @@ namespace Tango.MachineStudio.Common.Web
         public String Version { get; set; }
 
         public String BlobAddress { get; set; }
-
-        public String CdnAddress { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs
deleted file mode 100644
index 83f1c0850..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginMethod.cs
+++ /dev/null
@@ -1,17 +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.Web
-{
-    public enum LoginMethod
-    {
-        [Description("Active Directory")]
-        ActiveDirectory,
-        [Description("Standard User")]
-        StandardUser,
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs
index 1727a2c6e..577f5e208 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginRequest.cs
@@ -12,6 +12,5 @@ namespace Tango.MachineStudio.Common.Web
         public String Version { get; set; }
         public String Email { get; set; }
         public String Password { get; set; }
-        public LoginMethod Method { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginResponse.cs
index 3515c32d1..4ae22fa93 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginResponse.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/LoginResponse.cs
@@ -14,6 +14,5 @@ namespace Tango.MachineStudio.Common.Web
         public DataSource DataSource { get; set; }
         public bool VersionChangeRequired { get; set; }
         public String RequiredVersion { get; set; }
-        public bool PasswordChangeRequired { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs
index 72eb4acaa..131f89515 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Web/MachineStudioWebClientBase.cs
@@ -40,15 +40,6 @@ namespace Tango.MachineStudio.Common.Web
 
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MachineStudioWebClientBase"/> class.
-        /// </summary>
-        /// <param name="cloned">Other instance.</param>
-        public MachineStudioWebClientBase(MachineStudioWebClientBase cloned) : base(cloned)
-        {
-
-        }
-
         /// <summary>
         /// Executes the CheckForUpdates action and returns Tango.MachineStudio.Common.Web.CheckForUpdatesResponse.
         /// </summary>
@@ -103,14 +94,5 @@ namespace Tango.MachineStudio.Common.Web
             return Post<Tango.MachineStudio.Common.Web.RefreshTokenRequest, Tango.MachineStudio.Common.Web.RefreshTokenResponse>("RefreshToken", request);
         }
 
-        /// <summary>
-        /// Executes the DownloadLatestPPCVersion action and returns Tango.MachineStudio.Common.Web.DownloadLatestPPCVersionResponse.
-        /// </summary>
-        /// <returns></returns>
-        public Task<Tango.MachineStudio.Common.Web.DownloadLatestPPCVersionResponse> DownloadLatestPPCVersion(Tango.MachineStudio.Common.Web.DownloadLatestPPCVersionRequest request)
-        {
-            return Post<Tango.MachineStudio.Common.Web.DownloadLatestPPCVersionRequest, Tango.MachineStudio.Common.Web.DownloadLatestPPCVersionResponse>("DownloadLatestPPCVersion", request);
-        }
-
     }
 }
-- 
cgit v1.3.1