From b4a1c833f0e67835e89961e77329efe5bf2a7797 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 21 Aug 2018 10:50:41 +0300
Subject: Refactored ObservablesContext to use DataSource object! Upgraded to
 .NET 4.7.2 !!!

---
 .../MachineStudio/Tango.MachineStudio.UI/App.xaml.cs      | 15 +++++++++++++--
 .../Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj  |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index ed2cbdbd7..4e1c36593 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -37,9 +37,20 @@ namespace Tango.MachineStudio.UI
         {
 
 #if DEBUG
-            CoreSettings.DefaultDataBaseSource = "localhost\\SQLEXPRESS";
+            CoreSettings.DefaultDataSource = new DataSource()
+            {
+                Address = "localhost\\SQLEXPRESS",
+                Catalog = "Tango",
+                IntegratedSecurity = true,
+            };
 #else
-            CoreSettings.DefaultDataBaseSource = "twine01\\SQLTWINE";
+
+            CoreSettings.DefaultDataSource = new DataSource()
+            {
+                Address = "twine01\\SQLTWINE",
+                Catalog = "Tango",
+                IntegratedSecurity = true,
+            };
 #endif
 
 
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 1a5de40e1..e720abec6 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
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tango.MachineStudio.UI</RootNamespace>
     <AssemblyName>Tango.MachineStudio.UI</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
-- 
cgit v1.3.1