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

17 files changed, 181 insertions, 205 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
index 0c2aa3cb7..785dc1523 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs
@@ -13,6 +13,11 @@ namespace Tango.MachineStudio.Common.Authentication
     public interface IAuthenticationProvider 
     {
         /// <summary>
+        /// Gets the access token that was retrieved at the last login.
+        /// </summary>
+        String AccessToken { get; }
+
+        /// <summary>
         /// Occurs when the current logged-in user has changed.
         /// </summary>
         event EventHandler<User> CurrentUserChanged;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs
new file mode 100644
index 000000000..762fb5dd5
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginRequest.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Transport.Web;
+
+namespace Tango.MachineStudio.Common.Authentication
+{
+    public class LoginRequest : WebRequestMessage
+    {
+        public String Email { get; set; }
+        public String Password { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs
new file mode 100644
index 000000000..3da033b9f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs
@@ -0,0 +1,16 @@
+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.Authentication
+{
+    public class LoginResponse : WebResponseMessage
+    {
+        public DataSource DataSource { get; set; }
+        public String Token { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/DefaultJobRunsLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/DefaultJobRunsLogger.cs
deleted file mode 100644
index b405a6729..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/DefaultJobRunsLogger.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL;
-using Tango.BL.Entities;
-using Tango.BL.Enumerations;
-using Tango.Core;
-using Tango.Core.DI;
-using Tango.Integration.ExternalBridge;
-using Tango.Integration.Operation;
-using Tango.MachineStudio.Common.StudioApplication;
-
-namespace Tango.MachineStudio.Common.JobRunsLogging
-{
-    public class DefaultJobRunsLogger : ExtendedObject, IJobRunsLogger
-    {
-        private ObservablesContext _context;
-        private DateTime _start_date;
-        private Job _job;
-        private IStudioApplicationManager applicationManager;
-
-        public void Init(IStudioApplicationManager appManager)
-        {
-            applicationManager = appManager;
-            _context = ObservablesContext.CreateDefault();
-            applicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
-        }
-
-        private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machine)
-        {
-            if (machine != null)
-            {
-                machine.PrintingStarted -= Machine_PrintingStarted;
-                machine.PrintingStarted += Machine_PrintingStarted;
-                machine.PrintingCompleted -= Machine_PrintingCompleted;
-                machine.PrintingCompleted += Machine_PrintingCompleted;
-                machine.PrintingAborted -= Machine_PrintingAborted;
-                machine.PrintingAborted += Machine_PrintingAborted;
-                machine.PrintingFailed -= Machine_PrintingFailed;
-                machine.PrintingFailed += Machine_PrintingFailed;
-            }
-        }
-
-        private void Machine_PrintingFailed(object sender, PrintingFailedEventArgs e)
-        {
-            if (e.Job.Guid == _job.Guid)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    _context.JobRuns.Add(new JobRun()
-                    {
-                        StartDate = _start_date,
-                        EndDate = DateTime.UtcNow,
-                        JobGuid = _job.Guid,
-                        JobRunStatus = JobRunStatus.Failed,
-                        EndPosition = e.JobHandler.Status.Progress,
-                        FailedMessage = e.Exception.Message,
-                    });
-
-                    _context.SaveChanges();
-                });
-            }
-        }
-
-        private void Machine_PrintingAborted(object sender, PrintingEventArgs e)
-        {
-            if (e.Job.Guid == _job.Guid)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    _context.JobRuns.Add(new JobRun()
-                    {
-                        StartDate = _start_date,
-                        EndDate = DateTime.UtcNow,
-                        JobGuid = _job.Guid,
-                        EndPosition = e.JobHandler.Status.Progress,
-                        JobRunStatus = JobRunStatus.Aborted,
-                    });
-
-                    _context.SaveChanges();
-                });
-            }
-        }
-
-        private void Machine_PrintingCompleted(object sender, PrintingEventArgs e)
-        {
-            if (e.Job.Guid == _job.Guid)
-            {
-                Task.Factory.StartNew(() =>
-                {
-                    _context.JobRuns.Add(new JobRun()
-                    {
-                        StartDate = _start_date,
-                        EndDate = DateTime.UtcNow,
-                        JobGuid = _job.Guid,
-                        EndPosition = e.JobHandler.Status.Progress,
-                        JobRunStatus = JobRunStatus.Completed,
-                    });
-
-                    _context.SaveChanges();
-                });
-            }
-        }
-
-        private void Machine_PrintingStarted(object sender, PrintingEventArgs e)
-        {
-            _job = e.Job;
-            _start_date = DateTime.UtcNow;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/IJobRunsLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/IJobRunsLogger.cs
deleted file mode 100644
index c3eca953b..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/JobRunsLogging/IJobRunsLogger.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.MachineStudio.Common.StudioApplication;
-
-namespace Tango.MachineStudio.Common.JobRunsLogging
-{
-    public interface IJobRunsLogger
-    {
-        void Init(IStudioApplicationManager appManager);
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 67e052ecc..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,11 +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; }
-
-        /// <summary>
         /// Gets or sets the allow beta release.
         /// </summary>
         public bool AcceptBetaRelease { get; set; }
@@ -89,15 +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";
             DefaultIssueReportTags = new List<string>();
             StudioModulesBounds = new List<StudioModuleBounds>();
+            Environment = WorkingEnvironment.Remote;
+            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 8cf65a13d..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
@@ -75,6 +75,8 @@
     <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Authentication\LoginRequest.cs" />
+    <Compile Include="Authentication\LoginResponse.cs" />
     <Compile Include="AutoComplete\MachinesProvider.cs" />
     <Compile Include="Automation\Developer.cs" />
     <Compile Include="Automation\UI.cs" />
@@ -102,8 +104,6 @@
     <Compile Include="Html\IHtmlPresenter.cs" />
     <None Include="Helpers\GraphsHelper.cs" />
     <Compile Include="IStudioViewModel.cs" />
-    <Compile Include="JobRunsLogging\DefaultJobRunsLogger.cs" />
-    <Compile Include="JobRunsLogging\IJobRunsLogger.cs" />
     <Compile Include="MachineStudioSettings.cs" />
     <Compile Include="Messages\MachineConnectionChangedMessage.cs" />
     <Compile Include="Navigation\INavigationBlocker.cs" />
@@ -122,8 +122,12 @@
     <Compile Include="Update\CheckForUpdatesResponse.cs" />
     <Compile Include="Update\CheckForUpdatesRequest.cs" />
     <Compile Include="Update\IMachineStudioUpdateService.cs" />
-    <Compile Include="Update\UpdateServiceHelper.cs" />
+    <Compile Include="Update\LatestVersionRequest.cs" />
+    <Compile Include="Update\LatestVersionResponse.cs" />
+    <Compile Include="Update\MachineStudioUpdateService.cs" />
+    <None Include="Update\UpdateServiceHelper.cs" />
     <Compile Include="Update\UploadCompletedRequest.cs" />
+    <Compile Include="Update\UploadCompletedResponse.cs" />
     <Compile Include="Update\UploadVersionRequest.cs" />
     <Compile Include="Update\UploadVersionResponse.cs" />
     <Compile Include="ValidationRules\Required.cs" />
@@ -264,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" />
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 0047e311b..ce700adbf 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesRequest.cs
@@ -4,22 +4,14 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    [DataContract]
-    public class CheckForUpdatesRequest
+    public class CheckForUpdatesRequest : WebRequestSecureMessage
     {
-        [DataMember]
-        public String Email { get; set; }
-
-        [DataMember]
-        public String Password { get; set; }
-
-        [DataMember]
         public String Version { get; set; }
 
-        [DataMember]
         public bool AcceptBetaRelease { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs
index f34f12d8f..ae1e958ab 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/CheckForUpdatesResponse.cs
@@ -4,37 +4,20 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    [DataContract]
-    public class CheckForUpdatesResponse
+    public class CheckForUpdatesResponse : WebResponseMessage
     {
-        [DataMember]
         public bool IsUpdateAvailable { get; set; }
 
-        [DataMember]
         public bool IsStable { get; set; }
 
-        [DataMember]
         public String Version { get; set; }
 
-        [DataMember]
         public String Comments { get; set; }
 
-        [DataMember]
-        public String FtpHost { get; set; }
-
-        [DataMember]
-        public String FilePath { get; set; }
-
-        [DataMember]
-        public String UserName { get; set; }
-
-        [DataMember]
-        public String Password { get; set; }
-
-        [DataMember]
-        public bool ForcedUpdate { get; set; }
+        public String BlobAddress { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/IMachineStudioUpdateService.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/IMachineStudioUpdateService.cs
index 53e49e52c..4a7df7caa 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/IMachineStudioUpdateService.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/IMachineStudioUpdateService.cs
@@ -4,23 +4,19 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.ServiceModel;
 using System.Text;
+using System.Threading.Tasks;
 using Tango.MachineStudio.Common.Update;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    [ServiceContract]
     public interface IMachineStudioUpdateService
     {
-        [OperationContract]
-        CheckForUpdatesResponse CheckForUpdates(CheckForUpdatesRequest request);
+        Task<CheckForUpdatesResponse> CheckForUpdates(CheckForUpdatesRequest request);
 
-        [OperationContract]
-        UploadVersionResponse UploadVersion(UploadVersionRequest request);
+        Task<UploadVersionResponse> UploadVersion(UploadVersionRequest request);
 
-        [OperationContract]
-        void NotifyUploadCompleted(UploadCompletedRequest request);
+        Task<UploadCompletedResponse> NotifyUploadCompleted(UploadCompletedRequest request);
 
-        [OperationContract]
-        String GetLatestVersion();
+        Task<LatestVersionResponse> GetLatestVersion(LatestVersionRequest request);
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/LatestVersionRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/LatestVersionRequest.cs
new file mode 100644
index 000000000..b4e7bd975
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/LatestVersionRequest.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Transport.Web;
+
+namespace Tango.MachineStudio.Common.Update
+{
+    public class LatestVersionRequest : WebRequestMessage
+    {
+        
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/LatestVersionResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/LatestVersionResponse.cs
new file mode 100644
index 000000000..b90cbf370
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/LatestVersionResponse.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Transport.Web;
+
+namespace Tango.MachineStudio.Common.Update
+{
+    public class LatestVersionResponse : WebResponseMessage
+    {
+        public String Version { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs
new file mode 100644
index 000000000..77828d490
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Settings;
+using Tango.Transport.Web;
+
+namespace Tango.MachineStudio.Common.Update
+{
+    public class MachineStudioUpdateService : IMachineStudioUpdateService
+    {
+        private string address;
+        private WebTransportClient _client;
+
+        public MachineStudioUpdateService()
+        {
+            address = SettingsManager.Default.GetOrCreate<MachineStudioSettings>().GetMachineServiceAddress() + "/api/MachineStudio/";
+            _client = new WebTransportClient();
+        }
+
+        public Task<CheckForUpdatesResponse> CheckForUpdates(CheckForUpdatesRequest request)
+        {
+            return _client.PostJson<CheckForUpdatesRequest, CheckForUpdatesResponse>(address + "CheckForUpdates", request);
+        }
+
+        public Task<UploadVersionResponse> UploadVersion(UploadVersionRequest request)
+        {
+            return _client.PostJson<UploadVersionRequest, UploadVersionResponse>(address + "UploadVersion", request);
+        }
+
+        public Task<UploadCompletedResponse> NotifyUploadCompleted(UploadCompletedRequest request)
+        {
+            return _client.PostJson<UploadCompletedRequest, UploadCompletedResponse>(address + "NotifyUploadCompleted", request);
+        }
+
+        public Task<LatestVersionResponse> GetLatestVersion(LatestVersionRequest request)
+        {
+            return _client.PostJson<LatestVersionRequest, LatestVersionResponse>(address + "GetLatestVersion", request);
+        }
+    }
+}
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 ce6096792..d23d57351 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedRequest.cs
@@ -4,13 +4,12 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    [DataContract]
-    public class UploadCompletedRequest
+    public class UploadCompletedRequest : WebRequestSecureMessage
     {
-        [DataMember]
-        public String Token { get; set; }
+        
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedResponse.cs
new file mode 100644
index 000000000..89850e3e5
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadCompletedResponse.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Transport.Web;
+
+namespace Tango.MachineStudio.Common.Update
+{
+    public class UploadCompletedResponse : WebResponseMessage
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs
index 83739f615..c55cb9a22 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionRequest.cs
@@ -4,28 +4,22 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    [DataContract]
-    public class UploadVersionRequest
+    public class UploadVersionRequest : WebRequestMessage
     {
-        [DataMember]
         public String Email { get; set; }
 
-        [DataMember]
         public String Password { get; set; }
 
-        [DataMember]
         public String Version { get; set; }
 
-        [DataMember]
         public String Comments { get; set; }
 
-        [DataMember]
         public bool ForcedUpdate { get; set; }
 
-        [DataMember]
         public bool IsStable { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionResponse.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionResponse.cs
index 36dc3df30..4d13fc6ad 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionResponse.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/UploadVersionResponse.cs
@@ -4,28 +4,14 @@ using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Transport.Web;
 
 namespace Tango.MachineStudio.Common.Update
 {
-    [DataContract]
-    public class UploadVersionResponse
+    public class UploadVersionResponse : WebResponseMessage
     {
-        [DataMember]
-        public String FtpHost { get; set; }
-
-        [DataMember]
-        public String FilePath { get; set; }
-
-        [DataMember]
-        public String FileName { get; set; }
-
-        [DataMember]
-        public String UserName { get; set; }
-
-        [DataMember]
-        public String Password { get; set; }
-
-        [DataMember]
         public String Token { get; set; }
+
+        public String BlobAddress { get; set; }
     }
 }