mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/class/System.Configuration/System.Configuration/Configuration.cs
View File

@@ -133,8 +133,12 @@ namespace System.Configuration {
rootGroup.StreamName = streamName;
}
if (streamName != null)
Load ();
try {
if (streamName != null)
Load ();
} catch (XmlException ex) {
throw new ConfigurationErrorsException (ex.Message, ex, streamName, 0);
}
}
internal Configuration Parent {

18
mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
View File

@@ -627,5 +627,23 @@ namespace MonoTests.System.Configuration {
Assert.AreEqual ("Server=(local);Initial Catalog=someDb;User Id=someUser;Password=somePassword;Application Name=someAppName;Min Pool Size=5;Max Pool Size=500;Connect Timeout=10;Connection Lifetime=29;",
connString);
}
[Test]
public void BadConfig ()
{
string xml = @" badXml";
var file = Path.Combine (tempFolder, "badConfig.config");
File.WriteAllText (file, xml);
try {
var fileMap = new ConfigurationFileMap (file);
var configuration = ConfigurationManager.OpenMappedMachineConfiguration (fileMap);
Assert.Fail ("Exception ConfigurationErrorsException was expected.");
} catch (ConfigurationErrorsException e) {
Assert.AreEqual (file, e.Filename);
}
}
}
}

12
mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
View File

@@ -143,27 +143,15 @@ namespace MonoTests.System.Configuration {
{
ConfigurationPermission p = new ConfigurationPermission (PermissionState.Unrestricted);
#if NET_4_0
Assert.AreEqual(
"<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"\nUnrestricted=\"true\"/>\n",
p.ToString().Replace ("\r\n", "\n"), "A1");
#else
Assert.AreEqual (
"<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"\nUnrestricted=\"true\"/>\n",
p.ToString ().Replace ("\r\n", "\n"), "A1");
#endif
p = new ConfigurationPermission (PermissionState.None);
#if NET_4_0
Assert.AreEqual (
"<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"/>\n",
p.ToString().Replace ("\r\n", "\n"), "A2");
#else
Assert.AreEqual (
"<IPermission class=\"System.Configuration.ConfigurationPermission, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a\"\nversion=\"1\"/>\n",
p.ToString ().Replace ("\r\n", "\n"), "A2");
#endif
}
}
}

12
mcs/class/System.Configuration/Test/Util/TestUtil.cs
View File

@@ -64,18 +64,6 @@ namespace MonoTests.System.Configuration.Util {
}
}
public static string DotNetVersion {
get {
#if NET_4_5
return "net_4_5";
#elif NET_4_0
return "net_4_0";
#else
return "net_2_0";
#endif
}
}
public static string ThisDllName {
get {
var asm = Assembly.GetCallingAssembly ();