add 48 updater flag

Analogy-LogViewer · Nov 14, 2020 · c4a677d · c4a677d
1 parent 848122c
commit c4a677d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -14,6 +14,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
                 new AnalogyChangeLog("V4.3.1 - [UI] Disable right click on images in the First Run window #660",AnalogChangeLogType.Bug,"Lior Banai",new DateTime(2020,11,13)),
                 new AnalogyChangeLog("V4.3.1 - Category column is hidden by default. undo it. #659",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,11,12)),
                 new AnalogyChangeLog("V4.3.1 - [UI] null values are not displayed correctly #654",AnalogChangeLogType.Bug,"Lior Banai",new DateTime(2020,11,08)),
+                new AnalogyChangeLog("V4.3.1 - Upgrade to DevExpress 19.1.12 #621",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,11,05)), 
                 new AnalogyChangeLog("V4.3.0 - [Updater] show download progress #619",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,10,30)),
                 new AnalogyChangeLog("V4.2.13 - App hangs when trying to load file in use #636",AnalogChangeLogType.Bug,"Lior Banai",new DateTime(2020,10,27)),
                 new AnalogyChangeLog("V4.2.12 - Add support for loading data providers from sub folders #645",AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2020,10,27)),

diff --git a/Analogy/Managers/UpdateManager.cs b/Analogy/Managers/UpdateManager.cs
@@ -3,7 +3,6 @@
 using Analogy.Updater;
 using DevExpress.XtraEditors;
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
@@ -230,12 +229,19 @@ private async Task<bool> DownloadUpdater(GithubObjects.GithubAsset updaterAsset)
 
         private void UnzipZipFileIntoTempFolder(string zipPath, string extractPath)
         {
-            string version = "net472";
-            if (CurrentFrameworkAttribute.FrameworkName.EndsWith("4.7.1") ||
-                CurrentFrameworkAttribute.FrameworkName.EndsWith("4.7.2"))
+            string version="net48";
+            if (CurrentFrameworkAttribute.FrameworkName.EndsWith("4.7.1"))
+            {
+                version = "net471";
+            }
+            else if (CurrentFrameworkAttribute.FrameworkName.EndsWith("4.7.2"))
             {
                 version = "net472";
             }
+            else if (CurrentFrameworkAttribute.FrameworkName.EndsWith("4.8"))
+            {
+                version = "net48";
+            }
             else if (CurrentFrameworkAttribute.FrameworkName.EndsWith("3.1"))
             {
                 version = "netcoreapp3.1";

diff --git a/Analogy/UserControls/UCLogs.cs b/Analogy/UserControls/UCLogs.cs
@@ -28,7 +28,6 @@
 using System.Windows.Forms;
 using Analogy.DataTypes;
 using Analogy.Forms;
-using ChangeEventArgs = DevExpress.XtraEditors.Controls.ChangeEventArgs;
 
 namespace Analogy
 {
@@ -1668,7 +1667,11 @@ private void UpdatePage(DataTable page)
 
         public void FilterResults(string module)
         {
-            if (IsDisposed) return;
+            if (IsDisposed)
+            {
+                return;
+            }
+
             txtbModule.Text = module;
             FilterResults();
         }
@@ -3048,13 +3051,21 @@ private void tsmiAddCommentToMessage_Click(object sender, EventArgs e)
 
         private void txtbInclude_KeyPress(object sender, KeyPressEventArgs e)
         {
-            if (IsDisposed) return;
+            if (IsDisposed)
+            {
+                return;
+            }
+
             xtcFilters.SelectedTabPage = xtpFiltersIncludes;
         }
 
         private void txtbExclude_EditValueChanged(object sender, EventArgs e)
         {
-            if (IsDisposed) return;
+            if (IsDisposed)
+            {
+                return;
+            }
+
             xtcFilters.SelectedTabPage = xtpFiltersExclude;
         }
     }