diff --git a/Mint/App.config b/Mint/App.config deleted file mode 100644 index 88fa402..0000000 --- a/Mint/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Mint/EmbeddedAssembly.cs b/Mint/EmbeddedAssembly.cs deleted file mode 100644 index 7c8bea7..0000000 --- a/Mint/EmbeddedAssembly.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Security.Cryptography; - -namespace Mint -{ - internal class EmbeddedAssembly - { - static Dictionary _dictionary; - - internal static void Load(string embeddedResource, string fileName) - { - if (_dictionary == null) _dictionary = new Dictionary(); - - byte[] bytes = null; - Assembly assembly = null; - Assembly currentAssembly = Assembly.GetExecutingAssembly(); - - using (Stream stream = currentAssembly.GetManifestResourceStream(embeddedResource)) - { - if (stream == null) throw new Exception(embeddedResource + " is not found in Embedded Resources."); - - bytes = new byte[(int)stream.Length]; - stream.Read(bytes, 0, (int)stream.Length); - - try - { - assembly = Assembly.Load(bytes); - - _dictionary.Add(assembly.FullName, assembly); - return; - } - catch { } - } - - bool fileOk = false; - string tempFile = string.Empty; - - using (SHA1CryptoServiceProvider sha1 = new SHA1CryptoServiceProvider()) - { - string fileHash = BitConverter.ToString(sha1.ComputeHash(bytes)).Replace("-", string.Empty); - - tempFile = Path.GetTempPath() + fileName; - - if (File.Exists(tempFile)) - { - byte[] byteArray = File.ReadAllBytes(tempFile); - string fileHash2 = BitConverter.ToString(sha1.ComputeHash(byteArray)).Replace("-", string.Empty); - - if (fileHash == fileHash2) - { - fileOk = true; - } - } - else - { - fileOk = false; - } - } - - if (!fileOk) - { - File.WriteAllBytes(tempFile, bytes); - } - - assembly = Assembly.LoadFile(tempFile); - - _dictionary.Add(assembly.FullName, assembly); - } - - internal static Assembly Get(string assemblyFullName) - { - if (_dictionary == null || _dictionary.Count == 0) return null; - - if (_dictionary.ContainsKey(assemblyFullName)) return _dictionary[assemblyFullName]; - - return null; - } - } -} diff --git a/Mint/Mint.csproj b/Mint/Mint.csproj index edc3b19..2d3608c 100644 --- a/Mint/Mint.csproj +++ b/Mint/Mint.csproj @@ -1,149 +1,31 @@ - - - - - Debug - AnyCPU - {53513363-BE72-4220-AAE7-190F79A24C6F} - WinExe - Mint - Mint - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - mint.ico - - - - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - Component - - - Form - - - AboutForm.cs - - - - Component - - - Component - - - - - Form - - - GroupsForm.cs - - - Form - - - MainForm.cs - - - Form - - - ModifyForm.cs - - - - - - - - AboutForm.cs - - - GroupsForm.cs - - - MainForm.cs - - - ModifyForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} - 1 - 0 - 0 - tlbimp - False - True - - - - - \ No newline at end of file + + + + WinExe + net8.0-windows + true + mint.ico + + + + + + + + + tlbimp + 0 + 1 + f935dc20-1cf0-11d0-adb9-00c04fd58a0b + 0 + false + false + + + + + None + false + + + diff --git a/Mint/Newtonsoft.Json.dll b/Mint/Newtonsoft.Json.dll deleted file mode 100644 index b7c6596..0000000 Binary files a/Mint/Newtonsoft.Json.dll and /dev/null differ diff --git a/Mint/Program.cs b/Mint/Program.cs index 53014dd..7c1c775 100644 --- a/Mint/Program.cs +++ b/Mint/Program.cs @@ -10,8 +10,8 @@ static class Program /* DO NOT LEAVE THEM EMPTY */ // Enter current version here - internal readonly static float Major = 1; - internal readonly static float Minor = 8; + internal readonly static float Major = 2; + internal readonly static float Minor = 0; /* END OF VERSION PROPERTIES */ @@ -25,8 +25,6 @@ internal static float GetCurrentVersion() return float.Parse(GetCurrentVersionToString()); } - const string _jsonAssembly = @"Mint.Newtonsoft.Json.dll"; - const string _mutexGuid = "{DEADMOON-0EFC7B9A-D7FC-437F-B4B3-0118C643FE19-MINT}"; internal static Mutex MUTEX; static bool _notRunning; @@ -46,9 +44,6 @@ static void Main() { if (_notRunning) { - EmbeddedAssembly.Load(_jsonAssembly, _jsonAssembly.Replace("Mint.", string.Empty)); - AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; - Options.LoadSettings(); Application.Run(new MainForm()); } @@ -59,10 +54,5 @@ static void Main() } } } - - private static System.Reflection.Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) - { - return EmbeddedAssembly.Get(args.Name); - } } } diff --git a/Mint/Properties/AssemblyInfo.cs b/Mint/Properties/AssemblyInfo.cs deleted file mode 100644 index a4acc63..0000000 --- a/Mint/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Mint")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Mint")] -[assembly: AssemblyCopyright("deadmoon © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("53513363-be72-4220-aae7-190f79a24c6f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.0.0.0")] -[assembly: AssemblyFileVersion("0.0.0.0")] diff --git a/Mint/Properties/Resources.Designer.cs b/Mint/Properties/Resources.Designer.cs deleted file mode 100644 index 6a5d84a..0000000 --- a/Mint/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Mint.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Mint.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/Mint/Properties/Resources.resx b/Mint/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Mint/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Mint/Properties/Settings.Designer.cs b/Mint/Properties/Settings.Designer.cs deleted file mode 100644 index 1631704..0000000 --- a/Mint/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Mint.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Mint/Properties/Settings.settings b/Mint/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/Mint/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Mint/packages.config b/Mint/packages.config deleted file mode 100644 index 1cad659..0000000 --- a/Mint/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file