Default plugins - cleanup and remove windows dependencies

src/AutoColumnizer/AutoColumnizer.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyTitle>AutoColumnizer</AssemblyTitle>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
-	<IsTestProject>false</IsTestProject>
+    <IsTestProject>false</IsTestProject>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
   </PropertyGroup>

src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
     <IsTestProject>true</IsTestProject>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

src/DefaultPlugins/DefaultPlugins.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableWindowsTargeting>False</EnableWindowsTargeting>
     <OutputType>Library</OutputType>
-	<IsTestProject>false</IsTestProject>
+    <IsTestProject>false</IsTestProject>
     <RootNamespace>LogExpert</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <UseWindowsForms>False</UseWindowsForms>
+    <ImportWindowsDesktopTargets>False</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
   </PropertyGroup>

src/DefaultPlugins/ProcessLauncher.cs

@@ -2,7 +2,8 @@
 
 namespace LogExpert
 {
-    public class ProcessLauncher : IKeywordAction
+    //TODO: Not in use
+    internal class ProcessLauncher : IKeywordAction
     {
         #region Properties
 

src/GlassfishColumnizer/GlassfishColumnizer.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
-	<IsTestProject>false</IsTestProject>
+    <IsTestProject>false</IsTestProject>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>

src/JsonColumnizer/JsonColumnizer.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableWindowsTargeting>false</EnableWindowsTargeting>
     <OutputType>Library</OutputType>
-	<IsTestProject>false</IsTestProject>
+    <IsTestProject>false</IsTestProject>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <UseWindowsForms>false</UseWindowsForms>
+    <ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
   </PropertyGroup>

src/JsonCompactColumnizer/JsonCompactColumnizer.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableWindowsTargeting>false</EnableWindowsTargeting>
     <OutputType>Library</OutputType>
-	<IsTestProject>false</IsTestProject>
+    <IsTestProject>false</IsTestProject>
     <RootNamespace>JsonColumnizer</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <UseWindowsForms>false</UseWindowsForms>
+    <ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
   </PropertyGroup>

src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net8.0-windows</TargetFramework>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <OutputType>Library</OutputType>
-	<IsTestProject>false</IsTestProject>
+    <IsTestProject>false</IsTestProject>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

src/LogExpert.Core/Classes/Filter/Filter.cs

@@ -1,13 +1,8 @@
 using LogExpert.Classes.ILogLineColumnizerCallback;
 using LogExpert.Core.Classes;
 using LogExpert.Core.Classes.Filter;
-
 using NLog;
 
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
 namespace LogExpert.Classes.Filter
 {
     internal delegate void FilterFx(FilterParams filterParams, List<int> filterResultLines, List<int> lastFilterResultLines, List<int> filterHitList);

src/LogExpert.Core/Classes/Util.cs

@@ -1,5 +1,4 @@
 using LogExpert.Core.Classes.Filter;
-
 using System.Diagnostics;
 using System.Drawing;
 using System.Runtime.Versioning;
@@ -402,59 +401,6 @@ public static void AssertTrue(bool condition, string msg)
             }
         }
 
-        [SupportedOSPlatform("windows")]
-        public string GetWordFromPos(int xPos, string text, Graphics g, Font font)
-        {
-            string[] words = text.Split([' ', '.', ':', ';']);
-
-            int index = 0;
-
-            List<CharacterRange> crList = [];
-
-            for (int i = 0; i < words.Length; ++i)
-            {
-                crList.Add(new CharacterRange(index, words[i].Length));
-                index += words[i].Length;
-            }
-
-            CharacterRange[] crArray = [.. crList];
-
-            StringFormat stringFormat = new(StringFormat.GenericTypographic)
-            {
-                Trimming = StringTrimming.None,
-                FormatFlags = StringFormatFlags.NoClip
-            };
-
-            stringFormat.SetMeasurableCharacterRanges(crArray);
-
-            RectangleF rect = new(0, 0, 3000, 20);
-            Region[] stringRegions = g.MeasureCharacterRanges(text, font, rect, stringFormat);
-
-            bool found = false;
-
-            int y = 0;
-
-            foreach (Region regio in stringRegions)
-            {
-                if (regio.IsVisible(xPos, 3, g))
-                {
-                    found = true;
-                    break;
-                }
-
-                y++;
-            }
-
-            if (found)
-            {
-                return words[y];
-            }
-            else
-            {
-                return null;
-            }
-        }
-
         #endregion
 
         #region Private Methods

src/LogExpert.Core/Config/ColorMode.cs

@@ -74,34 +74,5 @@ private static void SetBrightMode()
             InactiveTabColor = LessBrightBackgroundColor;
             DarkModeEnabled = false;
         }
-
-        #region TitleBarDarkMode
-        [DllImport("dwmapi.dll")]
-        private static extern int DwmSetWindowAttribute(nint hwnd, int attr, ref int attrValue, int attrSize);
-
-        private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
-        private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
-
-        public static bool UseImmersiveDarkMode(nint handle, bool enabled)
-        {
-
-            var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
-            if (IsWindows10OrGreater(18985))
-            {
-                attribute = DWMWA_USE_IMMERSIVE_DARK_MODE;
-            }
-
-            int useImmersiveDarkMode = enabled ? 1 : 0;
-            return DwmSetWindowAttribute(handle, attribute, ref useImmersiveDarkMode, sizeof(int)) == 0;
-
-        }
-
-        private static bool IsWindows10OrGreater(int build = -1)
-        {
-            return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build;
-        }
-
-        #endregion TitleBarDarkMode
-
     }
 }

src/LogExpert.Core/Entities/FileViewContext.cs

@@ -2,7 +2,7 @@
 
 namespace LogExpert.Core.Entities
 {
-    public class FileViewContext(ILogPaintContext logPaintContext, ILogView logView)
+    public class FileViewContext(ILogPaintContext logPaintContext, ILogView logView) : IFileViewContext, ILogPaintContext
     {
         #region Properties
 

src/LogExpert.Core/Interface/IFileViewContext.cs

@@ -0,0 +1,10 @@
+using LogExpert.Core.Entities;
+
+namespace LogExpert.Core.Interface
+{
+    public interface IFileViewContext
+    {
+        ILogView LogView { get; }
+        ILogPaintContext LogPaintContext { get; }
+    }
+}

src/LogExpert.Core/Interface/ILogPaintContext.cs

@@ -1,36 +1,6 @@
-using LogExpert.Core.Classes.Highlight;
-using LogExpert.Core.Entities;
-
-using System.Drawing;
-
-namespace LogExpert.Core.Interface
+namespace LogExpert.Core.Interface
 {
-    /// <summary>
-    /// Declares methods that are needed for drawing log lines. Used by PaintHelper.
-    /// </summary>
     public interface ILogPaintContext
     {
-        #region Properties
-
-        Font MonospacedFont { get; } // Font font = new Font("Courier New", this.Preferences.fontSize, FontStyle.Bold);
-        Font NormalFont { get; }
-        Font BoldFont { get; }
-        Color BookmarkColor { get; }
-
-        #endregion
-
-        #region Public methods
-
-        ILogLine GetLogLine(int lineNum);
-
-        IColumn GetCellValue(int rowIndex, int columnIndex);
-
-        Bookmark GetBookmarkForLine(int lineNum);
-
-        HighlightEntry FindHighlightEntry(ITextValue line, bool noWordMatches);
-
-        IList<HilightMatchEntry> FindHighlightMatches(ITextValue line);
-
-        #endregion
     }
 }

src/LogExpert.Core/Interface/ISharedToolWindow.cs

@@ -1,5 +1,4 @@
 using LogExpert.Core.Config;
-using LogExpert.Core.Entities;
 
 namespace LogExpert.Core.Interface
 {
@@ -16,7 +15,7 @@ public interface ISharedToolWindow
         /// Called when a file becomes the active file (e.g. when user selects a tab).
         /// </summary>
         /// <param name="ctx"></param>
-        void SetCurrentFile(FileViewContext ctx);
+        void SetCurrentFile(IFileViewContext ctx);
 
         /// <summary>
         /// Called whenever the current file has been changed.

src/LogExpert.Core/LogExpert.Core.csproj

@@ -8,6 +8,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
+    <PublishAot>false</PublishAot>
+    <NoWarn>CS8625;CS8603;CS8618;CS8600;CS8603;CS8602;CS8604;CS8622;CS8601;</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,7 +23,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NLog" />
-    <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -14,14 +14,15 @@
 using LogExpert.UI.Controls.LogTabWindow;
 using LogExpert.UI.Dialogs;
 using LogExpert.UI.Extensions.Forms;
+using LogExpert.UI.Interface;
 using NLog;
 using WeifenLuo.WinFormsUI.Docking;
 //using static LogExpert.PluginRegistry.PluginRegistry; //TODO: Adjust the instance name so using static can be used.
 
 namespace LogExpert.UI.Controls.LogWindow
 {
     //TODO: Implemented 4 interfaces explicitly. Find them by searcginh: ILogWindow.<method name>
-    internal partial class LogWindow : DockContent, ILogPaintContext, ILogView, ILogWindow
+    internal partial class LogWindow : DockContent, ILogPaintContextUI, ILogView, ILogWindow
     {
         #region Fields
 

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

@@ -1,14 +1,8 @@
-using LogExpert.Classes;
-using LogExpert.Core.Classes;
+using LogExpert.Core.Classes;
 using LogExpert.Core.EventArguments;
-using LogExpert.UI.Controls.LogWindow;
+using LogExpert.UI.Extensions;
 using NLog;
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
 namespace LogExpert.UI.Controls.LogWindow
 {
     internal partial class TimeSpreadingControl : UserControl
@@ -17,9 +11,9 @@
 
         #region Fields
 
         private Bitmap _bitmap = new(1, 1);
         private int _displayHeight = 1;
         private readonly int _edgeOffset = (int)Win32.GetSystemMetricsForDpi(Win32.SM_CYVSCROLL);
         private int _lastMouseY = 0;
         private readonly object _monitor = new();
         private int _rectHeight = 1;

src/LogExpert.UI/Dialogs/BookmarkWindow.cs

@@ -4,14 +4,8 @@
 using LogExpert.Core.Interface;
 using LogExpert.UI.Entities;
 using LogExpert.UI.Extensions.Forms;
-
+using LogExpert.UI.Interface;
 using NLog;
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace LogExpert.Dialogs;
@@ -25,7 +19,7 @@ public partial class BookmarkWindow : DockContent, ISharedToolWindow, IBookmarkV
     private readonly object paintLock = new();
 
     private IBookmarkData bookmarkData;
-    private ILogPaintContext logPaintContext;
+    private ILogPaintContextUI logPaintContext;
     private ILogView logView;
 
     #endregion
@@ -218,15 +212,15 @@ public void PreferencesChanged(Preferences newPreferences, bool isLoadTime, Sett
         PreferencesChanged(newPreferences, isLoadTime, flags, null);
     }
 
-    public void SetCurrentFile(FileViewContext ctx)
+    public void SetCurrentFile(IFileViewContext ctx)
     {
         if (ctx != null)
         {
             _logger.Debug("Current file changed to {0}", ctx.LogView.FileName);
             lock (paintLock)
             {
                 logView = ctx.LogView;
-                logPaintContext = ctx.LogPaintContext;
+                logPaintContext = (ILogPaintContextUI)ctx.LogPaintContext;
             }
 
             SetColumnizer(ctx.LogView.CurrentColumnizer);

src/LogExpert.UI/Dialogs/ChooseIconDlg.cs

@@ -1,5 +1,4 @@
-using LogExpert.Core.Classes;
-
+using LogExpert.UI.Extensions;
 using System.Runtime.Versioning;
 
 namespace LogExpert.UI.Dialogs;