diff --git a/src/ColumnizerLib/ColumnizerLib.csproj b/src/ColumnizerLib/ColumnizerLib.csproj index e359e5c2..ec4cc262 100644 --- a/src/ColumnizerLib/ColumnizerLib.csproj +++ b/src/ColumnizerLib/ColumnizerLib.csproj @@ -5,7 +5,6 @@ Properties LogExpert false - true $(SolutionDir)..\bin\Docs\ColumnizerLib.xml false false diff --git a/src/CsvColumnizer/CsvColumnizer.cs b/src/CsvColumnizer/CsvColumnizer.cs index 1b06162b..d2e46764 100644 --- a/src/CsvColumnizer/CsvColumnizer.cs +++ b/src/CsvColumnizer/CsvColumnizer.cs @@ -6,8 +6,10 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.Versioning; using System.Windows.Forms; +[assembly: SupportedOSPlatform("windows")] namespace CsvColumnizer { /// diff --git a/src/CsvColumnizer/CsvColumnizer.csproj b/src/CsvColumnizer/CsvColumnizer.csproj index 49d00cc8..070afa9e 100644 --- a/src/CsvColumnizer/CsvColumnizer.csproj +++ b/src/CsvColumnizer/CsvColumnizer.csproj @@ -10,7 +10,6 @@ false $(SolutionDir)..\bin\$(Configuration)\plugins true - CA1416; False diff --git a/src/DefaultPlugins/DefaultPlugins.csproj b/src/DefaultPlugins/DefaultPlugins.csproj index 341029e4..d3c7b1c6 100644 --- a/src/DefaultPlugins/DefaultPlugins.csproj +++ b/src/DefaultPlugins/DefaultPlugins.csproj @@ -10,7 +10,6 @@ true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/DefaultPlugins/Eminus.cs b/src/DefaultPlugins/Eminus.cs index 68e38a6f..d062fd5a 100644 --- a/src/DefaultPlugins/Eminus.cs +++ b/src/DefaultPlugins/Eminus.cs @@ -6,7 +6,9 @@ using System.IO; using System.Runtime.Serialization; using Newtonsoft.Json; +using System.Runtime.Versioning; +[assembly: SupportedOSPlatform("windows")] namespace LogExpert { public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator diff --git a/src/FlashIconHighlighter/FlashIconHighlighter.csproj b/src/FlashIconHighlighter/FlashIconHighlighter.csproj index 32d5dbc2..cc54b3b7 100644 --- a/src/FlashIconHighlighter/FlashIconHighlighter.csproj +++ b/src/FlashIconHighlighter/FlashIconHighlighter.csproj @@ -9,7 +9,6 @@ true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/FlashIconHighlighter/FlashIconPlugin.cs b/src/FlashIconHighlighter/FlashIconPlugin.cs index ef2b70fc..9572b4d9 100644 --- a/src/FlashIconHighlighter/FlashIconPlugin.cs +++ b/src/FlashIconHighlighter/FlashIconPlugin.cs @@ -2,8 +2,10 @@ using System; using System.Runtime.InteropServices; +using System.Runtime.Versioning; using System.Windows.Forms; +[assembly: SupportedOSPlatform("windows")] namespace FlashIconHighlighter { internal class FlashIconPlugin : IKeywordAction diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs index b542a6cd..c3d9851d 100644 --- a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs +++ b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs @@ -1,14 +1,14 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization; +using System.Runtime.Versioning; using System.Windows.Forms; -using Newtonsoft.Json; - +[assembly: SupportedOSPlatform("windows")] namespace LogExpert { /// diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj index c86df2f4..11231a69 100644 --- a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj +++ b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj @@ -9,7 +9,6 @@ true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 9cd35f32..fdac7b84 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -273,8 +273,6 @@ public void ChangeTheme(Control.ControlCollection container) private delegate void LoadMultiFilesDelegate(string[] fileName, EncodingOptions encodingOptions); - private delegate void ProgressBarEventFx(ProgressEventArgs e); - private delegate void SetColumnizerFx(ILogLineColumnizer columnizer); private delegate void SetTabIconDelegate(LogWindow.LogWindow logWindow, Icon icon); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs index 9b877d46..a8cc552b 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs @@ -353,7 +353,7 @@ private void OnBookmarkRemoved(object sender, EventArgs e) private void OnProgressBarUpdate(object sender, ProgressEventArgs e) { - Invoke(new ProgressBarEventFx(ProgressBarUpdateWorker), e); + Invoke(ProgressBarUpdateWorker, e); } private void OnStatusLineEvent(object sender, StatusLineEventArgs e) diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 32cc4b4f..7cb5c3ca 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -614,10 +614,6 @@ private void OnButtonSizeChanged(object sender, EventArgs e) // used for external wait fx WaitForLoadFinished() - private delegate void UpdateProgressCallback(LoadFileEventArgs e); - - private delegate void LoadingStartedFx(LoadFileEventArgs e); - private delegate void SelectLineFx(int line, bool triggerSyncCall); private Action, List, List> FilterFxAction; diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs index d796b52a..4892ab3c 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs @@ -122,7 +122,7 @@ private void OnLogWindowDisposed(object sender, EventArgs e) private void OnLogFileReaderLoadingStarted(object sender, LoadFileEventArgs e) { - Invoke(new LoadingStartedFx(LoadingStarted), e); + Invoke(LoadingStarted, e); } private void OnLogFileReaderFinishedLoading(object sender, EventArgs e) @@ -211,16 +211,11 @@ private void OnLogFileReaderLoadFile(object sender, LoadFileEventArgs e) //Thread loadThread = new Thread(new ThreadStart(ReloadNewFile)); //loadThread.Start(); _logger.Debug("Reloading invoked."); - return; } - - if (!_isLoading) + else if (_isLoading) { - return; + BeginInvoke(UpdateProgress, e); } - - UpdateProgressCallback callback = UpdateProgress; - BeginInvoke(callback, e); } private void OnFileSizeChanged(object sender, LogEventArgs e) diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs index f04431dc..cfbb7b65 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs @@ -1581,7 +1581,6 @@ private void StatusLineFileSize(long size) private int Search(SearchParams searchParams) { - UpdateProgressBarFx progressFx = UpdateProgressBar; if (searchParams.searchText == null) { return -1; @@ -1679,7 +1678,7 @@ private int Search(SearchParams searchParams) { if (!Disposing) { - Invoke(progressFx, [count]); + Invoke(UpdateProgressBar, [count]); } } catch (ObjectDisposedException ex) // can occur when closing the app while searching diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs index b07a20f4..8f8ef767 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs @@ -81,8 +81,10 @@ public void LoadFile(string fileName, EncodingOptions encodingOptions) try { - _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions); - _logFileReader.UseNewReader = !Preferences.useLegacyReader; + _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions) + { + UseNewReader = !Preferences.useLegacyReader + }; } catch (LogFileException lfe) { diff --git a/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs b/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs index 7c97770d..8cfe3dfe 100644 --- a/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs +++ b/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs @@ -1,38 +1,4 @@ -//using System.Linq; - -namespace LogExpert.Entities.EventArgs +namespace LogExpert.Entities.EventArgs { - public class LoadFileEventArgs - { - #region Fields - - #endregion - - #region cTor - - public LoadFileEventArgs(string fileName, long pos, bool finished, long fileSize, bool newFile) - { - this.FileName = fileName; - this.ReadPos = pos; - this.Finished = finished; - this.FileSize = fileSize; - this.NewFile = newFile; - } - - #endregion - - #region Properties - - public long ReadPos { get; } - - public bool Finished { get; } - - public long FileSize { get; } - - public bool NewFile { get; } - - public string FileName { get; } - - #endregion - } + public record LoadFileEventArgs(string FileName, long ReadPos, bool Finished, long FileSize, bool NewFile); } \ No newline at end of file diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 17baac0b..c4be38e4 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -17,8 +17,8 @@ $(SolutionDir)..\bin\$(Configuration) true PerMonitorV2 - true - CS1591;CA1416; + true + CS1591; False diff --git a/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs b/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs index 7c3315e4..6728420d 100644 --- a/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs +++ b/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs @@ -1,9 +1,9 @@ using LogExpert; - using Moq; - using NUnit.Framework; +using System.Runtime.Versioning; +[assembly: SupportedOSPlatform("windows")] namespace RegexColumnizer.UnitTests { [TestFixture] diff --git a/src/RegexColumnizer/RegexColumnizer.cs b/src/RegexColumnizer/RegexColumnizer.cs index 6cdaf3f0..89143937 100644 --- a/src/RegexColumnizer/RegexColumnizer.cs +++ b/src/RegexColumnizer/RegexColumnizer.cs @@ -2,10 +2,12 @@ using System; using System.IO; using System.Linq; +using System.Runtime.Versioning; using System.Text.RegularExpressions; using System.Windows.Forms; using System.Xml.Serialization; +[assembly: SupportedOSPlatform("windows")] namespace RegexColumnizer { public abstract class BaseRegexColumnizer : ILogLineColumnizer, IColumnizerConfigurator @@ -122,16 +124,16 @@ public void PushValue(ILogLineColumnizerCallback callback, int column, string va public void Configure(ILogLineColumnizerCallback callback, string configDir) { - RegexColumnizerConfigDialog d = new RegexColumnizerConfigDialog {Config = Config}; - if (d.ShowDialog() == DialogResult.OK) + RegexColumnizerConfigDialog dialog = new RegexColumnizerConfigDialog {Config = Config}; + if (dialog.ShowDialog() == DialogResult.OK) { var configFile = GetConfigFile(configDir); using (var w = new FileStream(configFile, FileMode.Create)) { - xml.Serialize(w, d.Config); + xml.Serialize(w, dialog.Config); } - Init(d.Config); + Init(dialog.Config); } } diff --git a/src/RegexColumnizer/RegexColumnizer.csproj b/src/RegexColumnizer/RegexColumnizer.csproj index c8795f55..22af73ea 100644 --- a/src/RegexColumnizer/RegexColumnizer.csproj +++ b/src/RegexColumnizer/RegexColumnizer.csproj @@ -9,7 +9,6 @@ true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/SftpFileSystemx64/ConfigDialog.cs b/src/SftpFileSystemx64/ConfigDialog.cs index 6b570325..78f7f5cc 100644 --- a/src/SftpFileSystemx64/ConfigDialog.cs +++ b/src/SftpFileSystemx64/ConfigDialog.cs @@ -1,6 +1,8 @@ using System; +using System.Runtime.Versioning; using System.Windows.Forms; +[assembly: SupportedOSPlatform("windows")] namespace SftpFileSystem { public partial class ConfigDialog : Form diff --git a/src/SftpFileSystemx64/SftpFileSystemx64.csproj b/src/SftpFileSystemx64/SftpFileSystemx64.csproj index 52746ad5..b9080834 100644 --- a/src/SftpFileSystemx64/SftpFileSystemx64.csproj +++ b/src/SftpFileSystemx64/SftpFileSystemx64.csproj @@ -11,7 +11,6 @@ true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/SftpFileSystemx86/SftpFileSystemx86.csproj b/src/SftpFileSystemx86/SftpFileSystemx86.csproj index 29a83044..339e9ea5 100644 --- a/src/SftpFileSystemx86/SftpFileSystemx86.csproj +++ b/src/SftpFileSystemx86/SftpFileSystemx86.csproj @@ -12,7 +12,6 @@ SftpFileSystemx86 false $(SolutionDir)..\bin\$(Configuration)\pluginsx86 - CA1416; False