2008-11-15 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* ConfigurationManager.cs: the config file name is arbitrary.
	(Standalone test t46)

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index e65d132a29a3862c8436c348c5f051b3440ab88b..2ad643431a72976389d15ebfb8a3176e6c4376ac 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,4 +1,9 @@
 
+2008-11-15 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * ConfigurationManager.cs: the config file name is arbitrary.
+       (Standalone test t46)
+
 2008-11-10 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * ConfigurationManager.cs: when we're dealing with an EXE hosted

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
index eaa9371b95e47db705b1858823fabdf1bc5f4225..9785b38353470002e454259f3ab439b4e4417d11 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
@@ -94,8 +94,7 @@ namespace System.Configuration {
                        switch (userLevel) {
                        case ConfigurationUserLevel.None:
                                if (exePath == null || exePath.Length == 0) {
-                                       exePath = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
-                                       map.ExeConfigFilename = exePath.EndsWith (".config") ? exePath : exePath + ".config";
+                                       map.ExeConfigFilename = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
                                } else {
                                        if (!Path.IsPathRooted (exePath))
                                                exePath = Path.GetFullPath (exePath);