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

Imported Upstream version 3.10.0

Browse Source 
Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
View File

@ -59,7 +59,7 @@ using System.Security.Permissions;
[assembly: NeutralResourcesLanguage ("en-US")]
#if !(TARGET_JVM || TARGET_DOTNET)
#if !(TARGET_DOTNET)
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../winfx.pub")]

6
mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
View File

@ -211,18 +211,12 @@ namespace System.Web.Handlers
rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);
}
catch (MissingManifestResourceException) {
#if TARGET_JVM // GetResourceSet does not throw MissingManifestResourceException if ressource is not exists
}
if (rset == null) {
#endif
if (scriptResourceName.EndsWith (".resources", RuntimeHelpers.StringComparison)) {
scriptResourceName = scriptResourceName.Substring (0, scriptResourceName.Length - 10);
rset = new ResourceManager (scriptResourceName, assembly).GetResourceSet (Threading.Thread.CurrentThread.CurrentUICulture, true, true);
}
#if !TARGET_JVM
else
throw;
#endif
}
if (rset == null)
break;

4
mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JavaScriptSerializer.cs
View File

@ -203,6 +203,10 @@ namespace System.Web.Script.Serialization
return ConvertToType<T> (DeserializeObjectInternal(input));
}
public object Deserialize (string input, Type targetType) {
return DeserializeObjectInternal (input);
}
static object Evaluate (object value) {
return Evaluate (value, false);
}

2
mcs/class/System.Web.Extensions/System.Web.Script.Services/ScriptHandlerFactory.cs
View File

@ -55,9 +55,7 @@ namespace System.Web.Script.Services
if (url.EndsWith (AuthenticationService.DefaultWebServicePath, StringComparison.Ordinal))
handlerType = typeof(AuthenticationService);
else {
#if !TARGET_JVM
handlerType = BuildManager.GetCompiledType (url);
#endif
if (handlerType == null)
handlerType = WebServiceParser.GetCompiledType (url, context);
}

24
mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptBehaviorDescriptorTest.cs
View File

@ -90,11 +90,7 @@ namespace Tests.System.Web.UI
scd.AddComponentProperty ("myName2", "myCompId2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, null, null, {\"myName2\":\"myCompId2\",\"myName1\":\"myCompId1\"}, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, null, null, {\"myName1\":\"myCompId1\",\"myName2\":\"myCompId2\"}, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -105,11 +101,7 @@ namespace Tests.System.Web.UI
scd.AddElementProperty ("myName2", "myElemId2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":$get(\"myElemId2\"),\"myName1\":$get(\"myElemId1\")}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":$get(\"myElemId1\"),\"myName2\":$get(\"myElemId2\")}, null, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -120,11 +112,7 @@ namespace Tests.System.Web.UI
scd.AddProperty ("myName2", "myValue2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":\"myValue2\",\"myName1\":\"myValue1\"}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":\"myValue1\",\"myName2\":\"myValue2\"}, null, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -135,11 +123,7 @@ namespace Tests.System.Web.UI
scd.AddProperty ("myName2", null);
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":null,\"myName1\":null}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":null,\"myName2\":null}, null, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -150,11 +134,7 @@ namespace Tests.System.Web.UI
scd.AddEvent ("myName2", "myHandler2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, null, {\"myName2\":myHandler2,\"myName1\":myHandler1}, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, null, {\"myName1\":myHandler1,\"myName2\":myHandler2}, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -165,11 +145,7 @@ namespace Tests.System.Web.UI
scd.AddScriptProperty ("myName2", "myScript2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":myScript2,\"myName1\":myScript1}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":myScript1,\"myName2\":myScript2}, null, null, $get(\"Element1\"));", script);
#endif
}
[Test]

24
mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptComponentDescriptorTest.cs
View File

@ -84,11 +84,7 @@ namespace Tests.System.Web.UI
scd.AddComponentProperty ("myName2", "myCompId2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, null, null, {\"myName2\":\"myCompId2\",\"myName1\":\"myCompId1\"});", script);
#else
Assert.AreEqual ("$create(My.Type, null, null, {\"myName1\":\"myCompId1\",\"myName2\":\"myCompId2\"});", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -99,11 +95,7 @@ namespace Tests.System.Web.UI
scd.AddElementProperty ("myName2", "myElemId2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":$get(\"myElemId2\"),\"myName1\":$get(\"myElemId1\")}, null, null);", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":$get(\"myElemId1\"),\"myName2\":$get(\"myElemId2\")}, null, null);", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -114,11 +106,7 @@ namespace Tests.System.Web.UI
scd.AddProperty ("myName2", "myValue2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":\"myValue2\",\"myName1\":\"myValue1\"}, null, null);", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":\"myValue1\",\"myName2\":\"myValue2\"}, null, null);", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -129,11 +117,7 @@ namespace Tests.System.Web.UI
scd.AddProperty ("myName2", null);
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":null,\"myName1\":null}, null, null);", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":null,\"myName2\":null}, null, null);", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -144,11 +128,7 @@ namespace Tests.System.Web.UI
scd.AddEvent ("myName2", "myHandler2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, null, {\"myName2\":myHandler2,\"myName1\":myHandler1}, null);", script);
#else
Assert.AreEqual ("$create(My.Type, null, {\"myName1\":myHandler1,\"myName2\":myHandler2}, null);", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -159,11 +139,7 @@ namespace Tests.System.Web.UI
scd.AddScriptProperty ("myName2", "myScript2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":myScript2,\"myName1\":myScript1}, null, null);", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":myScript1,\"myName2\":myScript2}, null, null);", script);
#endif
}
[Test]

24
mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptControlDescriptorTest.cs
View File

@ -80,11 +80,7 @@ namespace Tests.System.Web.UI
scd.AddComponentProperty ("myName2", "myCompId2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, null, null, {\"myName2\":\"myCompId2\",\"myName1\":\"myCompId1\"}, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, null, null, {\"myName1\":\"myCompId1\",\"myName2\":\"myCompId2\"}, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -95,11 +91,7 @@ namespace Tests.System.Web.UI
scd.AddElementProperty ("myName2", "myElemId2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":$get(\"myElemId2\"),\"myName1\":$get(\"myElemId1\")}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":$get(\"myElemId1\"),\"myName2\":$get(\"myElemId2\")}, null, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -110,11 +102,7 @@ namespace Tests.System.Web.UI
scd.AddProperty ("myName2", "myValue2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":\"myValue2\",\"myName1\":\"myValue1\"}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":\"myValue1\",\"myName2\":\"myValue2\"}, null, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -125,11 +113,7 @@ namespace Tests.System.Web.UI
scd.AddProperty ("myName2", null);
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":null,\"myName1\":null}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":null,\"myName2\":null}, null, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -140,11 +124,7 @@ namespace Tests.System.Web.UI
scd.AddEvent ("myName2", "myHandler2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, null, {\"myName2\":myHandler2,\"myName1\":myHandler1}, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, null, {\"myName1\":myHandler1,\"myName2\":myHandler2}, null, $get(\"Element1\"));", script);
#endif
}
[Category("NotWorking")] // One must not depend on the order of keys in dictionary
@ -155,11 +135,7 @@ namespace Tests.System.Web.UI
scd.AddScriptProperty ("myName2", "myScript2");
string script = scd.DoGetScript ();
#if TARGET_JVM
Assert.AreEqual ("$create(My.Type, {\"myName2\":myScript2,\"myName1\":myScript1}, null, null, $get(\"Element1\"));", script);
#else
Assert.AreEqual ("$create(My.Type, {\"myName1\":myScript1,\"myName2\":myScript2}, null, null, $get(\"Element1\"));", script);
#endif
}
[Test]