diff --git a/Assets/de4dot/AssemblyData.dll b/Assets/de4dot/AssemblyData.dll deleted file mode 100644 index 91ac918..0000000 Binary files a/Assets/de4dot/AssemblyData.dll and /dev/null differ diff --git a/Assets/de4dot/AssemblyServer-x64.exe b/Assets/de4dot/AssemblyServer-x64.exe deleted file mode 100644 index 9a8d086..0000000 Binary files a/Assets/de4dot/AssemblyServer-x64.exe and /dev/null differ diff --git a/Assets/de4dot/AssemblyServer-x64.exe.config b/Assets/de4dot/AssemblyServer-x64.exe.config deleted file mode 100644 index c254b3c..0000000 --- a/Assets/de4dot/AssemblyServer-x64.exe.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Assets/de4dot/de4dot-x64.exe b/Assets/de4dot/de4dot-x64.exe deleted file mode 100644 index 32e5ca2..0000000 Binary files a/Assets/de4dot/de4dot-x64.exe and /dev/null differ diff --git a/Assets/de4dot/de4dot-x64.exe.config b/Assets/de4dot/de4dot-x64.exe.config deleted file mode 100644 index 1fda120..0000000 --- a/Assets/de4dot/de4dot-x64.exe.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/de4dot/de4dot.blocks.dll b/Assets/de4dot/de4dot.blocks.dll deleted file mode 100644 index 86ed5b3..0000000 Binary files a/Assets/de4dot/de4dot.blocks.dll and /dev/null differ diff --git a/Assets/de4dot/de4dot.code.dll b/Assets/de4dot/de4dot.code.dll deleted file mode 100644 index 7e52155..0000000 Binary files a/Assets/de4dot/de4dot.code.dll and /dev/null differ diff --git a/Assets/de4dot/de4dot.cui.dll b/Assets/de4dot/de4dot.cui.dll deleted file mode 100644 index 703ab32..0000000 Binary files a/Assets/de4dot/de4dot.cui.dll and /dev/null differ diff --git a/Assets/de4dot/de4dot.mdecrypt.dll b/Assets/de4dot/de4dot.mdecrypt.dll deleted file mode 100644 index 48989fb..0000000 Binary files a/Assets/de4dot/de4dot.mdecrypt.dll and /dev/null differ diff --git a/Assets/de4dot/dnlib.dll b/Assets/de4dot/dnlib.dll deleted file mode 100644 index 11ba648..0000000 Binary files a/Assets/de4dot/dnlib.dll and /dev/null differ diff --git a/ReCodeItCLI/ReCodeItCLI.csproj b/ReCodeItCLI/ReCodeItCLI.csproj index ae4ce9c..b35426c 100644 --- a/ReCodeItCLI/ReCodeItCLI.csproj +++ b/ReCodeItCLI/ReCodeItCLI.csproj @@ -10,7 +10,6 @@ - diff --git a/RecodeIt.sln b/RecodeIt.sln index 0be7c29..69c54ed 100644 --- a/RecodeIt.sln +++ b/RecodeIt.sln @@ -11,6 +11,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeItCLI", "ReCodeItCLI\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DumpLib", "DumpLib\DumpLib.csproj", "{D0837899-F129-46DB-8BDB-7C9AFB72BD30}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.mdecrypt", "de4dot\de4dot.mdecrypt\de4dot.mdecrypt.csproj", "{7C68B124-809B-4D4A-960B-467B2DAF2A0A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.cui", "de4dot\de4dot.cui\de4dot.cui.csproj", "{2BCD50E1-77D5-47E3-B317-04568BF051AB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.code", "de4dot\de4dot.code\de4dot.code.csproj", "{C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyServer-x64", "de4dot\AssemblyServer-x64\AssemblyServer-x64.csproj", "{CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyData", "de4dot\AssemblyData\AssemblyData.csproj", "{02FBA28C-E86C-49DC-8B44-A69CC542F693}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "de4dot.blocks", "de4dot\de4dot.blocks\de4dot.blocks.csproj", "{8365D905-3BC4-42A0-B072-035598C6AF8C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +117,126 @@ Global {D0837899-F129-46DB-8BDB-7C9AFB72BD30}.Release|x64.Build.0 = Release|Any CPU {D0837899-F129-46DB-8BDB-7C9AFB72BD30}.Release|x86.ActiveCfg = Release|Any CPU {D0837899-F129-46DB-8BDB-7C9AFB72BD30}.Release|x86.Build.0 = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|ARM.Build.0 = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|ARM64.Build.0 = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|x64.ActiveCfg = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|x64.Build.0 = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Debug|x86.Build.0 = Debug|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|Any CPU.Build.0 = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|ARM.ActiveCfg = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|ARM.Build.0 = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|ARM64.ActiveCfg = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|ARM64.Build.0 = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|x64.ActiveCfg = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|x64.Build.0 = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|x86.ActiveCfg = Release|Any CPU + {7C68B124-809B-4D4A-960B-467B2DAF2A0A}.Release|x86.Build.0 = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|ARM.ActiveCfg = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|ARM.Build.0 = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|ARM64.Build.0 = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|x64.ActiveCfg = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|x64.Build.0 = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|x86.ActiveCfg = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Debug|x86.Build.0 = Debug|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|Any CPU.Build.0 = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|ARM.ActiveCfg = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|ARM.Build.0 = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|ARM64.ActiveCfg = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|ARM64.Build.0 = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|x64.ActiveCfg = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|x64.Build.0 = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|x86.ActiveCfg = Release|Any CPU + {2BCD50E1-77D5-47E3-B317-04568BF051AB}.Release|x86.Build.0 = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|ARM.Build.0 = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|ARM64.Build.0 = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|x64.ActiveCfg = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|x64.Build.0 = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|x86.ActiveCfg = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Debug|x86.Build.0 = Debug|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|Any CPU.Build.0 = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|ARM.ActiveCfg = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|ARM.Build.0 = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|ARM64.ActiveCfg = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|ARM64.Build.0 = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|x64.ActiveCfg = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|x64.Build.0 = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|x86.ActiveCfg = Release|Any CPU + {C3C1267E-CDB9-4C47-B7F1-C929A6F2F31C}.Release|x86.Build.0 = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|ARM.ActiveCfg = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|ARM.Build.0 = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|ARM64.Build.0 = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|x64.ActiveCfg = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|x64.Build.0 = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|x86.ActiveCfg = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Debug|x86.Build.0 = Debug|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|Any CPU.Build.0 = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|ARM.ActiveCfg = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|ARM.Build.0 = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|ARM64.ActiveCfg = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|ARM64.Build.0 = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|x64.ActiveCfg = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|x64.Build.0 = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|x86.ActiveCfg = Release|Any CPU + {CF1A1A5E-292B-42DE-AAA0-6801AD1AD407}.Release|x86.Build.0 = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|ARM.ActiveCfg = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|ARM.Build.0 = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|ARM64.Build.0 = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|x64.ActiveCfg = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|x64.Build.0 = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|x86.ActiveCfg = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Debug|x86.Build.0 = Debug|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|Any CPU.Build.0 = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|ARM.ActiveCfg = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|ARM.Build.0 = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|ARM64.ActiveCfg = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|ARM64.Build.0 = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|x64.ActiveCfg = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|x64.Build.0 = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|x86.ActiveCfg = Release|Any CPU + {02FBA28C-E86C-49DC-8B44-A69CC542F693}.Release|x86.Build.0 = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|ARM.Build.0 = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|ARM64.Build.0 = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|x64.ActiveCfg = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|x64.Build.0 = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|x86.ActiveCfg = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Debug|x86.Build.0 = Debug|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|Any CPU.Build.0 = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|ARM.ActiveCfg = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|ARM.Build.0 = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|ARM64.ActiveCfg = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|ARM64.Build.0 = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|x64.ActiveCfg = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|x64.Build.0 = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|x86.ActiveCfg = Release|Any CPU + {8365D905-3BC4-42A0-B072-035598C6AF8C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RecodeItLib/ReCodeItLib.csproj b/RecodeItLib/ReCodeItLib.csproj index bd741bc..5e0d7e3 100644 --- a/RecodeItLib/ReCodeItLib.csproj +++ b/RecodeItLib/ReCodeItLib.csproj @@ -176,6 +176,7 @@ + diff --git a/RecodeItLib/Remapper/DeObfuscator.cs b/RecodeItLib/Remapper/DeObfuscator.cs index 9ea5931..825a04d 100644 --- a/RecodeItLib/Remapper/DeObfuscator.cs +++ b/RecodeItLib/Remapper/DeObfuscator.cs @@ -34,7 +34,8 @@ public static class Deobfuscator if (!method.Body.Instructions.Any(x => x.OpCode.Code == Code.Callvirt && - ((IMethodDefOrRef)x.Operand).FullName == "System.Object System.AppDomain::GetData(System.String)")) + ((IMethodDefOrRef)x.Operand).FullName == + "System.Object System.AppDomain::GetData(System.String)")) { continue; } @@ -45,7 +46,8 @@ public static class Deobfuscator if (potentialStringDelegates.Count != 1) { - Logger.Log($"Expected to find 1 potential string delegate method; found {potentialStringDelegates.Count}. Candidates: {string.Join("\r\n", potentialStringDelegates.Select(x => x.FullName))}"); + Logger.Log( + $"Expected to find 1 potential string delegate method; found {potentialStringDelegates.Count}. Candidates: {string.Join("\r\n", potentialStringDelegates.Select(x => x.FullName))}"); } var methodDef = potentialStringDelegates[0]; @@ -55,14 +57,26 @@ public static class Deobfuscator token = $"0x{(deobfRid.Raw | deobfRid.Rid):x4}"; Console.WriteLine($"Deobfuscation token: {token}"); - var cmd = isLauncher - ? $"--un-name \"!^<>[a-z0-9]$&!^<>[a-z0-9]__.*$&![A-Z][A-Z]\\$<>.*$&^[a-zA-Z_<{{$][a-zA-Z_0-9<>{{}}$.`-]*$\" \"{assemblyPath}\" --strtok \"{token}\"" - : $"--un-name \"!^<>[a-z0-9]$&!^<>[a-z0-9]__.*$&![A-Z][A-Z]\\$<>.*$&^[a-zA-Z_<{{$][a-zA-Z_0-9<>{{}}$.`-]*$\" \"{assemblyPath}\" --strtyp delegate --strtok \"{token}\""; + string[] dllArgs = [ + "--un-name", + "!^<>[a-z0-9]$&!^<>[a-z0-9]__.*$&![A-Z][A-Z]\\$<>.*$&^[a-zA-Z_<{{$][a-zA-Z_0-9<>{{}}$.`-]*", + assemblyPath, + "--strtyp", + "delegate", + "--strtok", + $"\"{token}\"" + ]; + + string[] launcherArgs = [ + "--un-name", + "!^<>[a-z0-9]$&!^<>[a-z0-9]__.*$&![A-Z][A-Z]\\$<>.*$&^[a-zA-Z_<{{$][a-zA-Z_0-9<>{{}}$.`-]*", + assemblyPath, + "--strtok", + $"\"{token}\"" + ]; + + de4dot.cui.Program.Main(isLauncher ? launcherArgs : dllArgs); - var process = Process.Start(executablePath, cmd); - - process.WaitForExit(); - var extName = isLauncher ? "-cleaned.exe" : "-cleaned.dll"; // Fixes "ResolutionScope is null" by rewriting the assembly diff --git a/de4dot/AssemblyData/AssemblyData.csproj b/de4dot/AssemblyData/AssemblyData.csproj index d306984..be053ac 100644 --- a/de4dot/AssemblyData/AssemblyData.csproj +++ b/de4dot/AssemblyData/AssemblyData.csproj @@ -1,5 +1,9 @@ + + net8.0 + + diff --git a/de4dot/AssemblyServer-x64/AssemblyServer-x64.csproj b/de4dot/AssemblyServer-x64/AssemblyServer-x64.csproj index 72089c2..fb9f73c 100644 --- a/de4dot/AssemblyServer-x64/AssemblyServer-x64.csproj +++ b/de4dot/AssemblyServer-x64/AssemblyServer-x64.csproj @@ -3,6 +3,7 @@ x64 Exe + net8.0 diff --git a/de4dot/Directory.Build.props b/de4dot/Directory.Build.props deleted file mode 100644 index 19049fd..0000000 --- a/de4dot/Directory.Build.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - net48 - strict - latest - 3.2.0 - - - - - - - diff --git a/de4dot/de4dot-x64/de4dot-x64.csproj b/de4dot/de4dot-x64/de4dot-x64.csproj index aa2230e..4fc8ef5 100644 --- a/de4dot/de4dot-x64/de4dot-x64.csproj +++ b/de4dot/de4dot-x64/de4dot-x64.csproj @@ -3,6 +3,7 @@ x64 Exe + net8.0 diff --git a/de4dot/de4dot.blocks/de4dot.blocks.csproj b/de4dot/de4dot.blocks/de4dot.blocks.csproj index dff0a18..6e1e27d 100644 --- a/de4dot/de4dot.blocks/de4dot.blocks.csproj +++ b/de4dot/de4dot.blocks/de4dot.blocks.csproj @@ -1,5 +1,9 @@ + + net8.0 + + diff --git a/de4dot/de4dot.code/de4dot.code.csproj b/de4dot/de4dot.code/de4dot.code.csproj index 01ef751..a5d65cc 100644 --- a/de4dot/de4dot.code/de4dot.code.csproj +++ b/de4dot/de4dot.code/de4dot.code.csproj @@ -2,6 +2,7 @@ true + net8.0 diff --git a/de4dot/de4dot.cui/Program.cs b/de4dot/de4dot.cui/Program.cs index ecbc1b0..b59cab6 100644 --- a/de4dot/de4dot.cui/Program.cs +++ b/de4dot/de4dot.cui/Program.cs @@ -119,6 +119,7 @@ namespace de4dot.cui { Logger.n("Use -v/-vv option or set environment variable {0}=1 to see all messages", showAllMessagesEnvName); } + /* if (IsN00bUser()) { Console.Error.WriteLine("\n\nPress any key to exit...\n"); try { @@ -127,7 +128,7 @@ namespace de4dot.cui { catch (InvalidOperationException) { } } - + */ return exitCode; } diff --git a/de4dot/de4dot.cui/de4dot.cui.csproj b/de4dot/de4dot.cui/de4dot.cui.csproj index 991e997..dd87fce 100644 --- a/de4dot/de4dot.cui/de4dot.cui.csproj +++ b/de4dot/de4dot.cui/de4dot.cui.csproj @@ -1,5 +1,9 @@ + + net8.0 + + diff --git a/de4dot/de4dot.mdecrypt/de4dot.mdecrypt.csproj b/de4dot/de4dot.mdecrypt/de4dot.mdecrypt.csproj index af84906..8898528 100644 --- a/de4dot/de4dot.mdecrypt/de4dot.mdecrypt.csproj +++ b/de4dot/de4dot.mdecrypt/de4dot.mdecrypt.csproj @@ -2,6 +2,7 @@ true + net8.0 diff --git a/de4dot/de4dot.netframework.sln b/de4dot/de4dot.netframework.sln deleted file mode 100644 index 14bb5ef..0000000 --- a/de4dot/de4dot.netframework.sln +++ /dev/null @@ -1,147 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.4 -MinimumVisualStudioVersion = 15.0.26206.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "de4dot.code", "de4dot.code\de4dot.code.csproj", "{4D10B9EB-3BF1-4D61-A389-CB019E8C9622}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyData", "AssemblyData\AssemblyData.csproj", "{FBD84077-9D35-41FE-89DF-8D79EFE0B595}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "de4dot-x64", "de4dot-x64\de4dot-x64.csproj", "{A9F35AC2-D016-444B-B7E6-FC1D55569021}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyServer-x64", "AssemblyServer-x64\AssemblyServer-x64.csproj", "{F458A89A-AEAB-4965-AA4D-393C9F7411D0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "de4dot.blocks", "de4dot.blocks\de4dot.blocks.csproj", "{045B96F2-AF80-4C4C-8D27-E38635AC705E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "de4dot.cui", "de4dot.cui\de4dot.cui.csproj", "{879E4A7E-C320-42D2-8275-4F1E44CE64AA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "de4dot.mdecrypt", "de4dot.mdecrypt\de4dot.mdecrypt.csproj", "{5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Debug|Win32.ActiveCfg = Debug|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Release|Any CPU.Build.0 = Release|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Release|Win32.ActiveCfg = Release|Any CPU - {4D10B9EB-3BF1-4D61-A389-CB019E8C9622}.Release|x86.ActiveCfg = Release|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Debug|Win32.ActiveCfg = Debug|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Debug|x86.ActiveCfg = Debug|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Release|Any CPU.Build.0 = Release|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Release|Win32.ActiveCfg = Release|Any CPU - {FBD84077-9D35-41FE-89DF-8D79EFE0B595}.Release|x86.ActiveCfg = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|Win32.ActiveCfg = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|Win32.Build.0 = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|x86.ActiveCfg = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Debug|x86.Build.0 = Debug|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|Any CPU.Build.0 = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|Win32.ActiveCfg = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|Win32.Build.0 = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|x86.ActiveCfg = Release|Any CPU - {A9F35AC2-D016-444B-B7E6-FC1D55569021}.Release|x86.Build.0 = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|Any CPU.Build.0 = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|Win32.ActiveCfg = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|Win32.Build.0 = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|x86.ActiveCfg = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Debug|x86.Build.0 = Debug|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|Any CPU.ActiveCfg = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|Any CPU.Build.0 = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|Win32.ActiveCfg = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|Win32.Build.0 = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|x86.ActiveCfg = Release|Any CPU - {593AB87D-7B92-47CF-8201-3574CF6A6457}.Release|x86.Build.0 = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|Win32.ActiveCfg = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|Win32.Build.0 = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|x86.ActiveCfg = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Debug|x86.Build.0 = Debug|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|Any CPU.Build.0 = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|Win32.ActiveCfg = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|Win32.Build.0 = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|x86.ActiveCfg = Release|Any CPU - {F458A89A-AEAB-4965-AA4D-393C9F7411D0}.Release|x86.Build.0 = Release|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|Win32.ActiveCfg = Debug|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Debug|x86.ActiveCfg = Debug|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Any CPU.Build.0 = Release|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|Win32.ActiveCfg = Release|Any CPU - {045B96F2-AF80-4C4C-8D27-E38635AC705E}.Release|x86.ActiveCfg = Release|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Debug|Win32.ActiveCfg = Debug|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Debug|x86.ActiveCfg = Debug|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Release|Any CPU.Build.0 = Release|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Release|Win32.ActiveCfg = Release|Any CPU - {879E4A7E-C320-42D2-8275-4F1E44CE64AA}.Release|x86.ActiveCfg = Release|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Debug|Win32.ActiveCfg = Debug|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Release|Any CPU.Build.0 = Release|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Release|Win32.ActiveCfg = Release|Any CPU - {5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}.Release|x86.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9FACD7D2-CFD5-4E9E-A9D1-48B71319A5A4} - EndGlobalSection -EndGlobal