Merge pull request #441 from LogExperts/v1.20.0

V1.20.0

Author: Hirogen

lib/3rdparty.txt

@@ -8,7 +8,7 @@ Released under "MIT X11 license"
 
 DockPanel Suite:
 ----------------
-http://sourceforge.net/projects/dockpanelsuite/
+https://github.com/dockpanelsuite/dockpanelsuite
 Copyright (c) 2007 Weifen Luo (email: weifenluo@yahoo.com)
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <Version>8.2.0</Version>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
-    <InformationalVersion>2.0.0.0-rc1</InformationalVersion>
+    <Version>1.20.0.0</Version>
+    <AssemblyVersion>1.20.0.0</AssemblyVersion>
+    <FileVersion>1.20.0.0</FileVersion>
+    <InformationalVersion>1.20.0.0</InformationalVersion>
     <Authors>Hirogen, zarunbal, RandallFlagg, TheNicker</Authors>
     <Company>Log Expert</Company>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -25,8 +25,25 @@
     <ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
     <EnableWindowsTargeting>false</EnableWindowsTargeting>
 
-    <AssemblyTitle>FIX ME - AssemblyTitle!</AssemblyTitle>
-    <Description>FIX ME - Description!</Description>
+    <AssemblyTitle>LogExpert</AssemblyTitle>
+    <Description>
+      LogExpert is a Windows tail program (a GUI replacement for the Unix tail command).
+
+      Summary of (most) features:
+
+      * Tail mode
+      * MDI-Interface with Tabs
+      * Search function (including RegEx)
+      * Bookmarks
+      * A very flexible filter view and possibility to filter to tab
+      * Highlighting lines via search criteria
+      * Triggers (e.g. create Bookmark or execute a plugin) via search criteria
+      * Columnizers: Plugins which split log lines into columns
+      * Unicode support
+      * log4j XML file support
+      * 3rd party plugin support
+      * Plugin API for more log file data sources
+    </Description>
   </PropertyGroup>
 
   <ItemGroup Label="Links">

src/LogExpert.UI/Controls/LogWindow/LogWindow.cs

@@ -578,7 +578,6 @@ void ILogWindow.WritePipeTab (IList<LineEntry> lineEntryList, string title)
         WritePipeTab(lineEntryList, title);
     }
 
-
     #region Event Handlers
 
     [SupportedOSPlatform("windows")]

src/LogExpert.UI/Dialogs/AboutBox.Designer.cs

@@ -24,15 +24,15 @@ public AboutBox ()
         InitializeComponent();
 
         LoadResources();
-
+        usedComponentsDataGrid.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
         _assembly = Assembly.GetExecutingAssembly();
 
         Text = $@"About {AssemblyTitle}";
         labelProductName.Text = AssemblyProduct;
         labelVersion.Text = AssemblyVersion;
         labelCopyright.Text = AssemblyCopyright;
         var link = "https://github.com/LogExperts/LogExpert";
-        linkLabelURL.Links.Add(new LinkLabel.Link(0, link.Length, link));
+        _ = linkLabelURL.Links.Add(new LinkLabel.Link(0, link.Length, link));
         LoadUsedComponents();
     }
 
@@ -44,6 +44,7 @@ private void LoadUsedComponents ()
         var usedComponents = JsonConvert.DeserializeObject<UsedComponents[]>(json);
         usedComponents = usedComponents?.OrderBy(x => x.PackageId).ToArray();
         usedComponentsDataGrid.DataSource = usedComponents;
+
     }
 
 
@@ -64,7 +65,7 @@ public string AssemblyTitle
             if (attributes.Length > 0)
             {
                 var titleAttribute = (AssemblyTitleAttribute)attributes[0];
-                if (titleAttribute.Title != string.Empty)
+                if (!string.IsNullOrEmpty(titleAttribute.Title))
                 {
                     return titleAttribute.Title;
                 }
@@ -77,20 +78,11 @@ public string AssemblyVersion
     {
         get
         {
-            AssemblyName assembly = _assembly.GetName();
-
-            if (assembly.Version != null)
-            {
-                var version = $"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}.{assembly.Version.Revision}";
-                if (assembly.Version.Revision >= 9000)
-                {
-                    version += " Testrelease";
-                }
-
-                return version;
-            }
+            var assembly = _assembly.GetName();
 
-            return "0.0.0.0";
+            return assembly.Version != null
+                ? $"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}.{assembly.Version.Revision}"
+                : "0.0.0.0";
         }
 
     }
@@ -101,11 +93,9 @@ public string AssemblyDescription
         {
             var attributes = _assembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false);
 
-            if (attributes.Length == 0)
-            {
-                return string.Empty;
-            }
-            return ((AssemblyDescriptionAttribute)attributes[0]).Description;
+            return attributes.Length == 0
+                ? string.Empty
+                : ((AssemblyDescriptionAttribute)attributes[0]).Description;
         }
     }
 
@@ -114,11 +104,9 @@ public string AssemblyProduct
         get
         {
             var attributes = _assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false);
-            if (attributes.Length == 0)
-            {
-                return string.Empty;
-            }
-            return ((AssemblyProductAttribute)attributes[0]).Product;
+            return attributes.Length == 0
+                ? string.Empty
+                : ((AssemblyProductAttribute)attributes[0]).Product;
         }
     }
 
@@ -127,11 +115,9 @@ public string AssemblyCopyright
         get
         {
             var attributes = _assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
-            if (attributes.Length == 0)
-            {
-                return string.Empty;
-            }
-            return ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
+            return attributes.Length == 0
+                ? string.Empty
+                : ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
         }
     }
 
@@ -148,7 +134,7 @@ private void OnLinkLabelURLClicked (object sender, LinkLabelLinkClickedEventArgs
             target = e.Link.LinkData as string;
         }
 
-        Process.Start(new ProcessStartInfo
+        _ = Process.Start(new ProcessStartInfo
         {
             UseShellExecute = true,
             FileName = target,

src/LogExpert.UI/Dialogs/AboutBox.cs

@@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Solution Items\AssemblyInfo.cs = Solution Items\AssemblyInfo.cs
 		Directory.Build.props = Directory.Build.props
 		Directory.Packages.props = Directory.Packages.props
+		..\GitVersion.yml = ..\GitVersion.yml
 		Solution Items\usedComponents.json = Solution Items\usedComponents.json
 	EndProjectSection
 EndProject