Moved machine studio update azure !!!

12 files changed, 113 insertions, 64 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 67e052ecc..cab3d2bfc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -43,6 +43,8 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public String UpdateServiceAddress { get; set; }
 
+        public String MachineServiceAddress { get; set; }
+
         /// <summary>
         /// Gets or sets the allow beta release.
         /// </summary>
@@ -96,6 +98,7 @@ namespace Tango.MachineStudio.Common
             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>();
         }
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..31d28def8 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
@@ -122,8 +122,12 @@
     <Compile Include="Update\CheckForUpdatesResponse.cs" />
     <Compile Include="Update\CheckForUpdatesRequest.cs" />
     <Compile Include="Update\IMachineStudioUpdateService.cs" />
+    <Compile Include="Update\LatestVersionRequest.cs" />
+    <Compile Include="Update\LatestVersionResponse.cs" />
+    <Compile Include="Update\MachineStudioUpdateService.cs" />
     <Compile 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" />
@@ -304,7 +308,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </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 0047e311b..11911dd7e 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,18 @@ 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 : WebRequestMessage
     {
-        [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..b0577f40b 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,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 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..aae1fe70d
--- /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>().MachineServiceAddress + "/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..fc478db50 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 : WebRequestMessage
     {
-        [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; }
     }
 }