diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-12-23 12:44:08 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2018-12-23 12:44:08 +0200 |
| commit | 4e496467dcc8549605917a44263d78cef40f71bb (patch) | |
| tree | 3e385e90ec94c5f7d590aaa71991b40fcc05df67 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | 5cb09f7732429d15477321e7f748d010ef27c85d (diff) | |
| download | Tango-4e496467dcc8549605917a44263d78cef40f71bb.tar.gz Tango-4e496467dcc8549605917a44263d78cef40f71bb.zip | |
Implemented machine studio active directory secure login.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
2 files changed, 3 insertions, 6 deletions
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 ca4d95805..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 @@ -127,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" /> @@ -310,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 |