DrakiaXYZ/AssemblyTool
0
0
Fork 0
Code Pull Requests Activity

Bug fixes, remove obsolete data

Browse Source
This commit is contained in:
Cj 2024-06-20 22:13:34 -04:00
parent 1621484fe3
commit bcf73bd7d7
3 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RecodeItLib/CrossCompiler/ReCodeItCrossCompiler.cs
View File

@ -34,12 +34,6 @@ public class ReCodeItCrossCompiler
return; return;
} }
if (ActiveProject.VisualStudioClonedSolutionDirectory == string.Empty)
{
Logger.Log("ERROR: No ReCodeIt Project directory is set. (Project Creation Failed)", ConsoleColor.Red);
return;
}
Remapper.InitializeRemap( Remapper.InitializeRemap(
ActiveProject.RemapModels, ActiveProject.RemapModels,
ActiveProject.OriginalAssemblyPath, ActiveProject.OriginalAssemblyPath,
@ -66,7 +60,7 @@ public class ReCodeItCrossCompiler
Logger.Log("Loading Solution...", ConsoleColor.Yellow); Logger.Log("Loading Solution...", ConsoleColor.Yellow);
var solution = await Task.Run(() => LoadSolutionAsync(workspace, ActiveProject.VisualStudioClonedSolutionPath)); var solution = await Task.Run(() => LoadSolutionAsync(workspace, ActiveProject.VisualStudioSolutionPath));
Project newProject; Project newProject;

34
RecodeItLib/Models/CrossCompilerProjectModel.cs
View File

@ -1,6 +1,4 @@
using ReCodeIt.Utils; namespace ReCodeIt.Models;
namespace ReCodeIt.Models;
public class CrossCompilerProjectModel public class CrossCompilerProjectModel
{ {
@ -42,40 +40,14 @@ public class CrossCompilerProjectModel
/// </summary> /// </summary>
public string VisualStudioSolutionDirectoryPath => Path.GetDirectoryName(VisualStudioSolutionPath)!; public string VisualStudioSolutionDirectoryPath => Path.GetDirectoryName(VisualStudioSolutionPath)!;
/// <summary> public string ProjectDllName => SolutionName.Replace(".sln", ".dll");
/// The path the the cloned solution
/// </summary>
public string VisualStudioClonedSolutionPath => Path.Combine(
DataProvider.ReCodeItProjectsPath,
SolutionName,
SolutionName + ".sln");
public string VisualStudioClonedSolutionDirectory => Path.Combine(
DataProvider.ReCodeItProjectsPath,
SolutionName);
/// <summary>
/// The path to the cloned solutions dependency folder
/// </summary>
public string VisualStudioClonedDependencyPath
{
get
{
// Take just the folder name
var folderName = VisualStudioDependencyPath.Split('\\').Last();
return Path.Combine(VisualStudioClonedSolutionDirectory, folderName);
}
}
public string ProjectDllName => SolutionName + ".dll";
public string OriginalAssemblyDllName => Path.GetFileName(OriginalAssemblyPath); public string OriginalAssemblyDllName => Path.GetFileName(OriginalAssemblyPath);
/// <summary> /// <summary>
/// Name of the solution /// Name of the solution
/// </summary> /// </summary>
public string SolutionName { get; set; } public string SolutionName => Path.GetFileName(VisualStudioSolutionPath);
/// <summary> /// <summary>
/// Remapped output hash /// Remapped output hash

6
RecodeItLib/Utils/DataProvider.cs
View File

@ -20,7 +20,7 @@ public static class DataProvider
/// </summary> /// </summary>
public static bool IsCli { get; set; } = false; public static bool IsCli { get; set; } = false;
public static string DataPath => RegistryHelper.GetRegistryValue<string>("DataPath"); public static string DataPath => RegistryHelper.GetRegistryValue<string>("DataPath") ?? Path.Combine(AppContext.BaseDirectory, "Data");
public static readonly string ReCodeItProjectsPath = Path.Combine(AppContext.BaseDirectory, "Projects"); public static readonly string ReCodeItProjectsPath = Path.Combine(AppContext.BaseDirectory, "Projects");
@ -32,12 +32,8 @@ public static class DataProvider
public static AssemblyDefinition AssemblyDefinition { get; private set; } public static AssemblyDefinition AssemblyDefinition { get; private set; }
public static AssemblyDefinition NameMangledAssemblyDefinition { get; private set; }
public static ModuleDefinition ModuleDefinition { get; private set; } public static ModuleDefinition ModuleDefinition { get; private set; }
public static ModuleDefinition NameMangledModuleDefinition { get; private set; }
public static void LoadAppSettings() public static void LoadAppSettings()
{ {
var settingsPath = Path.Combine(DataPath, "Settings.jsonc"); var settingsPath = Path.Combine(DataPath, "Settings.jsonc");