Merge branch 'master' into mc
This commit is contained in:
commit
b000112abc
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -192,6 +192,9 @@ namespace de4dot.cui {
|
||||||
catch (BadImageFormatException) {
|
catch (BadImageFormatException) {
|
||||||
return false; // Not a .NET file
|
return false; // Not a .NET file
|
||||||
}
|
}
|
||||||
|
catch (EndOfStreamException) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
catch (Exception ex) {
|
catch (Exception ex) {
|
||||||
Log.w("Could not load file ({0}): {1}", ex.GetType(), file.Filename);
|
Log.w("Could not load file ({0}): {1}", ex.GetType(), file.Filename);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
|
@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("1.6.0.3405")]
|
[assembly: AssemblyVersion("1.6.1.3405")]
|
||||||
[assembly: AssemblyFileVersion("1.6.0.3405")]
|
[assembly: AssemblyFileVersion("1.6.1.3405")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user