From 956f9ea033553136ebf199fff30f288dc26fbeb0 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 21 Feb 2018 20:21:57 +0200
Subject: Working on machine studio update center..

---
 .../Tango.MachineStudio.UpdateService.csproj       | 142 +++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
new file mode 100644
index 000000000..c9400b2d1
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
@@ -0,0 +1,142 @@
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CC6D62E9-C300-42F3-B452-79966E902B10}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tango.MachineStudio.UpdateService</RootNamespace>
+    <AssemblyName>Tango.MachineStudio.UpdateService</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <UseIISExpress>true</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Build\Debug\Web\Machine Studio Update Service\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Web" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="MachineStudioUpdateService.svc" />
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MachineStudioUpdateService.svc.cs">
+      <DependentUpon>MachineStudioUpdateService.svc</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
+    <None Include="Web.Debug.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </None>
+    <None Include="Web.Release.config">
+      <DependentUpon>Web.config</DependentUpon>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Integration\Tango.Integration.csproj">
+      <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
+      <Name>Tango.Integration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
+      <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
+      <Name>Tango.MachineStudio.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>65206</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:53044/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
-- 
cgit v1.3.1


From fadf83a50071ffba21db05eceff10c51c18f5fb3 Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Fri, 23 Feb 2018 12:03:18 +0200
Subject: Machine Studio Update & Publish. Improved user roles & permissions
 structure. Added permission for version publish.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 8388608 -> 8388608 bytes
 .../DataCaptureModule.cs                           |   2 +-
 .../Tango.MachineStudio.Stubs/StubsModule.cs       |   2 +-
 .../Tango.MachineStudio.Publisher/MainWindow.xaml  |  22 +++++-----
 .../Tango.MachineStudio.Publisher/MainWindowVM.cs  |  10 ++++-
 .../DefaultAuthenticationProvider.cs               |   7 ++-
 .../Tango.MachineStudio.UI.csproj                  |   4 ++
 .../MachineStudioUpdateService.svc.cs              |   6 +--
 .../Tango.MachineStudio.UpdateService.csproj       |   4 +-
 .../Web.Release.config                             |   2 +-
 .../Tango.MachineStudio.Updater/MainWindow.xaml.cs |   5 ++-
 .../Templates/ObservablesContextCodeFile.cshtml    |  29 +------------
 .../Observables/Enumerations/Permissions.cs        |  24 +++++++++++
 .../Observables/Enumerations/Roles.cs              |  20 +++++++--
 .../Observables/ObservablesContext.cs              |  34 +--------------
 .../Observables/ObservablesContextExtension.cs     |  48 +++++++++++++++++++++
 .../Tango.Integration/Tango.Integration.csproj     |   1 +
 Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj  |   6 +++
 .../MachineStudioSettings/MachineStudio.cs         |   2 +-
 .../Utilities/Tango.UITests/MainWindow.xaml        |   1 -
 21 files changed, 140 insertions(+), 89 deletions(-)
 create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 9f4b4ca30..2535145b6 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 81e9f8578..24e3fbc9c 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs
index ee650dc13..b138af4f3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/DataCaptureModule.cs
@@ -69,7 +69,7 @@ namespace Tango.MachineStudio.DataCapture
         {
             get
             {
-                return Permissions.RunTechnicianModule;
+                return Permissions.RunDataCaptureModule;
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs
index 817c68b49..4dd0bdff1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs
@@ -41,7 +41,7 @@ namespace Tango.MachineStudio.Stubs
         /// <summary>
         /// Gets the permission required to see and load this module.
         /// </summary>
-        public override Permissions Permission => Permissions.RunSynchronizationModule;
+        public override Permissions Permission => Permissions.RunStubsModule;
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
index 9f592ca6d..ab7e503ff 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
@@ -26,28 +26,28 @@
 
             <Grid Grid.Row="1" Margin="10">
                 <DockPanel>
-                    <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 20 0 0" x:Name="stackDetails">
-                        <TextBlock FontSize="16" HorizontalAlignment="Center">
-                            <Run>Latest Version:</Run>
+                    <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left" Margin="0 20 0 0" x:Name="stackDetails">
+                        <TextBlock FontSize="16">
+                            <Run>Remote Version:</Run>
                             <Run Text="{Binding LatestVersion}" FontStyle="Italic" FontWeight="SemiBold"></Run>
                         </TextBlock>
-                        <TextBlock Margin="0 10 0 0" FontSize="16" HorizontalAlignment="Center">
-                            <Run>Current Version:</Run>
+                        <TextBlock Margin="0 10 0 0" FontSize="16" >
+                            <Run>Local Version:</Run>
                             <Run Text="{Binding CurrentVersion}" FontStyle="Italic" FontWeight="SemiBold"></Run>
                         </TextBlock>
 
-                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal" HorizontalAlignment="Center">
+                        <StackPanel Margin="0 20 0 0" Orientation="Horizontal" >
                             <TextBlock FontSize="16">Email:</TextBlock>
-                            <TextBox Margin="5 0 0 0" Width="200" BorderThickness="0 0 0 1" Text="{Binding Email,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                            <TextBox Margin="5 0 0 0" Width="230" BorderThickness="0 0 0 1" Text="{Binding Email,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                         </StackPanel>
 
-                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal" HorizontalAlignment="Center">
+                        <StackPanel Margin="0 10 0 0" Orientation="Horizontal">
                             <TextBlock FontSize="16">Password:</TextBlock>
-                            <TextBox Margin="5 0 0 0" Width="230" BorderThickness="0 0 0 1" Text="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                            <TextBox Margin="5 0 0 0" Width="200" BorderThickness="0 0 0 1" Text="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                         </StackPanel>
 
-                        <TextBlock FontSize="16" HorizontalAlignment="Center" Margin="0 20 0 0">Comments</TextBlock>
-                        <TextBox Height="70" Margin="0 5 0 0" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                        <TextBlock FontSize="16" Margin="0 20 0 0">Comments</TextBlock>
+                        <TextBox Height="70" Margin="0 5 0 0" Width="500" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                     </StackPanel>
 
                     <Grid DockPanel.Dock="Bottom">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 2ceb36994..34d2f1b1f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using Tango.Core.Commands;
 using Tango.Core.Cryptography;
+using Tango.Core.Helpers;
 using Tango.MachineStudio.Common.Update;
 using Tango.Settings;
 using Tango.SharedUI;
@@ -121,6 +122,7 @@ namespace Tango.MachineStudio.Publisher
             Task.Factory.StartNew(() =>
             {
                 IsUpdating = true;
+                String tempFile = String.Empty;
 
                 try
                 {
@@ -132,7 +134,7 @@ namespace Tango.MachineStudio.Publisher
                         Comments = Comments,
                     });
 
-                    String tempFile = Path.Combine(Path.GetTempPath(), response.FileName);
+                    tempFile = Path.Combine(Path.GetTempPath(), response.FileName);
 
                     using (ZipFile zip = new ZipFile())
                     {
@@ -174,6 +176,11 @@ namespace Tango.MachineStudio.Publisher
                         }
                     }
 
+                    _client.NotifyUploadCompleted(new UploadCompletedRequest()
+                    {
+                        Token = response.Token,
+                    });
+
                     UpdateVersions();
                 }
                 catch (Exception ex)
@@ -183,6 +190,7 @@ namespace Tango.MachineStudio.Publisher
                 finally
                 {
                     IsUpdating = false;
+                    PathHelper.TryDeleteFile(tempFile);
                 }
             });
         }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
index 82aba268d..110e4d148 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -50,7 +50,12 @@ namespace Tango.MachineStudio.UI.Authentication
 
             if (user == null)
             {
-                throw new AuthenticationException("Login failed for user " + email);
+                throw new AuthenticationException("Invalid credentials for " + email);
+            }
+
+            if (!user.HasPermission(Permissions.RunMachineStudio))
+            {
+                throw new AuthenticationException("It seems like you do not have sufficient privileges to run Machine Studio. Please contact your administrator.");
             }
 
             CurrentUser = user;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 61ea92566..4cfa99a9b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -363,6 +363,10 @@
       <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tango.MachineStudio.Updater\Tango.MachineStudio.Updater.csproj">
+      <Project>{844787ce-f409-4f18-bccc-f3809ecb86f3}</Project>
+      <Name>Tango.MachineStudio.Updater</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\design.png" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
index e573a0d77..bf737c7a9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
@@ -31,7 +31,7 @@ namespace Tango.MachineStudio.UpdateService
 
         private static List<PendingUpload> _pendingUploads;
 
-        MachineStudioUpdateService()
+        static MachineStudioUpdateService()
         {
             _pendingUploads = new List<PendingUpload>();
         }
@@ -50,7 +50,7 @@ namespace Tango.MachineStudio.UpdateService
 
                     var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password);
 
-                    if (user != null)
+                    if (user != null && user.HasPermission(Permissions.RunMachineStudio))
                     {
                         var latestVersion = db.MachineStudioVersions.FirstOrDefault();
                         Version currentVersion = Version.Parse(request.Version);
@@ -93,7 +93,7 @@ namespace Tango.MachineStudio.UpdateService
 
                     var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password);
 
-                    if (user != null)
+                    if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion))
                     {
                         var latestVersion = db.MachineStudioVersions.FirstOrDefault();
                         Version currentVersion = Version.Parse(request.Version);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
index c9400b2d1..0b4d78195 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
@@ -26,7 +26,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Build\Debug\Web\Machine Studio Update Service\</OutputPath>
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -118,7 +118,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>True</UseIIS>
+          <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>65206</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config
index da6e960b8..d2da57796 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config
@@ -15,7 +15,7 @@
     </connectionStrings>
   -->
   <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
+    <!--<compilation xdt:Transform="RemoveAttributes(debug)" />-->
     <!--
       In the example below, the "Replace" transform will replace the entire 
       <customErrors> section of your web.config file.
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs
index e0e9e7f0d..a0c6928d2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/MainWindow.xaml.cs
@@ -99,7 +99,10 @@ namespace Tango.MachineStudio.Updater
                 }
                 catch (Exception ex)
                 {
-                    ShowError("Could not create file " + Path.GetFileName(newPath) + Environment.NewLine + ex.Message);
+                    if (!newPath.ToLower().Contains("updater.exe"))
+                    {
+                        ShowError("Could not create file " + Path.GetFileName(newPath) + Environment.NewLine + ex.Message);
+                    }
                 }
             }
         }
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
index 2094c0999..d2494c1bd 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml
@@ -8,7 +8,7 @@ using Tango.Settings;
 
 namespace Tango.Integration.Observables
 {
-    public class ObservablesContext : DbContext
+    public partial class ObservablesContext : DbContext
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ObservablesContext" /> class.
@@ -20,33 +20,6 @@ namespace Tango.Integration.Observables
 
         }
 
-        /// <summary>
-        /// Composes the connection string.
-        ///</summary>
-        /// <param name="source">The source.</param>
-        /// <param name="isFile">if set to <c>true</c> [is file].</param>
-        /// <returns></returns>
-        private static String ComposeConnectionString(String source, bool isFile)
-        {
-            if (!isFile)
-            {
-                return String.Format("Data Source={0};Initial Catalog=Tango;Integrated Security=true", source);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a default remote database context by the address specified in <see cref="SettingsManager.Default.DataBase.SQLServerAddress" />.
-        /// </summary>
-        /// <returns></returns>
-        public static ObservablesContext CreateDefault()
-        {
-            return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false);
-        }
-
         @foreach (var prop in Model.Properties)
         {
             <div>
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs
index 39014b04b..f022294fc 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs
@@ -39,5 +39,29 @@ namespace Tango.Integration.Observables
         [Description("Allows loading the machine designer module in Machine Studio")]
         RunMachineDesignerModule = 4,
 
+        /// <summary>
+        /// (Allows loading the data capture module in Machine Studio)
+        /// </summary>
+        [Description("Allows loading the data capture module in Machine Studio")]
+        RunDataCaptureModule = 5,
+
+        /// <summary>
+        /// (Allows the execution of Machine Studio)
+        /// </summary>
+        [Description("Allows the execution of Machine Studio")]
+        RunMachineStudio = 6,
+
+        /// <summary>
+        /// (Allows publishing of new Machine Studio release version to the Machine Studio Service.)
+        /// </summary>
+        [Description("Allows publishing of new Machine Studio release version to the Machine Studio Service.")]
+        PublishMachineStudioVersion = 7,
+
+        /// <summary>
+        /// (Allows loading the stubs module in machine studio)
+        /// </summary>
+        [Description("Allows loading the stubs module in machine studio")]
+        RunStubsModule = 8,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs
index 9e81889ae..a454bc71f 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs
@@ -31,13 +31,25 @@ namespace Tango.Integration.Observables
         /// (Twine Research and development)
         /// </summary>
         [Description("Twine Research and development")]
-        Developer = 3,
+        MachineDeveloper = 3,
 
         /// <summary>
-        /// (Role Description)
+        /// (Publish new Machine Studio Versions)
         /// </summary>
-        [Description("Role Description")]
-        SomeRole = 4,
+        [Description("Publish new Machine Studio Versions")]
+        MachineStudioPublisher = 4,
+
+        /// <summary>
+        /// (Machine Studio Software Developer)
+        /// </summary>
+        [Description("Machine Studio Software Developer")]
+        MachineStudioDeveloper = 5,
+
+        /// <summary>
+        /// (Twine Software Developer)
+        /// </summary>
+        [Description("Twine Software Developer")]
+        SoftwareDeveloper = 6,
 
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs
index 37830081d..99ce25d75 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs
@@ -8,7 +8,7 @@ using Tango.Settings;
 
 namespace Tango.Integration.Observables
 {
-    public class ObservablesContext : DbContext
+    public partial class ObservablesContext : DbContext
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ObservablesContext" /> class.
@@ -20,38 +20,6 @@ namespace Tango.Integration.Observables
 
         }
 
-        /// <summary>
-        /// Composes the connection string.
-        ///</summary>
-        /// <param name="source">The source.</param>
-        /// <param name="isFile">if set to <c>true</c> [is file].</param>
-        /// <returns></returns>
-        private static String ComposeConnectionString(String source, bool isFile)
-        {
-            if (!isFile)
-            {
-                return String.Format("Data Source={0};Initial Catalog=Tango;User Id=Developer;Password=1111;", source);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a default remote database context by the address specified in <see cref="SettingsManager.Default.DataBase.SQLServerAddress" />.
-        /// </summary>
-        /// <returns></returns>
-        public static ObservablesContext CreateDefault()
-        {
-            return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false);
-        }
-
-        public static ObservablesContext CreateDefaultForWeb()
-        {
-            return new ObservablesContext("localhost\\SQLEXPRESS", false);
-        }
-
         /// <summary>
         /// Gets or sets the ActionTypes.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs
new file mode 100644
index 000000000..e6618eae2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Settings;
+
+namespace Tango.Integration.Observables
+{
+    public partial class ObservablesContext
+    {
+        /// <summary>
+        /// Composes the connection string.
+        ///</summary>
+        /// <param name="source">The source.</param>
+        /// <param name="isFile">if set to <c>true</c> [is file].</param>
+        /// <returns></returns>
+        private static String ComposeConnectionString(String source, bool isFile)
+        {
+            if (!isFile)
+            {
+                return String.Format("Data Source={0};Initial Catalog=Tango;User Id=Developer;Password=1111;", source);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Creates a default remote database context by the address specified in <see cref="SettingsManager.Default.DataBase.SQLServerAddress" />.
+        /// </summary>
+        /// <returns></returns>
+        public static ObservablesContext CreateDefault()
+        {
+            return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false);
+        }
+
+        /// <summary>
+        /// Creates a default remote database context by the address specified in <see cref="SettingsManager.Default.DataBase.SQLServerAddress" />.
+        /// </summary>
+        /// <returns></returns>
+        public static ObservablesContext CreateDefaultForWeb()
+        {
+            return new ObservablesContext("localhost\\SQLEXPRESS", false);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index 3f4d2056b..18213e722 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -172,6 +172,7 @@
     <Compile Include="Observables\IObservableEntity.cs" />
     <Compile Include="Observables\ObservableEntity.cs" />
     <Compile Include="Observables\ObservablesContext.cs" />
+    <Compile Include="Observables\ObservablesContextExtension.cs" />
     <Compile Include="Observables\ObservablesEntitiesAdapter.cs" />
     <Compile Include="Observables\ObservablesEntitiesAdapterExtension.cs" />
     <Compile Include="Observables\Partials\Cat.cs" />
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 9e1f2dd76..45f1f06a3 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -119,6 +119,12 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Utilities\Tango.Protobuf.CLI\Tango.Protobuf.CLI.csproj">
+      <Project>{de5ab980-a9ad-4273-8272-c4e1e062e3ec}</Project>
+      <Name>Tango.Protobuf.CLI</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>"$(TargetDir)proto-tc.exe" -i "$(SolutionDir)..\PMR\Messages" -o "$(SolutionDir)Tango.PMR" -l CSharp</PreBuildEvent>
diff --git a/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
index 111c959f7..bfec7af3f 100644
--- a/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
+++ b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
@@ -74,7 +74,7 @@ namespace Tango.Settings.MachineStudioSettings
             StubsModule = new StubsModule();
             TechnicianModule = new TechnicianModule();
             DeveloperModule = new DeveloperModule();
-            UpdateServiceAddress = "http://localhost/MachineStudioUpdateService/MachineStudioUpdateService.svc";
+            UpdateServiceAddress = "http://localhost:65206/MachineStudioUpdateService.svc";
         }
     }
 }
diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
index 3d0a14c4e..665a8b644 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
@@ -6,7 +6,6 @@
         xmlns:local="clr-namespace:Tango.UITests"
         xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
         xmlns:common="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
-        xmlns:developer="clr-namespace:Tango.MachineStudio.Developer.Controls;assembly=Tango.MachineStudio.Developer"
         xmlns:tech="clr-namespace:Tango.MachineStudio.Technician.Views;assembly=Tango.MachineStudio.Technician"
         xmlns:visuals="clr-namespace:Tango.Visuals;assembly=Tango.Visuals"
         xmlns:editors="clr-namespace:Tango.Editors;assembly=Tango.Editors"
-- 
cgit v1.3.1


From e83057fa22e28c5fd231ae06a5a91464a6e3f596 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 25 Feb 2018 15:14:20 +0200
Subject: Integrated DB & MSUS to Twine Server.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 8388608 -> 8388608 bytes
 .../Tango.MachineStudio.Publisher.csproj           |  27 +++++++++++++++++++++
 .../MachineStudioUpdateService.svc.cs              |  17 +++++++++++--
 .../Tango.MachineStudio.UpdateService.csproj       |   3 +++
 .../Tango.MachineStudio.UpdateService/Web.config   |   6 ++---
 .../Observables/ObservablesContextExtension.cs     |   4 +--
 Software/Visual_Studio/Tango.Settings/DataBase.cs  |   7 +-----
 .../MachineStudioSettings/MachineStudio.cs         |   2 +-
 9 files changed, 52 insertions(+), 14 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 683e47294..13144a5b4 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 6afb62f52..e58af856d 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj
index 00bbe3539..7b59fa319 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj
@@ -13,6 +13,21 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -135,5 +150,17 @@
       <Name>Tango.MachineStudio.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
index 2f001b281..5cc95c617 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
@@ -97,6 +97,12 @@ namespace Tango.MachineStudio.UpdateService
                 {
                     db.Configuration.LazyLoadingEnabled = false;
 
+                    //Load relation first...
+                    db.Roles.ToList();
+                    db.Permissions.ToList();
+                    db.UsersRoles.ToList();
+                    db.RolesPermissions.ToList();
+
                     var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password);
 
                     if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion))
@@ -185,9 +191,16 @@ namespace Tango.MachineStudio.UpdateService
 
         public string GetLatestVersion()
         {
-            using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+            try
             {
-                return db.MachineStudioVersions.FirstOrDefault().Version;
+                using (ObservablesContext db = ObservablesContext.CreateDefaultForWeb())
+                {
+                    return db.MachineStudioVersions.FirstOrDefault().Version;
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new FaultException(ex.ToString());
             }
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
index 0b4d78195..9e41b1725 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj
@@ -81,6 +81,9 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
+    <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
+    <None Include="Properties\PublishProfiles\CustomProfile1.pubxml" />
+    <None Include="Properties\PublishProfiles\CustomProfile2.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config
index b0d2452f0..1805380e9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.config
@@ -6,8 +6,8 @@
   </configSections>
   <appSettings>
     <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
-    <add key="FtpHost" value="localhost" />
-    <add key="UserName" value="Tango" />
+    <add key="FtpHost" value="Twine01" />
+    <add key="UserName" value="FTPWriter" />
     <add key="Password" value="Aa123456" />
   </appSettings>
   <system.web>
@@ -21,7 +21,7 @@
           <!-- To avoid disclosing metadata information, set the values below to false before deployment -->
           <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
           <!-- To receive exception details in faults for debugging purposes, set the value below to true.  Set to false before deployment to avoid disclosing exception information -->
-          <serviceDebug includeExceptionDetailInFaults="false" />
+          <serviceDebug includeExceptionDetailInFaults="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs
index e6618eae2..9484520c5 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContextExtension.cs
@@ -19,7 +19,7 @@ namespace Tango.Integration.Observables
         {
             if (!isFile)
             {
-                return String.Format("Data Source={0};Initial Catalog=Tango;User Id=Developer;Password=1111;", source);
+                return String.Format("Data Source={0};Initial Catalog=Tango;Integrated Security=True;", source);
             }
             else
             {
@@ -42,7 +42,7 @@ namespace Tango.Integration.Observables
         /// <returns></returns>
         public static ObservablesContext CreateDefaultForWeb()
         {
-            return new ObservablesContext("localhost\\SQLEXPRESS", false);
+            return new ObservablesContext("localhost\\SQLTWINE", false);
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Settings/DataBase.cs b/Software/Visual_Studio/Tango.Settings/DataBase.cs
index 4e5213b3f..22bbfe9a9 100644
--- a/Software/Visual_Studio/Tango.Settings/DataBase.cs
+++ b/Software/Visual_Studio/Tango.Settings/DataBase.cs
@@ -17,17 +17,12 @@ namespace Tango.Settings
         /// </summary>
         public String SQLServerAddress { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to delete a record from database instead of setting IsDeleted to 'true'.
-        /// </summary>
-        public bool DeleteForReal { get; set; }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="DataBase"/> class.
         /// </summary>
         public DataBase()
         {
-            SQLServerAddress = "localhost\\SQLEXPRESS";
+            SQLServerAddress = "twine01\\SQLTWINE";
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
index bfec7af3f..ecaa15153 100644
--- a/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
+++ b/Software/Visual_Studio/Tango.Settings/MachineStudioSettings/MachineStudio.cs
@@ -74,7 +74,7 @@ namespace Tango.Settings.MachineStudioSettings
             StubsModule = new StubsModule();
             TechnicianModule = new TechnicianModule();
             DeveloperModule = new DeveloperModule();
-            UpdateServiceAddress = "http://localhost:65206/MachineStudioUpdateService.svc";
+            UpdateServiceAddress = "http://twine01/MachineStudioUpdateService/MachineStudioUpdateService.svc";
         }
     }
 }
-- 
cgit v1.3.1