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

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,13 +47,8 @@ using System.Security.Permissions;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
#if NET_3_5
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
#else
[assembly: AssemblyVersion ("1.0.61025.0")]
[assembly: AssemblyInformationalVersion ("1.0.61025.0")]
#endif
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
@ -79,10 +74,6 @@ using System.Security.Permissions;
[assembly: WebResource ("MicrosoftAjaxWebForms.debug.js", "application/x-javascript")]
[assembly: WebResource ("MicrosoftAjaxTimer.js", "application/x-javascript")]
[assembly: WebResource ("MicrosoftAjaxTimer.debug.js", "application/x-javascript")]
#if TARGET_J2EE
[assembly: WebResource ("MicrosoftAjaxExtension.js", "application/x-javascript")]
[assembly: WebResource ("MicrosoftAjaxWebFormsExtension.js", "application/x-javascript")]
#endif
// Those entries must not be enabled until the appropriate .resx files with translations for the client scripts are
// created.

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientFormsAuthenticationCredentials.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Net;
@ -65,4 +64,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientFormsAuthenticationMembershipProvider.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Collections.Specialized;
@ -197,4 +196,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientRoleProvider.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.Collections.Specialized;
using System.ComponentModel;
@ -119,4 +118,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientSettingsProvider.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.Collections.Specialized;
using System.ComponentModel;
@ -97,4 +96,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/ClientWindowsAuthenticationMembershipProvider.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.Collections.Specialized;
using System.ComponentModel;
@ -180,4 +179,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/IClientFormsAuthenticationCredentialsProvider.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Net;
@ -45,4 +44,3 @@ namespace System.Web.ClientServices.Providers
ClientFormsAuthenticationCredentials GetCredentials ();
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/SettingsSavedEventArgs.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@ -55,4 +54,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices.Providers/UserValidatedEventArgs.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Net;
@ -53,4 +52,3 @@ namespace System.Web.ClientServices.Providers
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices/ClientFormsIdentity.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Net;
@ -93,4 +92,3 @@ namespace System.Web.ClientServices
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices/ClientRolePrincipal.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Net;
@ -58,4 +57,3 @@ namespace System.Web.ClientServices
}
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.ClientServices/ConnectivityStatus.cs
View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Net;
@ -53,4 +52,3 @@ namespace System.Web.ClientServices
}
}
}
#endif

4
mcs/class/System.Web.Extensions/System.Web.Configuration/ScriptingJsonSerializationSection.cs
View File

@ -43,11 +43,7 @@ namespace System.Web.Configuration
}
}
#if NET_3_5
[ConfigurationPropertyAttribute ("maxJsonLength", DefaultValue = 2097152)]
#else
[ConfigurationPropertyAttribute ("maxJsonLength", DefaultValue = 102400)]
#endif
public int MaxJsonLength {
get {
return (int) this ["maxJsonLength"];

11
mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptModule.cs
View File

@ -73,13 +73,6 @@ namespace System.Web.Handlers
IHttpHandler currentHandler = context.CurrentHandler;
if (currentHandler == null)
return;
#if TARGET_J2EE
if (!(currentHandler is Page) && currentHandler is IServiceProvider) {
pageType = (Type) ((IServiceProvider) currentHandler).GetService (typeof (Type));
if (pageType == null)
return;
}
#endif
Type pageType = currentHandler.GetType ();
if (typeof (Page).IsAssignableFrom (pageType) && !String.IsNullOrEmpty (contentType) && contentType.StartsWith ("application/json", StringComparison.OrdinalIgnoreCase)) {
IHttpHandler h = RestHandler.GetHandler (context, pageType, request.FilePath);
@ -94,10 +87,6 @@ namespace System.Web.Handlers
HttpContext context = app.Context;
if (context.Request.Headers ["X-MicrosoftAjax"] == "Delta=true") {
Page p = context.CurrentHandler as Page;
#if TARGET_J2EE
if (p == null && context.CurrentHandler is IServiceProvider)
p = (Page) ((IServiceProvider) context.CurrentHandler).GetService (typeof (Page));
#endif
ScriptManager sm = ScriptManager.GetCurrentInternal (p);
if (context.Response.StatusCode == 302) {
context.Response.StatusCode = 200;

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

@ -62,7 +62,6 @@ namespace System.Web.Handlers
}
#endregion
#if NET_3_5
void AppendResourceScriptContents (StringWriter sw, CompositeEntry entry)
{
if (entry.Assembly == null || entry.Attribute == null || String.IsNullOrEmpty (entry.NameOrPath))
@ -179,7 +178,6 @@ namespace System.Web.Handlers
if (notifyScriptLoaded)
OutputScriptLoadedNotification (response.Output);
}
#endif
void OutputScriptLoadedNotification (TextWriter writer)
{
writer.WriteLine ();
@ -190,13 +188,11 @@ namespace System.Web.Handlers
{
HttpRequest request = context.Request;
bool notifyScriptLoaded = request.QueryString ["n"] == "t";
#if NET_3_5
List <CompositeEntry> compositeEntries = CompositeScriptReference.GetCompositeScriptEntries (request.RawUrl);
if (compositeEntries != null) {
SendCompositeScript (context, request, notifyScriptLoaded, compositeEntries);
return;
}
#endif
EmbeddedResource res;
Assembly assembly;
SendEmbeddedResource (context, out res, out assembly);
@ -247,7 +243,6 @@ namespace System.Web.Handlers
if (notifyScriptLoaded)
OutputScriptLoadedNotification (writer);
}
#if NET_3_5
static void CheckIfResourceIsCompositeScript (string resourceName, ref bool includeTimeStamp)
{
bool isCompositeScript = resourceName.StartsWith (CompositeScriptReference.COMPOSITE_SCRIPT_REFERENCE_PREFIX, StringComparison.Ordinal);
@ -261,7 +256,6 @@ namespace System.Web.Handlers
{
return false;
}
#endif
// TODO: add value cache?
static string GetScriptStringLiteral (string value)
{

2
mcs/class/System.Web.Extensions/System.Web.Query.Dynamic/DynamicClass.cs
View File

@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Security.Permissions;
@ -49,4 +48,3 @@ namespace System.Web.Query.Dynamic
}
}
#endif

2
mcs/class/System.Web.Extensions/System.Web.Query.Dynamic/ParseException.cs
View File

@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
@ -52,4 +51,3 @@ namespace System.Web.Query.Dynamic
}
}
}
#endif

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

@ -66,11 +66,7 @@ namespace System.Web.Script.Serialization
ScriptingJsonSerializationSection section = (ScriptingJsonSerializationSection) ConfigurationManager.GetSection ("system.web.extensions/scripting/webServices/jsonSerialization");
if (section == null) {
#if NET_3_5
_maxJsonLength = 2097152;
#else
_maxJsonLength = 102400;
#endif
_recursionLimit = 100;
} else {
_maxJsonLength = section.MaxJsonLength;
@ -133,11 +129,7 @@ namespace System.Web.Script.Serialization
return (T) ConvertToType (obj, typeof (T));
}
#if NET_4_0
public
#else
internal
#endif
object ConvertToType (object obj, Type targetType)
{
if (obj == null)
@ -204,7 +196,11 @@ namespace System.Web.Script.Serialization
}
public object Deserialize (string input, Type targetType) {
return DeserializeObjectInternal (input);
object obj = DeserializeObjectInternal (input);
if (obj == null) return null;
return ConvertToType (obj, targetType);
}
static object Evaluate (object value) {

23
mcs/class/System.Web.Extensions/System.Web.Script.Services/LogicalTypeInfo.cs
View File

@ -40,10 +40,8 @@ using System.Web.Script.Serialization;
using System.IO;
using System.Xml.Serialization;
using System.Xml;
#if NET_3_5
using System.ServiceModel;
using System.ServiceModel.Description;
#endif
namespace System.Web.Script.Services
{
@ -59,11 +57,9 @@ namespace System.Web.Script.Services
{
public static LogicalTypeInfo CreateTypeInfo (Type t, string filePath)
{
#if NET_3_5
if (t.GetCustomAttributes (typeof (ServiceContractAttribute), false).Length > 0)
return new WcfLogicalTypeInfo (t, filePath);
else
#endif
return new AsmxLogicalTypeInfo (t, filePath);
}
@ -145,24 +141,7 @@ return this._invoke({0}.get_path(), '{1}',{2},{{{3}}},succeededCallback,failedCa
public abstract void Invoke (HttpRequest request, HttpResponse response);
}
#if !TARGET_J2EE
static Hashtable _type_to_logical_type = Hashtable.Synchronized (new Hashtable ());
#else
const string type_to_logical_type_key = "System.Web.Script.Services.LogicalTypeInfo";
static Hashtable _type_to_logical_type {
get {
Hashtable hash = (Hashtable) AppDomain.CurrentDomain.GetData (type_to_logical_type_key);
if (hash != null)
return hash;
AppDomain.CurrentDomain.SetData (type_to_logical_type_key, Hashtable.Synchronized (new Hashtable ()));
return (Hashtable) AppDomain.CurrentDomain.GetData (type_to_logical_type_key);
}
}
#endif
static internal LogicalTypeInfo GetLogicalTypeInfo (Type t, string filePath) {
Hashtable type_to_manager = _type_to_logical_type;
@ -594,7 +573,6 @@ var gtc = Sys.Net.WebServiceProxy._generateTypedConstructor;");
}
}
#if NET_3_5
internal class WcfLogicalTypeInfo : LogicalTypeInfo
{
ContractDescription cd;
@ -695,5 +673,4 @@ var gtc = Sys.Net.WebServiceProxy._generateTypedConstructor;");
}
}
}
#endif
}

2
mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPager.cs
View File

@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_3_5
using System;
using System.ComponentModel;
using System.Security.Permissions;
@ -497,4 +496,3 @@ namespace System.Web.UI.WebControls
}
}
}
#endif

Some files were not shown because too many files have changed in this diff Show More