merge

7 files changed, 27 insertions, 10 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
index 10e543617..545de6e92 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config
@@ -57,6 +57,18 @@
         <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>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.19.8.16603" newVersion="3.19.8.16603" />
+      </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/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
index 4096abc24..3dae9d05a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -55,7 +55,7 @@ namespace Tango.PPC.UI.Authentication
             String hash = User.GetPasswordHash(password);
 
             LogManager.Log($"Logging in user {email}...");
-            CurrentUser = ObservablesEntitiesAdapter.Instance.Users.SingleOrDefault(x => x.Email.ToLower() == email && x.Password == hash);
+            CurrentUser = ObservablesStaticCollections.Instance.Users.SingleOrDefault(x => x.Email.ToLower() == email && x.Password == hash);
             
             if (CurrentUser != null)
             {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 1dbe7785d..648ddbb59 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Application")]
-[assembly: AssemblyVersion("2.0.6.1657")]
+[assembly: AssemblyVersion("2.0.7.1119")]
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..2b2752a24 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>
@@ -126,7 +126,7 @@
     <Compile Include="Notifications\PendingNotification.cs" />
     <Compile Include="PPCApplication\DefaultPPCApplicationManager.cs" />
     <Compile Include="Printing\DefaultPrintingManager.cs" />
-    <Compile Include="Threading\DefaultDispetcherProvider.cs" />
+    <Compile Include="Threading\DefaultDispatcherProvider.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\ExternalBridgeViewVM.cs" />
     <Compile Include="ViewModels\LayoutViewVM.cs" />
@@ -421,7 +421,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)"</
   </PropertyGroup>
   <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
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispetcherProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispatcherProvider.cs
index 0051ca329..940c13052 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispetcherProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Threading/DefaultDispatcherProvider.cs
@@ -12,15 +12,15 @@ namespace Tango.PPC.UI.Threading
     /// Represents the default PPC <see cref="IDispatcherProvider"/> which will invoke action on the current application dispatcher.
     /// </summary>
     /// <seealso cref="Tango.PPC.Common.Threading.IDispatcherProvider" />
-    public class DefaultDispetcherProvider : IDispatcherProvider
+    public class DefaultDispatcherProvider : IDispatcherProvider
     {
         private Dispatcher _dispatcher;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultDispetcherProvider"/> class.
+        /// Initializes a new instance of the <see cref="DefaultDispatcherProvider"/> class.
         /// </summary>
         /// <param name="dispatcher">The dispatcher.</param>
-        public DefaultDispetcherProvider(Dispatcher dispatcher)
+        public DefaultDispatcherProvider(Dispatcher dispatcher)
         {
             _dispatcher = dispatcher;
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
index 5c416a289..bec1d2b48 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs
@@ -58,7 +58,7 @@ namespace Tango.PPC.UI
             TangoIOC.Default.Unregister<IPrintingManager>();
             TangoIOC.Default.Unregister<IConnectivityProvider>();
 
-            TangoIOC.Default.Register<IDispatcherProvider, DefaultDispetcherProvider>(new DefaultDispetcherProvider(Application.Current.Dispatcher));
+            TangoIOC.Default.Register<IDispatcherProvider, DefaultDispatcherProvider>(new DefaultDispatcherProvider(Application.Current.Dispatcher));
             TangoIOC.Default.Register<INotificationProvider, DefaultNotificationProvider>();
             TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
             TangoIOC.Default.Register<IPPCModuleLoader, DefaultPPCModuleLoader>();