Merge pull request #154 from dasgarner/release/tempel

Release 1.8.14
xibosignage · Jun 10, 2020 · 141d5a7 · 141d5a7
2 parents f1de4e6 + f3d3abd
commit 141d5a7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Forms/OptionForm.cs b/Forms/OptionForm.cs
@@ -75,6 +75,9 @@ public OptionForm()
             // Appearance Tab
             splashOverride.Text = ApplicationSettings.Default.SplashOverride;
 
+            // Switch to TLS 2.1
+            System.Net.ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+
             Debug.WriteLine("Loaded Options Form", "OptionForm");
         }
 

diff --git a/Logic/ApplicationSettings.cs b/Logic/ApplicationSettings.cs
@@ -40,9 +40,9 @@ public class ApplicationSettings
         private List<string> _globalProperties;
 
         // Application Specific Settings we want to protect
-        private string _clientVersion = "1.8.12";
+        private string _clientVersion = "1.8.14";
         private string _version = "5";
-        private int _clientCodeVersion = 133;
+        private int _clientCodeVersion = 134;
 
         public string ClientVersion { get { return _clientVersion; } }
         public string Version { get { return _version; } }

diff --git a/MainForm.cs b/MainForm.cs
@@ -241,6 +241,9 @@ private void InitializeXibo()
             // An empty set of overlay regions
             _overlays = new Collection<Region>();
 
+            // Switch to TLS 2.1
+            System.Net.ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+
             Trace.WriteLine(new LogMessage("MainForm", "Client Initialised"), LogType.Info.ToString());
         }
 

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Xibo Digital Signage")]
 [assembly: AssemblyProduct("Xibo")]
-[assembly: AssemblyCopyright("Copyright Xibo Signage Ltd ©  2008-2019")]
+[assembly: AssemblyCopyright("Copyright Xibo Signage Ltd ©  2008-2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -30,6 +30,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("10.8.12.0")]
-[assembly: AssemblyFileVersion("10.8.12.0")]
+[assembly: AssemblyVersion("10.8.14.0")]
+[assembly: AssemblyFileVersion("10.8.14.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-GB")]
diff --git a/XiboClient.csproj.user b/XiboClient.csproj.user
@@ -5,8 +5,7 @@
     </StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <StartArguments>
-    </StartArguments>
+    <StartArguments>o</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <PublishUrlHistory>T:\Development\Version 2\Client\</PublishUrlHistory>