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 !!!

---
 Software/Visual_Studio/PPC/Tango.PPC.UI/App.config          | 4 ++++
 Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs         | 7 ++++++-
 Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
index 10e543617..ae2732d7a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
@@ -57,6 +57,10 @@
         <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
index 2efd0ad18..4cffce960 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml.cs
@@ -47,7 +47,12 @@ namespace Tango.PPC.UI
 
             LogManager.Categories.Clear();
 
-            CoreSettings.DefaultDataBaseSource = "localhost\\SQLEXPRESS";
+            CoreSettings.DefaultDataSource = new DataSource()
+            {
+                Address = "localhost\\SQLEXPRESS",
+                Catalog = "Tango",
+                IntegratedSecurity = true,
+            };
 
             var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index d91bee884..fdaf37c09 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Tango.PPC.UI</RootNamespace>
     <AssemblyName>Tango.PPC.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