diff --git a/AssemblyRemapper/Enums/EFailureReason.cs b/AssemblyRemapper/Enums/EFailureReason.cs index ebed52c..3964b11 100644 --- a/AssemblyRemapper/Enums/EFailureReason.cs +++ b/AssemblyRemapper/Enums/EFailureReason.cs @@ -1,6 +1,6 @@ namespace AssemblyRemapper.Enums; -internal enum EFailureReason +public enum EFailureReason { None, IsAbstract, diff --git a/AssemblyRemapper/Models/AppSettingsModel.cs b/AssemblyRemapper/Models/AppSettingsModel.cs index 4307928..1a4cdb1 100644 --- a/AssemblyRemapper/Models/AppSettingsModel.cs +++ b/AssemblyRemapper/Models/AppSettingsModel.cs @@ -3,7 +3,7 @@ /// /// Remap config /// -internal class Settings +public class Settings { public AppSettings AppSettings { get; set; } public RemapperSettings RemapperSettings { get; set; } @@ -11,14 +11,14 @@ internal class Settings public AutoMapperSettings AutoMapperSettings { get; set; } } -internal class AppSettings +public class AppSettings { public bool Debug { get; set; } = false; public bool SilentMode { get; set; } = true; public bool MatchMode { get; set; } = false; } -internal class RemapperSettings +public class RemapperSettings { public int MaxMatchCount { get; set; } = 5; @@ -30,7 +30,7 @@ internal class RemapperSettings public string MappingPath { get; set; } = string.Empty; } -internal class AutoMapperSettings +public class AutoMapperSettings { public int RequiredMatches { get; set; } = 5; public bool MatchMode { get; set; } = true; diff --git a/AssemblyRemapper/Models/RemapModel.cs b/AssemblyRemapper/Models/RemapModel.cs index bec158a..4b14b96 100644 --- a/AssemblyRemapper/Models/RemapModel.cs +++ b/AssemblyRemapper/Models/RemapModel.cs @@ -6,7 +6,7 @@ namespace AssemblyRemapper.Models; /// /// Object to store linq statements in inside of json to search and remap classes /// -internal class RemapModel +public class RemapModel { [JsonIgnore] public bool Succeeded { get; set; } = false; @@ -26,7 +26,7 @@ internal class RemapModel /// /// Search filters to find types and remap them /// -internal class SearchParams +public class SearchParams { #region BOOL_PARAMS diff --git a/AssemblyRemapper/Models/ScoringModel.cs b/AssemblyRemapper/Models/ScoringModel.cs index 91d064d..cf69205 100644 --- a/AssemblyRemapper/Models/ScoringModel.cs +++ b/AssemblyRemapper/Models/ScoringModel.cs @@ -3,7 +3,7 @@ using Mono.Cecil; namespace AssemblyRemapper.Models; -internal class ScoringModel +public class ScoringModel { public string ProposedNewName { get; set; } public int Score { get; set; } = 0; diff --git a/AssemblyRemapper/Program.cs b/AssemblyRemapper/Program.cs deleted file mode 100644 index e0d3bec..0000000 --- a/AssemblyRemapper/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AssemblyRemapper.Commands; - -namespace AssemblyRemapper; - -public static class Program -{ - public static void Main(string[] args) - { - var cmd = new CommandProcessor(); - - cmd.CommandLoop(); - } -} \ No newline at end of file diff --git a/AssemblyRemapper/Remapper/Publicizer.cs b/AssemblyRemapper/Remapper/Publicizer.cs index e5dca63..bb8da3a 100644 --- a/AssemblyRemapper/Remapper/Publicizer.cs +++ b/AssemblyRemapper/Remapper/Publicizer.cs @@ -2,7 +2,7 @@ namespace AssemblyRemapper.Remapper; -internal static class Publicizer +public static class Publicizer { public static void Publicize() { diff --git a/AssemblyRemapper/Remapper/Remapper.cs b/AssemblyRemapper/Remapper/Remapper.cs index e33f0d6..2a7796f 100644 --- a/AssemblyRemapper/Remapper/Remapper.cs +++ b/AssemblyRemapper/Remapper/Remapper.cs @@ -7,7 +7,7 @@ using System.Diagnostics; namespace AssemblyRemapper.Remapper; -internal class Remapper +public class Remapper { private static Stopwatch Stopwatch = new(); diff --git a/AssemblyRemapper/Remapper/Renamer.cs b/AssemblyRemapper/Remapper/Renamer.cs index 48b0c9b..aa0fd57 100644 --- a/AssemblyRemapper/Remapper/Renamer.cs +++ b/AssemblyRemapper/Remapper/Renamer.cs @@ -5,7 +5,7 @@ using Mono.Collections.Generic; namespace AssemblyRemapper.Remapper; -internal static class Renamer +public static class Renamer { public static void RenameAll(ScoringModel score) { diff --git a/AssemblyRemapper/RemapperLib.csproj b/AssemblyRemapper/RemapperLib.csproj index 36791b1..de044f1 100644 --- a/AssemblyRemapper/RemapperLib.csproj +++ b/AssemblyRemapper/RemapperLib.csproj @@ -1,7 +1,7 @@  - Exe + Library net8.0 enable enable @@ -12,9 +12,4 @@ - - - - - diff --git a/AssemblyRemapper/Utils/DataProvider.cs b/AssemblyRemapper/Utils/DataProvider.cs index 02d154b..1b27e54 100644 --- a/AssemblyRemapper/Utils/DataProvider.cs +++ b/AssemblyRemapper/Utils/DataProvider.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json; namespace AssemblyRemapper.Utils; -internal static class DataProvider +public static class DataProvider { static DataProvider() { diff --git a/AssemblyRemapper/Utils/Logger.cs b/AssemblyRemapper/Utils/Logger.cs index 4df1fc1..0be21c3 100644 --- a/AssemblyRemapper/Utils/Logger.cs +++ b/AssemblyRemapper/Utils/Logger.cs @@ -1,6 +1,6 @@ namespace AssemblyRemapper.Utils; -internal static class Logger +public static class Logger { static Logger() { diff --git a/AssemblyRemapperGUI/Form1.Designer.cs b/AssemblyRemapperGUI/Form1.Designer.cs index 82de90e..01dbbe3 100644 --- a/AssemblyRemapperGUI/Form1.Designer.cs +++ b/AssemblyRemapperGUI/Form1.Designer.cs @@ -28,18 +28,32 @@ /// private void InitializeComponent() { + toolStrip1 = new ToolStrip(); SuspendLayout(); // + // toolStrip1 + // + toolStrip1.ImageScalingSize = new Size(24, 24); + toolStrip1.Location = new Point(0, 0); + toolStrip1.Name = "toolStrip1"; + toolStrip1.Size = new Size(1584, 25); + toolStrip1.TabIndex = 0; + toolStrip1.Text = "toolStrip1"; + // // Form1 // AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(1584, 1027); + Controls.Add(toolStrip1); Name = "Form1"; Text = "Cj's Assembly Tool V0.1.0"; ResumeLayout(false); + PerformLayout(); } #endregion + + private ToolStrip toolStrip1; } } diff --git a/AssemblyRemapperGUI/Form1.resx b/AssemblyRemapperGUI/Form1.resx index af32865..c354583 100644 --- a/AssemblyRemapperGUI/Form1.resx +++ b/AssemblyRemapperGUI/Form1.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/AssemblyRemapperGUI/RemapperGUI.csproj b/AssemblyRemapperGUI/RemapperGUI.csproj index 556b92a..984b3ef 100644 --- a/AssemblyRemapperGUI/RemapperGUI.csproj +++ b/AssemblyRemapperGUI/RemapperGUI.csproj @@ -12,4 +12,8 @@ + + + + \ No newline at end of file