diff --git a/installer/DesktopMagic-Installer.exe b/installer/DesktopMagic-Installer.exe index 56ad129..eb12afc 100644 Binary files a/installer/DesktopMagic-Installer.exe and b/installer/DesktopMagic-Installer.exe differ diff --git a/src/DesktopMagic/App.xaml.cs b/src/DesktopMagic/App.xaml.cs index 25550da..25ce5ed 100644 --- a/src/DesktopMagic/App.xaml.cs +++ b/src/DesktopMagic/App.xaml.cs @@ -1,7 +1,5 @@ global using Stone_Red_Utilities.Logging; -using AlwaysUpToDate; - using Stone_Red_C_Sharp_Utilities.Logging; using System; @@ -20,11 +18,7 @@ public partial class App : Application public const string AppName = "Desktop Magic"; private readonly string logFilePath; -#if DEBUG - private readonly Updater updater = new Updater(TimeSpan.FromDays(1), "https://raw.githubusercontent.com/Stone-Red-Code/DesktopMagic/develop/update/updateInfo.json"); -#else - private readonly Updater updater = new Updater(TimeSpan.FromDays(1), "https://raw.githubusercontent.com/Stone-Red-Code/DesktopMagic/main/update/updateInfo.json"); -#endif + private readonly Thread? eventThread; private readonly EventWaitHandle eventWaitHandle; @@ -64,12 +58,6 @@ public App() Setup(true); Exit += CloseHandler; - - updater.ProgressChanged += Updater_ProgressChanged; - updater.OnException += Updater_OnException; - updater.NoUpdateAvailible += Updater_NoUpdateAvailible; - updater.UpdateAvailible += Updater_UpdateAvailible; - updater.Start(); } } @@ -79,26 +67,6 @@ protected void CloseHandler(object sender, EventArgs e) eventThread?.Interrupt(); } - private void Updater_UpdateAvailible(string version, string additionalInformation) - { - updater.Update(); - } - - private void Updater_NoUpdateAvailible() - { - Logger.Log("No update available", "Updater"); - } - - private void Updater_OnException(Exception exception) - { - Logger.Log(exception.ToString(), "Updater"); - } - - private void Updater_ProgressChanged(long? totalFileSize, long totalBytesDownloaded, double? progressPercentage) - { - Logger.Log($"Downloading: {progressPercentage}% {totalBytesDownloaded}/{totalFileSize}", "Updater"); - } - private void Setup(bool clearLogFile) { AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; diff --git a/src/DesktopMagic/DesktopMagic.csproj b/src/DesktopMagic/DesktopMagic.csproj index 61a4b9a..70bf0fa 100644 --- a/src/DesktopMagic/DesktopMagic.csproj +++ b/src/DesktopMagic/DesktopMagic.csproj @@ -7,11 +7,11 @@ icon.ico OnBuildSuccess Stone_Red - 1.0.0.0 + 1.0.1.0 https://github.com/Stone-Red-Code/DesktopMagic https://github.com/Stone-Red-Code/DesktopMagic - 1.0.0.0 - 1.0.0.0 + 1.0.1.0 + 1.0.1.0 net8.0-windows7.0 enable @@ -35,7 +35,6 @@ - diff --git a/src/DesktopMagic/GlobalSuppressions.cs b/src/DesktopMagic/GlobalSuppressions.cs index f210155..c4ac37e 100644 --- a/src/DesktopMagic/GlobalSuppressions.cs +++ b/src/DesktopMagic/GlobalSuppressions.cs @@ -7,4 +7,5 @@ [assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "Windows only application")] [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "No need to")] -[assembly: SuppressMessage("Minor Code Smell", "S1075:URIs should not be hardcoded", Justification = "")] \ No newline at end of file +[assembly: SuppressMessage("Minor Code Smell", "S1075:URIs should not be hardcoded", Justification = "")] +[assembly: SuppressMessage("Critical Code Smell", "S2696:Instance members should not write to \"static\" fields", Justification = "", Scope = "member", Target = "~P:DesktopMagic.DataContexts.MainWindowDataContext.Settings")] diff --git a/src/DesktopMagic/Helpers/Win32Wrapper.cs b/src/DesktopMagic/Helpers/Win32Wrapper.cs index be79580..6c46996 100644 --- a/src/DesktopMagic/Helpers/Win32Wrapper.cs +++ b/src/DesktopMagic/Helpers/Win32Wrapper.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; using System.Text; - +#pragma warning disable namespace DesktopMagic.Helpers; internal class W32 diff --git a/src/DesktopMagic/Helpers/WindowPos.cs b/src/DesktopMagic/Helpers/WindowPos.cs index 29e233d..95e67ff 100644 --- a/src/DesktopMagic/Helpers/WindowPos.cs +++ b/src/DesktopMagic/Helpers/WindowPos.cs @@ -3,7 +3,7 @@ using System.Windows; using System.Windows.Interop; using System.Windows.Shapes; - +#pragma warning disable namespace DesktopMagic { using static NativeMethods; diff --git a/src/DesktopMagic/Plugins/PluginWindow.xaml.cs b/src/DesktopMagic/Plugins/PluginWindow.xaml.cs index 545b7ac..1c810b9 100644 --- a/src/DesktopMagic/Plugins/PluginWindow.xaml.cs +++ b/src/DesktopMagic/Plugins/PluginWindow.xaml.cs @@ -35,7 +35,7 @@ public partial class PluginWindow : Window public bool IsRunning { get; private set; } = true; public PluginMetadata PluginMetadata { get; private set; } - public string? PluginFolderPath { get; private set; } + public string PluginFolderPath { get; private set; } public PluginWindow(PluginMetadata pluginMetadata, PluginSettings settings, string pluginFolderPath) { diff --git a/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs b/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs index e39cd45..45a5171 100644 --- a/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs +++ b/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs @@ -6,8 +6,13 @@ namespace DesktopMagic.Api.Drawing; internal class FontComparer : IEqualityComparer { - public bool Equals(Font font1, Font font2) + public bool Equals(Font? font1, Font? font2) { + if (font1 is null || font2 is null) + { + return false; + } + if (font1.Name != font2.Name) { return false; diff --git a/src/DesktopMagicPluginAPI/Settings/Button.cs b/src/DesktopMagicPluginAPI/Settings/Button.cs index f0393be..a2297cc 100644 --- a/src/DesktopMagicPluginAPI/Settings/Button.cs +++ b/src/DesktopMagicPluginAPI/Settings/Button.cs @@ -10,9 +10,9 @@ public class Button : Setting /// /// Occurs when the button gets clicked. /// - public event Action OnClick; + public event Action? OnClick; - private string _value; + private string _value = string.Empty; /// /// Gets or sets the text caption displayed in the element. diff --git a/src/DesktopMagicPluginAPI/Settings/Label.cs b/src/DesktopMagicPluginAPI/Settings/Label.cs index 179ce98..0547c9b 100644 --- a/src/DesktopMagicPluginAPI/Settings/Label.cs +++ b/src/DesktopMagicPluginAPI/Settings/Label.cs @@ -5,7 +5,7 @@ /// public class Label : Setting { - private string _value; + private string _value = string.Empty; /// /// Gets or sets the text associated with this . diff --git a/src/DesktopMagicPluginAPI/Settings/TextBox.cs b/src/DesktopMagicPluginAPI/Settings/TextBox.cs index a4bea95..f82eb63 100644 --- a/src/DesktopMagicPluginAPI/Settings/TextBox.cs +++ b/src/DesktopMagicPluginAPI/Settings/TextBox.cs @@ -5,7 +5,7 @@ /// public class TextBox : Setting { - private string _value; + private string _value = string.Empty; /// /// Gets or sets the text associated with this . diff --git a/update/DesktopMagic.zip b/update/DesktopMagic.zip deleted file mode 100644 index 61870de..0000000 Binary files a/update/DesktopMagic.zip and /dev/null differ diff --git a/update/updateInfo.json b/update/updateInfo.json deleted file mode 100644 index 31d47e2..0000000 --- a/update/updateInfo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "Version":"0.0.3.1", - "FileUrl":"http://github.com/Stone-Red-Code/DesktopMagic/blob/main/update/DesktopMagic.zip?raw=true" -}