Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -64,17 +64,16 @@ namespace MonoTests.System.Configuration.Util {
}
}
public static string ThisDllName {
public static string ThisApplicationPath {
get {
var asm = Assembly.GetCallingAssembly ();
return Path.GetFileName (asm.Location);
var asm = Assembly.GetEntryAssembly ();
return asm.Location;
}
}
public static string ThisConfigFileName {
get {
var asm = Assembly.GetCallingAssembly ();
var exe = Path.GetFileName (asm.Location);
var exe = Path.GetFileName (ThisApplicationPath);
return exe + ".config";
}
}