Imported Upstream version 4.3.2.467

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

View File

@ -385,10 +385,8 @@ public class AssemblyNameTest {
string AssemblyCorlib;
#if MOBILE
AssemblyCorlib = "mscorlib, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e";
#elif NET_4_0
AssemblyCorlib = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
#else
AssemblyCorlib = "mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
AssemblyCorlib = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
#endif
Assert.AreEqual (AssemblyCorlib, an.FullName, "#2");
}
@ -1294,19 +1292,8 @@ public class AssemblyNameTest {
try {
new AssemblyName (assemblyName + ", Culture=aa-AA");
Assert.Fail ("#1");
#if NET_4_0
} catch (CultureNotFoundException ex) {
}
#else
} catch (ArgumentException ex) {
// Culture name 'aa-aa' is not supported
Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2");
Assert.IsNull (ex.InnerException, "#3");
Assert.IsNotNull (ex.Message, "#4");
Assert.IsNotNull (ex.ParamName, "#5");
Assert.AreEqual ("name", ex.ParamName, "#6");
}
#endif
}
[Test] // ctor (String)
@ -1820,6 +1807,28 @@ public class AssemblyNameTest {
}
}
[Test] // ctor (String)
public void Constructor1_Quoted ()
{
AssemblyName an;
an = new AssemblyName ("'System', Version=\"10.0.0.0\", Culture='Neutral', PublicKeyToken='b67a5c561934e089', Retargetable='Yes', ProcessorArchitecture='AMD64'");
Assert.AreEqual ("System, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b67a5c561934e089, Retargetable=Yes", an.ToString ());
Assert.AreEqual (ProcessorArchitecture.Amd64, an.ProcessorArchitecture, "Amd64");
}
[Test] // ctor (String)
public void Constructor1_Quoted_Invalid ()
{
AssemblyName an;
try {
an = new AssemblyName ("System, Version=\"10.0.0.0'");
Assert.Fail ("#1");
} catch (FileLoadException) {
}
}
[Test (Description="Xamarin bug #99 - whitespaces in key=value")]
public void WhiteSpaceInKeyValue ()
{