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

4 files changed, 35 insertions, 6 deletions

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..075a5ec10
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/LoginResponse.cs
@@ -0,0 +1,15 @@
+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; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index cab3d2bfc..1d3660c5f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -39,10 +39,8 @@ namespace Tango.MachineStudio.Common
         public String LastVirtualMachineSerialNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets the update service address.
+        /// Gets or sets the machine service address.
         /// </summary>
-        public String UpdateServiceAddress { get; set; }
-
         public String MachineServiceAddress { get; set; }
 
         /// <summary>
@@ -97,7 +95,6 @@ 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 31d28def8..cd99b00d0 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" />
@@ -125,7 +127,7 @@
     <Compile Include="Update\LatestVersionRequest.cs" />
     <Compile Include="Update\LatestVersionResponse.cs" />
     <Compile Include="Update\MachineStudioUpdateService.cs" />
-    <Compile Include="Update\UpdateServiceHelper.cs" />
+    <None Include="Update\UpdateServiceHelper.cs" />
     <Compile Include="Update\UploadCompletedRequest.cs" />
     <Compile Include="Update\UploadCompletedResponse.cs" />
     <Compile Include="Update\UploadVersionRequest.cs" />
@@ -308,7 +310,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