More on ApplicationBase

svn path=/trunk/mcs/; revision=15999

diff --git a/mcs/class/corlib/System/AppDomainSetup.cs b/mcs/class/corlib/System/AppDomainSetup.cs
index 3365824f567661e50e7786e7183c3f55437bd410..005201d0b81a8fe9ee8d8a89e4c97a1b49ff659f 100755 (executable)
--- a/mcs/class/corlib/System/AppDomainSetup.cs
+++ b/mcs/class/corlib/System/AppDomainSetup.cs
@@ -8,6 +8,7 @@
 //
 
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -45,6 +46,8 @@ namespace System {
                        int len = appBase.Length;
                        if (len >= 8 && appBase.ToLower ().StartsWith ("file://"))
                                appBase = appBase.Substring (7);
+                       else if (appBase.IndexOf (':') == -1)
+                               appBase = Path.GetFullPath (appBase);
 
                        return appBase;
                }

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index ebcd39b395fd72cabcf4f4901c725b17aa0f0935..7e6c3b60066417e6ef62c2002ba7ed70c70a9bb3 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,7 +1,7 @@
 2003-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * AppDomainSetup.cs: remove the "file://" prefix from ApplicationBase
-       if it's present.
+       if it's present and get the full path for non-Uri paths.
 
 2003-07-2  Lluis Sanchez Gual <lluis@ximian.com>