2007-11-14 Atsushi Enomoto <atsushi@ximian.com>

	* Configuration.cs : (Save) when the given file path is relative
	  it failed to create directory. Fixed standalone test t25/t26.
	* InternalConfigurationHost.cs : pass userLevel to create a host
	  instance.

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index d1f8cc01c4628bafd9fa61c7eeded3d6745520bd..ee6bb2be6a0daf9e5cd42694cf7d0fe397813fe2 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-14  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * Configuration.cs : (Save) when the given file path is relative
+         it failed to create directory. Fixed standalone test t25/t26.
+       * InternalConfigurationHost.cs : pass userLevel to create a host
+         instance.
+
 2007-10-04  Atsushi Enomoto  <atsushi@ximian.com>
 
        * InternalConfigurationHost.cs : when the streamName is for

diff --git a/mcs/class/System.Configuration/System.Configuration/Configuration.cs b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
index 78ff476076c1bbdb093ed6df14ab5f6d65c7bcee..9f6a3ae117511a6d8f2c1030543d4a3fb9d25616 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/Configuration.cs
+++ b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
@@ -387,7 +387,7 @@ namespace System.Configuration {
                [MonoInternalNote ("Detect if file has changed")]
                public void SaveAs (string filename, ConfigurationSaveMode mode, bool forceUpdateAll)
                {
-                       string dir = Path.GetDirectoryName (filename);
+                       string dir = Path.GetDirectoryName (Path.GetFullPath (filename));
                        if (!Directory.Exists (dir))
                                Directory.CreateDirectory (dir);
                        Save (new FileStream (filename, FileMode.OpenOrCreate, FileAccess.Write), mode, forceUpdateAll);

diff --git a/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs b/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
index d782c91e75ffd79fb5bd8d4d7f395eac11f4f279..5a3587537c726aa08071ef5017aca4438aa29102 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
+++ b/mcs/class/System.Configuration/System.Configuration/InternalConfigurationHost.cs
@@ -268,6 +268,7 @@ namespace System.Configuration
                public override void Init (IInternalConfigRoot root, params object[] hostInitParams)
                {
                        map = (ExeConfigurationFileMap) hostInitParams [0];
+                       level = (ConfigurationUserLevel) hostInitParams [1];
                }
                
                public override string GetStreamName (string configPath)