From c3b2dd9d6466615ceb82f0bd0cfda295a0a9022c Mon Sep 17 00:00:00 2001 From: Sparronator9999 <86388887+Sparronator9999@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:31:23 +1100 Subject: [PATCH] Merge config and logging libraries into common library - UI scale factor fix for some elements --- .../Configs}/ChargeLimitConf.cs | 2 +- YAMDCC.Common/{ => Configs}/CommonConfig.cs | 4 +- .../Configs}/FanConf.cs | 2 +- .../Configs}/FanCurveConf.cs | 2 +- .../Configs}/FanMode.cs | 2 +- .../Configs}/FanModeConf.cs | 2 +- .../Configs}/FanRPMConf.cs | 2 +- .../Configs}/FullBlastConf.cs | 2 +- .../{ => Configs}/InvalidConfigException.cs | 2 +- .../Configs}/KeyLightConf.cs | 2 +- .../Configs}/KeySwapConf.cs | 2 +- .../Configs}/PerfMode.cs | 2 +- .../Configs}/PerfModeConf.cs | 2 +- .../Configs}/RegConf.cs | 2 +- .../Configs}/TempThreshold.cs | 2 +- .../Configs}/YAMDCC_Config.cs | 3 +- .../Logs}/LogLevel.cs | 2 +- {YAMDCC.Logs => YAMDCC.Common/Logs}/Logger.cs | 2 +- YAMDCC.Common/Paths.cs | 8 +++ YAMDCC.Common/YAMDCC.Common.csproj | 7 +-- YAMDCC.Config/YAMDCC.Config.csproj | 24 ------- YAMDCC.Config/packages.lock.json | 20 ------ YAMDCC.ConfigEditor/MainForm.Designer.cs | 10 ++- YAMDCC.ConfigEditor/MainForm.cs | 18 +++--- YAMDCC.ConfigEditor/MainForm.resx | 62 ++++++++++++++++--- YAMDCC.ConfigEditor/Program.cs | 1 + .../YAMDCC.ConfigEditor.csproj | 5 +- YAMDCC.ConfigEditor/packages.lock.json | 32 ++-------- YAMDCC.ECAccess/YAMDCC.ECAccess.csproj | 4 +- YAMDCC.ECInspector/YAMDCC.ECInspector.csproj | 4 +- YAMDCC.ECInspector/packages.lock.json | 8 +-- YAMDCC.Logs/YAMDCC.Logs.csproj | 21 ------- YAMDCC.Logs/packages.lock.json | 10 --- YAMDCC.Service/FanControlService.cs | 4 +- YAMDCC.Service/Program.cs | 3 +- YAMDCC.Service/YAMDCC.Service.csproj | 6 +- YAMDCC.Service/packages.lock.json | 14 +---- YAMDCC.Updater/Program.cs | 1 + YAMDCC.Updater/UpdateForm.cs | 1 + YAMDCC.Updater/YAMDCC.Updater.csproj | 4 +- YAMDCC.Updater/packages.lock.json | 6 -- YAMDCC.sln | 12 ---- 42 files changed, 123 insertions(+), 201 deletions(-) rename {YAMDCC.Config => YAMDCC.Common/Configs}/ChargeLimitConf.cs (97%) rename YAMDCC.Common/{ => Configs}/CommonConfig.cs (98%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/FanConf.cs (98%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/FanCurveConf.cs (98%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/FanMode.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/FanModeConf.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/FanRPMConf.cs (98%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/FullBlastConf.cs (97%) rename YAMDCC.Common/{ => Configs}/InvalidConfigException.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/KeyLightConf.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/KeySwapConf.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/PerfMode.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/PerfModeConf.cs (97%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/RegConf.cs (98%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/TempThreshold.cs (98%) rename {YAMDCC.Config => YAMDCC.Common/Configs}/YAMDCC_Config.cs (99%) rename {YAMDCC.Logs => YAMDCC.Common/Logs}/LogLevel.cs (97%) rename {YAMDCC.Logs => YAMDCC.Common/Logs}/Logger.cs (99%) delete mode 100644 YAMDCC.Config/YAMDCC.Config.csproj delete mode 100644 YAMDCC.Config/packages.lock.json delete mode 100644 YAMDCC.Logs/YAMDCC.Logs.csproj delete mode 100644 YAMDCC.Logs/packages.lock.json diff --git a/YAMDCC.Config/ChargeLimitConf.cs b/YAMDCC.Common/Configs/ChargeLimitConf.cs similarity index 97% rename from YAMDCC.Config/ChargeLimitConf.cs rename to YAMDCC.Common/Configs/ChargeLimitConf.cs index ecbd37d..c58be5b 100644 --- a/YAMDCC.Config/ChargeLimitConf.cs +++ b/YAMDCC.Common/Configs/ChargeLimitConf.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a charge limit config for a laptop. diff --git a/YAMDCC.Common/CommonConfig.cs b/YAMDCC.Common/Configs/CommonConfig.cs similarity index 98% rename from YAMDCC.Common/CommonConfig.cs rename to YAMDCC.Common/Configs/CommonConfig.cs index 0a2d3c2..f7f27a8 100644 --- a/YAMDCC.Common/CommonConfig.cs +++ b/YAMDCC.Common/Configs/CommonConfig.cs @@ -18,9 +18,9 @@ using System.IO; using System.Xml; using System.Xml.Serialization; -using YAMDCC.Logs; +using YAMDCC.Common.Logs; -namespace YAMDCC.Common; +namespace YAMDCC.Common.Configs; public class CommonConfig { diff --git a/YAMDCC.Config/FanConf.cs b/YAMDCC.Common/Configs/FanConf.cs similarity index 98% rename from YAMDCC.Config/FanConf.cs rename to YAMDCC.Common/Configs/FanConf.cs index e0e549c..4536aed 100644 --- a/YAMDCC.Config/FanConf.cs +++ b/YAMDCC.Common/Configs/FanConf.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration for a fan in the target laptop. diff --git a/YAMDCC.Config/FanCurveConf.cs b/YAMDCC.Common/Configs/FanCurveConf.cs similarity index 98% rename from YAMDCC.Config/FanCurveConf.cs rename to YAMDCC.Common/Configs/FanCurveConf.cs index 37a5964..654df87 100644 --- a/YAMDCC.Config/FanCurveConf.cs +++ b/YAMDCC.Common/Configs/FanCurveConf.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a fan profile (a.k.a. fan curve) config. diff --git a/YAMDCC.Config/FanMode.cs b/YAMDCC.Common/Configs/FanMode.cs similarity index 97% rename from YAMDCC.Config/FanMode.cs rename to YAMDCC.Common/Configs/FanMode.cs index d2bcde2..5120914 100644 --- a/YAMDCC.Config/FanMode.cs +++ b/YAMDCC.Common/Configs/FanMode.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration for an diff --git a/YAMDCC.Config/FanModeConf.cs b/YAMDCC.Common/Configs/FanModeConf.cs similarity index 97% rename from YAMDCC.Config/FanModeConf.cs rename to YAMDCC.Common/Configs/FanModeConf.cs index 4fb59a7..99f292c 100644 --- a/YAMDCC.Config/FanModeConf.cs +++ b/YAMDCC.Common/Configs/FanModeConf.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Contains an MSI laptop's various fan modes diff --git a/YAMDCC.Config/FanRPMConf.cs b/YAMDCC.Common/Configs/FanRPMConf.cs similarity index 98% rename from YAMDCC.Config/FanRPMConf.cs rename to YAMDCC.Common/Configs/FanRPMConf.cs index 493e409..641de7c 100644 --- a/YAMDCC.Config/FanRPMConf.cs +++ b/YAMDCC.Common/Configs/FanRPMConf.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration describing how diff --git a/YAMDCC.Config/FullBlastConf.cs b/YAMDCC.Common/Configs/FullBlastConf.cs similarity index 97% rename from YAMDCC.Config/FullBlastConf.cs rename to YAMDCC.Common/Configs/FullBlastConf.cs index 7582e97..903fe58 100644 --- a/YAMDCC.Config/FullBlastConf.cs +++ b/YAMDCC.Common/Configs/FullBlastConf.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a Full Blast configuration. diff --git a/YAMDCC.Common/InvalidConfigException.cs b/YAMDCC.Common/Configs/InvalidConfigException.cs similarity index 97% rename from YAMDCC.Common/InvalidConfigException.cs rename to YAMDCC.Common/Configs/InvalidConfigException.cs index f208495..08979b1 100644 --- a/YAMDCC.Common/InvalidConfigException.cs +++ b/YAMDCC.Common/Configs/InvalidConfigException.cs @@ -16,7 +16,7 @@ using System; -namespace YAMDCC.Common; +namespace YAMDCC.Common.Configs; /// /// The exception thrown when an invalid is loaded. diff --git a/YAMDCC.Config/KeyLightConf.cs b/YAMDCC.Common/Configs/KeyLightConf.cs similarity index 97% rename from YAMDCC.Config/KeyLightConf.cs rename to YAMDCC.Common/Configs/KeyLightConf.cs index c9aa5a4..a0fdf6b 100644 --- a/YAMDCC.Config/KeyLightConf.cs +++ b/YAMDCC.Common/Configs/KeyLightConf.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration for the keyboard backlight in a laptop. diff --git a/YAMDCC.Config/KeySwapConf.cs b/YAMDCC.Common/Configs/KeySwapConf.cs similarity index 97% rename from YAMDCC.Config/KeySwapConf.cs rename to YAMDCC.Common/Configs/KeySwapConf.cs index 2f7dd05..caa7eea 100644 --- a/YAMDCC.Config/KeySwapConf.cs +++ b/YAMDCC.Common/Configs/KeySwapConf.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration for the Win/Fn key swap feature of a laptop. diff --git a/YAMDCC.Config/PerfMode.cs b/YAMDCC.Common/Configs/PerfMode.cs similarity index 97% rename from YAMDCC.Config/PerfMode.cs rename to YAMDCC.Common/Configs/PerfMode.cs index e6ee4e4..8b956a3 100644 --- a/YAMDCC.Config/PerfMode.cs +++ b/YAMDCC.Common/Configs/PerfMode.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration for an diff --git a/YAMDCC.Config/PerfModeConf.cs b/YAMDCC.Common/Configs/PerfModeConf.cs similarity index 97% rename from YAMDCC.Config/PerfModeConf.cs rename to YAMDCC.Common/Configs/PerfModeConf.cs index 8cca725..4b625b1 100644 --- a/YAMDCC.Config/PerfModeConf.cs +++ b/YAMDCC.Common/Configs/PerfModeConf.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a configuration for the performance modes of a laptop diff --git a/YAMDCC.Config/RegConf.cs b/YAMDCC.Common/Configs/RegConf.cs similarity index 98% rename from YAMDCC.Config/RegConf.cs rename to YAMDCC.Common/Configs/RegConf.cs index cc8d4d5..72064cd 100644 --- a/YAMDCC.Config/RegConf.cs +++ b/YAMDCC.Common/Configs/RegConf.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents miscellaneous EC register configurations for the target diff --git a/YAMDCC.Config/TempThreshold.cs b/YAMDCC.Common/Configs/TempThreshold.cs similarity index 98% rename from YAMDCC.Config/TempThreshold.cs rename to YAMDCC.Common/Configs/TempThreshold.cs index baf15f4..f39481a 100644 --- a/YAMDCC.Config/TempThreshold.cs +++ b/YAMDCC.Common/Configs/TempThreshold.cs @@ -16,7 +16,7 @@ using System.Xml.Serialization; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; /// /// Represents a fan speed/temperature threshold setting for a fan curve. diff --git a/YAMDCC.Config/YAMDCC_Config.cs b/YAMDCC.Common/Configs/YAMDCC_Config.cs similarity index 99% rename from YAMDCC.Config/YAMDCC_Config.cs rename to YAMDCC.Common/Configs/YAMDCC_Config.cs index 0fa77ad..19cd7da 100644 --- a/YAMDCC.Config/YAMDCC_Config.cs +++ b/YAMDCC.Common/Configs/YAMDCC_Config.cs @@ -19,9 +19,8 @@ using System.IO; using System.Xml; using System.Xml.Serialization; -using YAMDCC.Common; -namespace YAMDCC.Config; +namespace YAMDCC.Common.Configs; // IDE0079: Remove unnecessary suppression (even though it *is* necessary) #pragma warning disable IDE0079 diff --git a/YAMDCC.Logs/LogLevel.cs b/YAMDCC.Common/Logs/LogLevel.cs similarity index 97% rename from YAMDCC.Logs/LogLevel.cs rename to YAMDCC.Common/Logs/LogLevel.cs index 81dae73..34ddf5b 100644 --- a/YAMDCC.Logs/LogLevel.cs +++ b/YAMDCC.Common/Logs/LogLevel.cs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License along with // YAMDCC. If not, see . -namespace YAMDCC.Logs; +namespace YAMDCC.Common.Logs; /// /// The verbosity of logs diff --git a/YAMDCC.Logs/Logger.cs b/YAMDCC.Common/Logs/Logger.cs similarity index 99% rename from YAMDCC.Logs/Logger.cs rename to YAMDCC.Common/Logs/Logger.cs index 1cb12cd..5e059be 100644 --- a/YAMDCC.Logs/Logger.cs +++ b/YAMDCC.Common/Logs/Logger.cs @@ -19,7 +19,7 @@ using System.IO.Compression; using System.Reflection; -namespace YAMDCC.Logs; +namespace YAMDCC.Common.Logs; /// /// A simple logger class for writing logs to diff --git a/YAMDCC.Common/Paths.cs b/YAMDCC.Common/Paths.cs index 70c92e5..0e23ac2 100644 --- a/YAMDCC.Common/Paths.cs +++ b/YAMDCC.Common/Paths.cs @@ -70,4 +70,12 @@ public static class Paths /// (C:\ProgramData\Sparronator9999\YAMDCC\CurrentConfig.xml on Windows) /// public static readonly string CurrentConf = Path.Combine(Data, "CurrentConfig.xml"); + + /// + /// The path where the currently applied Hotkey Handler config is saved. + /// + /// + /// (C:\ProgramData\Sparronator9999\YAMDCC\HotkeyConfig.xml on Windows) + /// + public static readonly string HotkeyConf = Path.Combine(Data, "HotkeyConfig.xml"); } diff --git a/YAMDCC.Common/YAMDCC.Common.csproj b/YAMDCC.Common/YAMDCC.Common.csproj index 3921c4f..8db99ed 100644 --- a/YAMDCC.Common/YAMDCC.Common.csproj +++ b/YAMDCC.Common/YAMDCC.Common.csproj @@ -12,8 +12,8 @@ win7-x64;win7-x86;win-x64;win-x86 net48 YAMDCC common code library - 1.0.3 - release + 1.0.4 + dev none @@ -28,9 +28,6 @@ - - - diff --git a/YAMDCC.Config/YAMDCC.Config.csproj b/YAMDCC.Config/YAMDCC.Config.csproj deleted file mode 100644 index ea448ad..0000000 --- a/YAMDCC.Config/YAMDCC.Config.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - latest-recommended - YAMDCC config library - Sparronator9999 - Copyright © 2023-2025 Sparronator9999 (and Contributors) - True - 13.0 - Library - GPL-3.0-or-later - true - win7-x64;win7-x86;win-x64;win-x86 - net48 - YAMDCC config library - 1.0.3 - release - - - none - - - - - diff --git a/YAMDCC.Config/packages.lock.json b/YAMDCC.Config/packages.lock.json deleted file mode 100644 index ac27247..0000000 --- a/YAMDCC.Config/packages.lock.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "dependencies": { - ".NETFramework,Version=v4.8": { - "yamdcc.common": { - "type": "Project", - "dependencies": { - "YAMDCC.Logs": "[1.0.0-release, )" - } - }, - "yamdcc.logs": { - "type": "Project" - } - }, - ".NETFramework,Version=v4.8/win-x64": {}, - ".NETFramework,Version=v4.8/win-x86": {}, - ".NETFramework,Version=v4.8/win7-x64": {}, - ".NETFramework,Version=v4.8/win7-x86": {} - } -} \ No newline at end of file diff --git a/YAMDCC.ConfigEditor/MainForm.Designer.cs b/YAMDCC.ConfigEditor/MainForm.Designer.cs index 738cc19..a2848a3 100644 --- a/YAMDCC.ConfigEditor/MainForm.Designer.cs +++ b/YAMDCC.ConfigEditor/MainForm.Designer.cs @@ -766,8 +766,8 @@ private void InitializeComponent() // this.lblKeyLightLow.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblKeyLightLow.AutoSize = true; - this.lblKeyLightLow.Location = new System.Drawing.Point(3, 18); - this.lblKeyLightLow.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3); + this.lblKeyLightLow.Location = new System.Drawing.Point(3, 16); + this.lblKeyLightLow.Margin = new System.Windows.Forms.Padding(3, 0, 0, 3); this.lblKeyLightLow.Name = "lblKeyLightLow"; this.lblKeyLightLow.Size = new System.Drawing.Size(24, 15); this.lblKeyLightLow.TabIndex = 0; @@ -787,8 +787,8 @@ private void InitializeComponent() // this.lblKeyLightHigh.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblKeyLightHigh.AutoSize = true; - this.lblKeyLightHigh.Location = new System.Drawing.Point(183, 18); - this.lblKeyLightHigh.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.lblKeyLightHigh.Location = new System.Drawing.Point(183, 16); + this.lblKeyLightHigh.Margin = new System.Windows.Forms.Padding(0, 0, 3, 3); this.lblKeyLightHigh.Name = "lblKeyLightHigh"; this.lblKeyLightHigh.Size = new System.Drawing.Size(39, 15); this.lblKeyLightHigh.TabIndex = 2; @@ -1115,8 +1115,6 @@ private void InitializeComponent() this.MaximizeBox = false; this.Name = "MainForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindow_Closing); - this.Load += new System.EventHandler(this.MainWindow_Load); menuStrip.ResumeLayout(false); menuStrip.PerformLayout(); tcMain.ResumeLayout(false); diff --git a/YAMDCC.ConfigEditor/MainForm.cs b/YAMDCC.ConfigEditor/MainForm.cs index c1bdc9d..8a39d5b 100644 --- a/YAMDCC.ConfigEditor/MainForm.cs +++ b/YAMDCC.ConfigEditor/MainForm.cs @@ -21,10 +21,10 @@ using System.IO; using System.Windows.Forms; using YAMDCC.Common; +using YAMDCC.Common.Configs; using YAMDCC.Common.Dialogs; -using YAMDCC.Config; +using YAMDCC.Common.Logs; using YAMDCC.IPC; -using YAMDCC.Logs; namespace YAMDCC.ConfigEditor; @@ -154,8 +154,9 @@ public MainForm() } #region Events - private void MainWindow_Load(object sender, EventArgs e) + protected override void OnLoad(EventArgs e) { + base.OnLoad(e); IPCClient.ServerMessage += new EventHandler>(IPCMessage); IPCClient.Error += new EventHandler>(IPCError); IPCClient.Start(); @@ -197,8 +198,9 @@ private void MainWindow_Load(object sender, EventArgs e) } } - private void MainWindow_Closing(object sender, FormClosingEventArgs e) + protected override void OnFormClosing(FormClosingEventArgs e) { + base.OnFormClosing(e); // Disable Full Blast if it was enabled while the program was running: if (chkFullBlast.Checked) { @@ -645,7 +647,7 @@ private void FanSelChanged(object sender, EventArgs e) if (numFanSpds is null || numFanSpds.Length != cfg.FanCurveRegs.Length) { tblCurve.SuspendLayout(); - float scale = CurrentAutoScaleDimensions.Height / 72; + float scale = CurrentAutoScaleDimensions.Height / 96; tblCurve.Controls.Clear(); numUpTs = new NumericUpDown[cfg.UpThresholdRegs.Length]; @@ -675,7 +677,7 @@ private void FanSelChanged(object sender, EventArgs e) { Dock = DockStyle.Fill, LargeChange = 10, - Margin = new Padding((int)(10 * scale), 0, (int)(10 * scale), 0), + Margin = new Padding((int)(12 * scale), 0, (int)(12 * scale), 0), Orientation = Orientation.Vertical, Tag = i, TickFrequency = 5, @@ -1217,7 +1219,7 @@ private static Label FanCurveLabel(string text, float scale, ContentAlignment al { AutoSize = true, Dock = DockStyle.Fill, - Margin = new Padding((int)(2 * scale)), + Margin = new Padding((int)(3 * scale)), Padding = new Padding(0, 0, 0, (int)(3 * scale)), Text = text, TextAlign = align, @@ -1230,7 +1232,7 @@ private static NumericUpDown FanCurveNUD(int tag, float scale) { Dock = DockStyle.Fill, Height = (int)(23 * scale), - Margin = new Padding((int)(2 * scale)), + Margin = new Padding((int)(3 * scale)), Tag = tag, }; } diff --git a/YAMDCC.ConfigEditor/MainForm.resx b/YAMDCC.ConfigEditor/MainForm.resx index 32698d5..6cf483c 100644 --- a/YAMDCC.ConfigEditor/MainForm.resx +++ b/YAMDCC.ConfigEditor/MainForm.resx @@ -129,7 +129,10 @@ False - + + False + + False @@ -141,22 +144,31 @@ False - + False - + False - + False - + False - + False - + + False + + + False + + + False + + False @@ -189,6 +201,42 @@ False + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + False diff --git a/YAMDCC.ConfigEditor/Program.cs b/YAMDCC.ConfigEditor/Program.cs index ad0bea5..555cf4a 100644 --- a/YAMDCC.ConfigEditor/Program.cs +++ b/YAMDCC.ConfigEditor/Program.cs @@ -22,6 +22,7 @@ using System.Threading; using System.Windows.Forms; using YAMDCC.Common; +using YAMDCC.Common.Configs; using YAMDCC.Common.Dialogs; namespace YAMDCC.ConfigEditor; diff --git a/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj index 8d5b023..d64adac 100644 --- a/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj +++ b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj @@ -20,8 +20,8 @@ net48 YAMDCC config editor true - 1.0.3 - release + 1.0.4 + dev none @@ -37,7 +37,6 @@ - diff --git a/YAMDCC.ConfigEditor/packages.lock.json b/YAMDCC.ConfigEditor/packages.lock.json index 699baf4..22c70ac 100644 --- a/YAMDCC.ConfigEditor/packages.lock.json +++ b/YAMDCC.ConfigEditor/packages.lock.json @@ -104,36 +104,21 @@ "ec-inspect": { "type": "Project", "dependencies": { - "YAMDCC.Common": "[1.0.1-dev, )", + "YAMDCC.Common": "[1.0.3-release, )", "YAMDCC.IPC": "[2.1.3-release, )" } }, - "HotkeyHandler": { - "type": "Project", - "dependencies": { - "YAMDCC.Common": "[1.0.1-dev, )" - } - }, "Updater": { "type": "Project", "dependencies": { "MarkedNet": "[2.1.4, )", "Newtonsoft.Json": "[13.0.3, )", "TaskScheduler": "[2.11.0, )", - "YAMDCC.Common": "[1.0.1-dev, )" + "YAMDCC.Common": "[1.0.3-release, )" } }, "yamdcc.common": { - "type": "Project", - "dependencies": { - "YAMDCC.Logs": "[1.0.1-dev, )" - } - }, - "yamdcc.config": { - "type": "Project", - "dependencies": { - "YAMDCC.Common": "[1.0.1-dev, )" - } + "type": "Project" }, "yamdcc.ecaccess": { "type": "Project" @@ -144,17 +129,12 @@ "MessagePack": "[3.1.3, )" } }, - "yamdcc.logs": { - "type": "Project" - }, "yamdccsvc": { "type": "Project", "dependencies": { - "YAMDCC.Common": "[1.0.1-dev, )", - "YAMDCC.Config": "[1.0.1-dev, )", - "YAMDCC.ECAccess": "[1.0.1-dev, )", - "YAMDCC.IPC": "[2.1.3-release, )", - "YAMDCC.Logs": "[1.0.1-dev, )" + "YAMDCC.Common": "[1.0.3-release, )", + "YAMDCC.ECAccess": "[1.0.3-release, )", + "YAMDCC.IPC": "[2.1.3-release, )" } } }, diff --git a/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj b/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj index 490423e..dc58b10 100644 --- a/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj +++ b/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj @@ -13,8 +13,8 @@ win7-x64;win7-x86;win-x64;win-x86 net48 YAMDCC EC library - 1.0.3 - release + 1.0.4 + dev none diff --git a/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj b/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj index 0d16094..369c513 100644 --- a/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj +++ b/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj @@ -18,8 +18,8 @@ net48 YAMDCC EC inspector true - 1.0.3 - release + 1.0.4 + dev none diff --git a/YAMDCC.ECInspector/packages.lock.json b/YAMDCC.ECInspector/packages.lock.json index b13e27a..a9b38e3 100644 --- a/YAMDCC.ECInspector/packages.lock.json +++ b/YAMDCC.ECInspector/packages.lock.json @@ -87,19 +87,13 @@ } }, "yamdcc.common": { - "type": "Project", - "dependencies": { - "YAMDCC.Logs": "[1.0.1-dev, )" - } + "type": "Project" }, "yamdcc.ipc": { "type": "Project", "dependencies": { "MessagePack": "[3.1.3, )" } - }, - "yamdcc.logs": { - "type": "Project" } }, ".NETFramework,Version=v4.8/win-x64": {}, diff --git a/YAMDCC.Logs/YAMDCC.Logs.csproj b/YAMDCC.Logs/YAMDCC.Logs.csproj deleted file mode 100644 index d28d032..0000000 --- a/YAMDCC.Logs/YAMDCC.Logs.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - latest-recommended - YAMDCC logging library - Sparronator9999 - Copyright © 2023-2025 Sparronator9999 (and Contributors) - True - 13.0 - Library - GPL-3.0-or-later - true - win7-x64;win7-x86;win-x64;win-x86 - net48 - YAMDCC logging library - 1.0.3 - release - - - none - - diff --git a/YAMDCC.Logs/packages.lock.json b/YAMDCC.Logs/packages.lock.json deleted file mode 100644 index 9cb623c..0000000 --- a/YAMDCC.Logs/packages.lock.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 1, - "dependencies": { - ".NETFramework,Version=v4.8": {}, - ".NETFramework,Version=v4.8/win-x64": {}, - ".NETFramework,Version=v4.8/win-x86": {}, - ".NETFramework,Version=v4.8/win7-x64": {}, - ".NETFramework,Version=v4.8/win7-x86": {} - } -} \ No newline at end of file diff --git a/YAMDCC.Service/FanControlService.cs b/YAMDCC.Service/FanControlService.cs index c87a97d..4fe497f 100644 --- a/YAMDCC.Service/FanControlService.cs +++ b/YAMDCC.Service/FanControlService.cs @@ -23,10 +23,10 @@ using System.ServiceProcess; using System.Timers; using YAMDCC.Common; -using YAMDCC.Config; +using YAMDCC.Common.Configs; +using YAMDCC.Common.Logs; using YAMDCC.ECAccess; using YAMDCC.IPC; -using YAMDCC.Logs; namespace YAMDCC.Service; diff --git a/YAMDCC.Service/Program.cs b/YAMDCC.Service/Program.cs index 888737d..cada85a 100644 --- a/YAMDCC.Service/Program.cs +++ b/YAMDCC.Service/Program.cs @@ -18,8 +18,9 @@ using System.ServiceProcess; using System.Windows.Forms; using YAMDCC.Common; +using YAMDCC.Common.Configs; using YAMDCC.Common.Dialogs; -using YAMDCC.Logs; +using YAMDCC.Common.Logs; namespace YAMDCC.Service; diff --git a/YAMDCC.Service/YAMDCC.Service.csproj b/YAMDCC.Service/YAMDCC.Service.csproj index 75df76b..ffeb0b2 100644 --- a/YAMDCC.Service/YAMDCC.Service.csproj +++ b/YAMDCC.Service/YAMDCC.Service.csproj @@ -15,8 +15,8 @@ win7-x64;win7-x86;win-x64;win-x86 net48 YAMDCC service - 1.0.3 - release + 1.0.4 + dev none @@ -41,10 +41,8 @@ - - diff --git a/YAMDCC.Service/packages.lock.json b/YAMDCC.Service/packages.lock.json index 9aba5e1..3c23978 100644 --- a/YAMDCC.Service/packages.lock.json +++ b/YAMDCC.Service/packages.lock.json @@ -87,16 +87,7 @@ } }, "yamdcc.common": { - "type": "Project", - "dependencies": { - "YAMDCC.Logs": "[1.0.1-dev, )" - } - }, - "yamdcc.config": { - "type": "Project", - "dependencies": { - "YAMDCC.Common": "[1.0.1-dev, )" - } + "type": "Project" }, "yamdcc.ecaccess": { "type": "Project" @@ -106,9 +97,6 @@ "dependencies": { "MessagePack": "[3.1.3, )" } - }, - "yamdcc.logs": { - "type": "Project" } }, ".NETFramework,Version=v4.8/win-x64": {}, diff --git a/YAMDCC.Updater/Program.cs b/YAMDCC.Updater/Program.cs index f766e50..f16de4e 100644 --- a/YAMDCC.Updater/Program.cs +++ b/YAMDCC.Updater/Program.cs @@ -21,6 +21,7 @@ using System.Threading; using System.Windows.Forms; using YAMDCC.Common; +using YAMDCC.Common.Configs; using YAMDCC.Common.Dialogs; using YAMDCC.Updater.GitHubApi; diff --git a/YAMDCC.Updater/UpdateForm.cs b/YAMDCC.Updater/UpdateForm.cs index 72a0217..c6f9da5 100644 --- a/YAMDCC.Updater/UpdateForm.cs +++ b/YAMDCC.Updater/UpdateForm.cs @@ -26,6 +26,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using YAMDCC.Common; +using YAMDCC.Common.Configs; using YAMDCC.Updater.GitHubApi; namespace YAMDCC.Updater; diff --git a/YAMDCC.Updater/YAMDCC.Updater.csproj b/YAMDCC.Updater/YAMDCC.Updater.csproj index fe3f133..7acf6bd 100644 --- a/YAMDCC.Updater/YAMDCC.Updater.csproj +++ b/YAMDCC.Updater/YAMDCC.Updater.csproj @@ -17,8 +17,8 @@ net48 YAMDCC updater true - 1.0.3 - release + 1.0.4 + dev none diff --git a/YAMDCC.Updater/packages.lock.json b/YAMDCC.Updater/packages.lock.json index 1422fe9..aad98d2 100644 --- a/YAMDCC.Updater/packages.lock.json +++ b/YAMDCC.Updater/packages.lock.json @@ -21,12 +21,6 @@ "contentHash": "p9wH58XSNIyUtO7PIFAEldaKUzpYmlj+YWAfnUqBKnGxIZRY51I9BrsBGJijUVwlxrgmLLPUigRIv2ZTD4uPJA==" }, "yamdcc.common": { - "type": "Project", - "dependencies": { - "YAMDCC.Logs": "[1.0.0-release, )" - } - }, - "yamdcc.logs": { "type": "Project" } }, diff --git a/YAMDCC.sln b/YAMDCC.sln index 7b74c3f..97f3300 100644 --- a/YAMDCC.sln +++ b/YAMDCC.sln @@ -8,8 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.Config", "YAMDCC.Config\YAMDCC.Config.csproj", "{F4FD34BF-5F9A-4271-A1E4-515C82A189F6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.ECAccess", "YAMDCC.ECAccess\YAMDCC.ECAccess.csproj", "{EDCEB6F6-B97C-4343-969E-AA58F887A0FE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.ConfigEditor", "YAMDCC.ConfigEditor\YAMDCC.ConfigEditor.csproj", "{5025D7BC-1BE1-4B72-B30A-893B25F73596}" @@ -18,8 +16,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.IPC", "YAMDCC.IPC\YA EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.Service", "YAMDCC.Service\YAMDCC.Service.csproj", "{D99C674A-7949-4402-A9DE-088C1F7BB361}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YAMDCC.Logs", "YAMDCC.Logs\YAMDCC.Logs.csproj", "{46F94C80-4C0D-43E4-9970-D1925024C99E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YAMDCC.Common", "YAMDCC.Common\YAMDCC.Common.csproj", "{EE3AF4BE-7CA3-4E37-A85F-5A157FD35960}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YAMDCC.ECInspector", "YAMDCC.ECInspector\YAMDCC.ECInspector.csproj", "{DBEB870B-B5F6-4519-B7CA-D621ED78FD86}" @@ -34,10 +30,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F4FD34BF-5F9A-4271-A1E4-515C82A189F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4FD34BF-5F9A-4271-A1E4-515C82A189F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4FD34BF-5F9A-4271-A1E4-515C82A189F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4FD34BF-5F9A-4271-A1E4-515C82A189F6}.Release|Any CPU.Build.0 = Release|Any CPU {EDCEB6F6-B97C-4343-969E-AA58F887A0FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDCEB6F6-B97C-4343-969E-AA58F887A0FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDCEB6F6-B97C-4343-969E-AA58F887A0FE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -54,10 +46,6 @@ Global {D99C674A-7949-4402-A9DE-088C1F7BB361}.Debug|Any CPU.Build.0 = Debug|Any CPU {D99C674A-7949-4402-A9DE-088C1F7BB361}.Release|Any CPU.ActiveCfg = Release|Any CPU {D99C674A-7949-4402-A9DE-088C1F7BB361}.Release|Any CPU.Build.0 = Release|Any CPU - {46F94C80-4C0D-43E4-9970-D1925024C99E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46F94C80-4C0D-43E4-9970-D1925024C99E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46F94C80-4C0D-43E4-9970-D1925024C99E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46F94C80-4C0D-43E4-9970-D1925024C99E}.Release|Any CPU.Build.0 = Release|Any CPU {EE3AF4BE-7CA3-4E37-A85F-5A157FD35960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EE3AF4BE-7CA3-4E37-A85F-5A157FD35960}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE3AF4BE-7CA3-4E37-A85F-5A157FD35960}.Release|Any CPU.ActiveCfg = Release|Any CPU