Skip to content

Commit 5239a31

Browse files
TELERIK\JustDecompBuildUserTELERIK\JustDecompBuildUser
TELERIK\JustDecompBuildUser
authored and
TELERIK\JustDecompBuildUser
committed
Auto-Build: Version Update [***NO_CI***]
1 parent 9e90236 commit 5239a31

File tree

701 files changed

+36378
-15980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

701 files changed

+36378
-15980
lines changed

‎CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using System.Reflection;
22

3-
[assembly: AssemblyVersion("2014.1.1017.0")]
4-
[assembly: AssemblyFileVersion("2014.1.1017.0")]
3+
[assembly: AssemblyVersion("2014.1.1020.0")]
4+
[assembly: AssemblyFileVersion("2014.1.1020.0")]

‎De4dot.JustDecompile/De4dot.JustDecompile.Module.csproj

+10-11
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,6 @@
111111
<Link>Properties\CommonAssemblyInfo.cs</Link>
112112
</Compile>
113113
</ItemGroup>
114-
<ItemGroup>
115-
<ProjectReference Include="De4dot\sources\de4dot.code\de4dot.code.csproj">
116-
<Project>{4D10B9EB-3BF1-4D61-A389-CB019E8C9622}</Project>
117-
<Name>de4dot.code</Name>
118-
</ProjectReference>
119-
<ProjectReference Include="De4dot\sources\dnlib\src\dnlib.csproj">
120-
<Project>{fdfc1237-143f-4919-8318-4926901f4639}</Project>
121-
<Name>dnlib</Name>
122-
</ProjectReference>
123-
</ItemGroup>
124114
<ItemGroup>
125115
<None Include="LicenseAgreements\COPYING" />
126116
</ItemGroup>
@@ -135,7 +125,16 @@
135125
<SubType>Designer</SubType>
136126
</None>
137127
</ItemGroup>
138-
<ItemGroup />
128+
<ItemGroup>
129+
<ProjectReference Include="De4dot\sources\de4dot.code\de4dot.code.csproj">
130+
<Project>{4d10b9eb-3bf1-4d61-a389-cb019e8c9622}</Project>
131+
<Name>de4dot.code</Name>
132+
</ProjectReference>
133+
<ProjectReference Include="De4dot\sources\dnlib\src\dnlib.csproj">
134+
<Project>{fdfc1237-143f-4919-8318-4926901f4639}</Project>
135+
<Name>dnlib</Name>
136+
</ProjectReference>
137+
</ItemGroup>
139138
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
140139
<PropertyGroup Condition=" '$(Configuration)' == 'DebugInternal' OR '$(Configuration)' == 'ReleaseInternal'">
141140
<PreBuildEvent>

‎De4dot.JustDecompile/De4dot/sources/.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*~
2+
*/obj/
3+
*.csproj.user
4+
*.sdf
5+
*.opensdf
6+
*.suo
7+
/Debug/
8+
/Release/
9+
/de4dot.snk

‎De4dot.JustDecompile/De4dot/sources/.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "dnlib"]
2+
path = dnlib
3+
url = [email protected]:0xd4d/dnlib.git

‎De4dot.JustDecompile/De4dot/sources/AssemblyData/AssemblyData.csproj

+10-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,14 @@
4141
<Compile Include="AssemblyService.cs" />
4242
<Compile Include="DelegateStringDecrypter.cs" />
4343
<Compile Include="EmuStringDecrypter.cs" />
44+
<Compile Include="GenericService.cs" />
4445
<Compile Include="IAssemblyService.cs" />
46+
<Compile Include="IGenericService.cs" />
47+
<Compile Include="IMethodDecrypterService.cs" />
4548
<Compile Include="IStringDecrypter.cs" />
49+
<Compile Include="IStringDecrypterService.cs" />
50+
<Compile Include="IUserGenericService.cs" />
51+
<Compile Include="MethodDecrypterService.cs" />
4652
<Compile Include="methodsrewriter\AssemblyResolver.cs" />
4753
<Compile Include="methodsrewriter\CodeGenerator.cs" />
4854
<Compile Include="methodsrewriter\IMethodsRewriter.cs" />
@@ -58,6 +64,7 @@
5864
<Compile Include="methodsrewriter\TypeResolver.cs" />
5965
<Compile Include="Properties\AssemblyInfo.cs" />
6066
<Compile Include="SimpleData.cs" />
67+
<Compile Include="StringDecrypterService.cs" />
6168
<Compile Include="Utils.cs" />
6269
</ItemGroup>
6370
<ItemGroup>
@@ -66,16 +73,16 @@
6673
<Reference Include="System.XML" />
6774
</ItemGroup>
6875
<ItemGroup>
69-
<ProjectReference Include="..\blocks\blocks.csproj">
76+
<ProjectReference Include="..\de4dot.blocks\de4dot.blocks.csproj">
7077
<Project>{045B96F2-AF80-4C4C-8D27-E38635AC705E}</Project>
71-
<Name>blocks</Name>
78+
<Name>de4dot.blocks</Name>
7279
</ProjectReference>
7380
<ProjectReference Include="..\de4dot.mdecrypt\de4dot.mdecrypt.csproj">
7481
<Project>{5C93C5E2-196F-4877-BF65-96FEBFCEFCA1}</Project>
7582
<Name>de4dot.mdecrypt</Name>
7683
</ProjectReference>
7784
<ProjectReference Include="..\dnlib\src\dnlib.csproj">
78-
<Project>{FDFC1237-143F-4919-8318-4926901F4639}</Project>
85+
<Project>{fdfc1237-143f-4919-8318-4926901f4639}</Project>
7986
<Name>dnlib</Name>
8087
</ProjectReference>
8188
</ItemGroup>

‎De4dot.JustDecompile/De4dot/sources/AssemblyData/AssemblyResolver.cs

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (C) 2011-2013 [email protected]
2+
Copyright (C) 2011-2014 [email protected]
33
44
This file is part of de4dot.
55
@@ -30,17 +30,17 @@ class AssemblyResolver {
3030
List<string> assemblySearchPaths = new List<string>();
3131

3232
public AssemblyResolver() {
33-
AppDomain.CurrentDomain.AssemblyResolve += assemblyResolve;
33+
AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolve;
3434
}
3535

36-
void addAssemblySearchPath(string path) {
36+
void AddAssemblySearchPath(string path) {
3737
if (assemblySearchPathsDict.ContainsKey(path))
3838
return;
3939
assemblySearchPathsDict[path] = true;
4040
assemblySearchPaths.Add(path);
4141
}
4242

43-
Assembly get(string assemblyFullName) {
43+
Assembly Get(string assemblyFullName) {
4444
var asmName = new AssemblyName(assemblyFullName);
4545

4646
Assembly assembly;
@@ -53,8 +53,8 @@ Assembly get(string assemblyFullName) {
5353
}
5454

5555
static string[] assemblyExtensions = new string[] { ".dll", ".exe" };
56-
Assembly assemblyResolve(object sender, ResolveEventArgs args) {
57-
var assembly = get(args.Name);
56+
Assembly AssemblyResolve(object sender, ResolveEventArgs args) {
57+
var assembly = Get(args.Name);
5858
if (assembly != null)
5959
return assembly;
6060

@@ -65,8 +65,8 @@ Assembly assemblyResolve(object sender, ResolveEventArgs args) {
6565
var filename = Path.Combine(path, asmName.Name + ext);
6666
if (!new FileInfo(filename).Exists)
6767
continue;
68-
addConfigFile(filename + ".config");
69-
return addAssembly(Assembly.LoadFile(filename));
68+
AddConfigFile(filename + ".config");
69+
return AddAssembly(Assembly.LoadFile(filename));
7070
}
7171
catch (IOException) {
7272
}
@@ -86,12 +86,12 @@ Assembly assemblyResolve(object sender, ResolveEventArgs args) {
8686
return null;
8787
}
8888

89-
public Assembly load(string filename) {
90-
addConfigFile(filename + ".config");
91-
return addAssembly(loadFile(filename));
89+
public Assembly Load(string filename) {
90+
AddConfigFile(filename + ".config");
91+
return AddAssembly(LoadFile(filename));
9292
}
9393

94-
Assembly loadFile(string filename) {
94+
Assembly LoadFile(string filename) {
9595
try {
9696
return Assembly.LoadFrom(filename);
9797
}
@@ -101,16 +101,16 @@ Assembly loadFile(string filename) {
101101
}
102102
}
103103

104-
Assembly addAssembly(Assembly assembly) {
104+
Assembly AddAssembly(Assembly assembly) {
105105
var asmName = assembly.GetName();
106106
assemblies[asmName.FullName] = assembly;
107107
assemblies[asmName.Name] = assembly;
108108
return assembly;
109109
}
110110

111-
void addConfigFile(string configFilename) {
112-
var dirName = Utils.getDirName(Utils.getFullPath(configFilename));
113-
addAssemblySearchPath(dirName);
111+
void AddConfigFile(string configFilename) {
112+
var dirName = Utils.GetDirName(Utils.GetFullPath(configFilename));
113+
AddAssemblySearchPath(dirName);
114114

115115
try {
116116
using (var xmlStream = new FileStream(configFilename, FileMode.Open, FileAccess.Read, FileShare.Read)) {
@@ -124,7 +124,7 @@ void addConfigFile(string configFilename) {
124124
if (string.IsNullOrEmpty(privatePath))
125125
continue;
126126
foreach (var path in privatePath.Split(';'))
127-
addAssemblySearchPath(Path.Combine(dirName, path));
127+
AddAssemblySearchPath(Path.Combine(dirName, path));
128128
}
129129
}
130130
}

‎De4dot.JustDecompile/De4dot/sources/AssemblyData/AssemblyServer.cs

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (C) 2011-2013 [email protected]
2+
Copyright (C) 2011-2014 [email protected]
33
44
This file is part of de4dot.
55
@@ -26,19 +26,20 @@ You should have received a copy of the GNU General Public License
2626

2727
namespace AssemblyServer {
2828
public static class Start {
29-
public static int main(string[] args) {
30-
if (args.Length != 2)
29+
public static int Main(string[] args) {
30+
if (args.Length != 3)
3131
Environment.Exit(1);
32-
var channelName = args[0];
33-
var uri = args[1];
32+
var serviceType = (AssemblyServiceType)int.Parse(args[0]);
33+
var channelName = args[1];
34+
var uri = args[2];
3435

35-
var service = new AssemblyService();
36-
startServer(service, channelName, uri);
37-
service.waitExit();
36+
var service = (AssemblyService)AssemblyService.Create(serviceType);
37+
StartServer(service, channelName, uri);
38+
service.WaitExit();
3839
return 0;
3940
}
4041

41-
static void startServer(AssemblyService service, string name, string uri) {
42+
static void StartServer(AssemblyService service, string name, string uri) {
4243
var props = new Hashtable();
4344
props["portName"] = name;
4445
var provider = new BinaryServerFormatterSinkProvider();

0 commit comments

Comments
 (0)