Compare commits

...
70 changed files with 438 additions and 95 deletions

No files matched your search

+2
View File
@@ -14,6 +14,7 @@ mobile_SUBDIRS := build class
mobile_static_SUBDIRS := build class
binary_reference_assemblies_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
xammac_net_4_5_SUBDIRS := build class
xbuild_12_SUBDIRS := build class tools/xbuild
xbuild_14_SUBDIRS := build class tools/xbuild
@@ -57,6 +58,7 @@ $(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%:
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
$(_boot_:%=profile-do--xammac_net_4_5--%): profile-do--xammac_net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--%
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
+11
View File
@@ -0,0 +1,11 @@
include $(topdir)/build/profiles/net_4_5.make
PROFILE_MCS_FLAGS += -d:NO_SYSTEM_DRAWING_DEPENDENCY -d:NO_WINFORMS_DEPENDENCY -d:NO_SYSTEM_WEB_DEPENDENCY -d:XAMMAC_4_5
XAMMAC_4_5=1
NO_WINDOWS_BASE=1
NO_SYSTEM_WEB_DEPENDENCY=1
NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY=1
NO_WINFORMS_DEPENDENCY=1
NO_SYSTEM_DRAWING_DEPENDENCY=1
NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY=1
NO_SYSTEM_DESIGN_DEPENDENCY=1
NO_SYSTEM_DIRECTORY_SERVICES_DEPENDENCY=1
+1
View File
@@ -18,6 +18,7 @@ net_4_5_SUBDIRS = $(monotouch_SUBDIRS) System.Reflection.Emit.ILGeneration Syste
monodroid_SUBDIRS = $(net_4_5_SUBDIRS)
xammac_SUBDIRS = $(net_4_5_SUBDIRS)
xammac_net_4_5_SUBDIRS = $(net_4_5_SUBDIRS)
PROFILE_SUBDIRS = $(net_4_5_SUBDIRS)
@@ -26,6 +26,7 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.TransportSecurityBindingElement))]
#if !MOBILE
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.DnsEndpointIdentity))]
#if !XAMMAC_4_5
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageSecurityVersion))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.BasicSecurityProfileVersion))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecureConversationVersion))]
@@ -36,6 +37,7 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.SupportingTokenParameters))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.TrustVersion))]
#endif
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.SpnEndpointIdentity))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.UpnEndpointIdentity))]
#endif
+44 -1
View File
@@ -75,6 +75,48 @@ monotouch_runtime_dirs := \
System.XML \
Mono.CSharp
xammac_4_5_dirs := \
corlib \
System \
Mono.Posix \
System.Core \
System.XML \
Mono.Security \
System \
I18N \
System.Numerics \
Mono.Data.Tds \
System.Transactions \
System.EnterpriseServices \
System.Data \
System.Runtime.Serialization \
System.Xml.Linq \
Mono.Data.Sqlite \
System.Runtime.Serialization.Formatters.Soap \
System.ComponentModel.DataAnnotations \
System.IdentityModel \
System.IdentityModel.Selectors \
Mono.Messaging \
System.Configuration.Install \
System.Messaging \
System.Web.Services \
System.Net \
System.ServiceModel \
System.ServiceModel.Web \
System.Json \
System.Data.Services.Client \
System.IO.Compression \
System.IO.Compression.FileSystem \
System.ComponentModel.Composition.4.5 \
System.Windows \
System.Xml.Serialization \
Mono.CSharp \
Microsoft.CSharp \
Mono.CompilerServices.SymbolWriter \
System.Data.Linq \
System.Net.Http \
$(pcl_facade_dirs)
net_4_5_dirs := \
corlib \
System \
@@ -217,6 +259,7 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs)
binary_reference_assemblies_SUBDIRS := reference-assemblies
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
@@ -224,7 +267,7 @@ xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
include ../build/rules.make
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs)
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs) $(xammac_net_4_5_SUBDIRS)
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
@@ -12,7 +12,7 @@ CLEAN_FILES += $(STRING_MESSAGES)
EXTRA_DISTFILES = \
src/ComponentModel/Strings.resx
VALID_PROFILE := $(filter net_4_5 monotouch monodroid xammac mobile mobile_static, $(PROFILE))
VALID_PROFILE := $(filter net_4_5 monotouch monodroid xammac xammac_net_4_5 mobile mobile_static, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll
NO_INSTALL = yes
@@ -0,0 +1 @@
#include net_4_5_System.Core.dll.sources
+1 -1
View File
@@ -17,7 +17,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = src/DbLinq/Schema/Dbml/DbmlSchema.xsd
# This is a .NET 3.5+ assembly
VALID_PROFILE := $(filter net_4_5, $(PROFILE))
VALID_PROFILE := $(filter xammac_net_4_5 net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.Data.Linq.dll
NO_INSTALL = yes
@@ -17,9 +17,11 @@ LIB_MCS_FLAGS = \
-resource:Client/System.Data.Services.Client.resources \
-warn:2
ifndef NO_WINDOWS_BASE
ifneq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -r:WindowsBase
endif
endif
include ../../build/library.make
@@ -0,0 +1 @@
#include net_4_5_System.Data.Services.Client.dll.sources
@@ -0,0 +1 @@
#include System.Data.dll.sources
@@ -15,7 +15,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES =
VALID_PROFILE := $(filter net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_5 xammac_net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.IdentityModel.Selectors.dll
NO_INSTALL = yes
+7 -2
View File
@@ -2,9 +2,11 @@ thisdir = class/System.IdentityModel
SUBDIRS =
include ../../build/rules.make
ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
OTHER_LIB_MCS_FLAGS = -r:System.Web.ApplicationServices.dll
endif
endif
LIBRARY = System.IdentityModel.dll
LIB_MCS_FLAGS = \
@@ -12,12 +14,15 @@ LIB_MCS_FLAGS = \
/r:System.dll \
/r:System.Xml.dll \
/r:System.Security.dll \
/r:System.Web.dll \
/r:System.Configuration.dll \
/r:Mono.Security.dll \
/r:System.Runtime.Serialization.dll \
$(OTHER_LIB_MCS_FLAGS)
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += /r:System.Web.dll
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = \
@@ -26,7 +31,7 @@ EXTRA_DISTFILES = \
Test/Resources/test.pfx \
Test/Resources/test2.pfx
VALID_PROFILE := $(filter net_4_5, $(PROFILE))
VALID_PROFILE := $(filter net_4_5 xammac_net_4_5, $(PROFILE))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.IdentityModel.dll
NO_INSTALL = yes
@@ -1,3 +1,4 @@
#if !NO_SYSTEM_WEB_DEPENDENCY
//
// CustomUserNameSecurityTokenAuthenticator.cs
//
@@ -133,3 +134,4 @@ namespace System.IdentityModel.Selectors
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !NO_SYSTEM_WEB_DEPENDENCY
//
// UserNamePasswordValidator.cs
//
@@ -80,3 +81,4 @@ namespace System.IdentityModel.Selectors
}
}
}
#endif
+8 -3
View File
@@ -6,17 +6,22 @@ LIBRARY = System.Messaging.dll
LIB_MCS_FLAGS = /resource:System.Messaging/MessageQueue.resx \
/r:System.dll \
/r:System.Configuration.Install.dll \
/r:System.Drawing.dll \
/r:System.Windows.Forms.dll \
/r:System.Xml \
/r:Mono.Messaging.dll
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 \
/r:nunit.mocks.dll
EXTRA_DISTFILES = System.Messaging/MessageQueue.resx
ifdef MESSAGING_NO_WINFORMS
ifndef NO_SYSTEM_DRAWING_DEPENDENCY
LIB_MCS_FLAGS += /r:System.Drawing.dll
endif
ifdef NO_WINFORMS_DEPENDENCY
LIB_MCS_FLAGS += -d:NO_WINFORMS_DEPENDENCY
else
LIB_MCS_FLAGS += /r:System.Windows.Forms.dll
endif
include ../../build/library.make
@@ -28,6 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !NO_SYSTEM_DRAWING_DEPENDENCY
using System.ComponentModel;
using System.Drawing.Design;
@@ -53,3 +54,4 @@ namespace System.Messaging.Design
}
}
}
#endif
@@ -32,7 +32,9 @@
using System;
using System.Collections;
using System.ComponentModel;
#if !NO_SYSTEM_DRAWING_DEPENDENCY
using System.Drawing;
#endif
using System.Messaging.Design;
using System.Threading;
@@ -258,7 +260,9 @@ namespace System.Messaging
}
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
#endif
[MessagingDescription ("MQ_MaximumJournalSize")]
public long MaximumJournalSize {
get {
@@ -270,7 +274,9 @@ namespace System.Messaging
}
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
#endif
[MessagingDescription ("MQ_MaximumQueueSize")]
public long MaximumQueueSize {
get {
@@ -31,7 +31,9 @@ using System;
using System.Collections;
using System.ComponentModel;
using System.Configuration.Install;
#if !NO_SYSTEM_DRAWING_DEPENDENCY
using System.Drawing;
#endif
namespace System.Messaging
{
@@ -88,7 +90,9 @@ namespace System.Messaging
set {throw new NotImplementedException();}
}
#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
#endif
public long MaximumJournalSize {
[MonoTODO]
get {throw new NotImplementedException();}
@@ -96,7 +100,9 @@ namespace System.Messaging
set {throw new NotImplementedException();}
}
#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
#endif
public long MaximumQueueSize {
[MonoTODO]
get {throw new NotImplementedException();}
@@ -183,4 +189,4 @@ namespace System.Messaging
throw new NotImplementedException();
}
}
}
}
@@ -0,0 +1 @@
#include net_4_5_System.Runtime.Serialization.dll.sources
+8 -2
View File
@@ -7,13 +7,19 @@ LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Runtime.Serialization.
ifneq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0 \
-r:System.Configuration.dll \
-r:System.Web.Extensions.dll
-r:System.Configuration.dll
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += -r:System.Web.Extensions.dll
endif
endif
ifndef NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
LIB_MCS_FLAGS += -r:System.ServiceModel.Activation.dll
endif
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
@@ -146,7 +146,7 @@ namespace System.ServiceModel.Channels
return context.GetInnerProperty<T> ();
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO]
void IWsdlExportExtension.ExportContract (WsdlExporter exporter, WsdlContractConversionContext context)
{
@@ -84,7 +84,7 @@ namespace System.ServiceModel.Description
// clientRuntime.MessageInspectors.Add (something);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
protected virtual void AddServerErrorHandlers (ServiceEndpoint endpoint, EndpointDispatcher endpointDispatcher)
{
endpointDispatcher.ChannelDispatcher.ErrorHandlers.Add (new WebHttpErrorHandler ());
@@ -103,7 +103,7 @@ namespace System.ServiceModel.Description
public virtual void ApplyDispatchBehavior (ServiceEndpoint endpoint, EndpointDispatcher endpointDispatcher)
{
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
endpointDispatcher.DispatchRuntime.OperationSelector = GetOperationSelector (endpoint);
@@ -146,7 +146,7 @@ namespace System.ServiceModel.Description
}
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
internal class DispatchPairFormatter : IDispatchMessageFormatter
{
public DispatchPairFormatter (IDispatchMessageFormatter request, IDispatchMessageFormatter reply)
@@ -52,7 +52,7 @@ namespace System.ServiceModel
public WebHttpBinding (string configurationName)
{
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
BindingsSection bindingsSection = ConfigUtil.BindingsSection;
WebHttpBindingElement el = (WebHttpBindingElement) bindingsSection ["webHttpBinding"].ConfiguredBindings.FirstOrDefault (c => c.Name == configurationName);
if (el != null) {
@@ -88,7 +88,7 @@ namespace System.ServiceModel
get { return EnvelopeVersion.None; }
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[DefaultValue (false)]
public bool AllowCookies {
get { return t.AllowCookies; }
@@ -0,0 +1,39 @@
#include mobile_System.ServiceModel.Web.dll.sources
System.ServiceModel.Web/IncomingWebRequestContext.cs
System.ServiceModel.Web/OutgoingWebResponseContext.cs
System.ServiceModel.Syndication/Atom10FeedFormatter.cs
System.ServiceModel.Syndication/Atom10FeedFormatter_1.cs
System.ServiceModel.Syndication/Atom10ItemFormatter.cs
System.ServiceModel.Syndication/Atom10ItemFormatter_1.cs
System.ServiceModel.Syndication/AtomPub10CategoriesDocumentFormatter.cs
System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter.cs
System.ServiceModel.Syndication/AtomPub10ServiceDocumentFormatter_1.cs
System.ServiceModel.Syndication/CategoriesDocument.cs
System.ServiceModel.Syndication/CategoriesDocumentFormatter.cs
System.ServiceModel.Syndication/ISyndicationElement.cs
System.ServiceModel.Syndication/InlineCategoriesDocument.cs
System.ServiceModel.Syndication/ReferencedCategoriesDocument.cs
System.ServiceModel.Syndication/ResourceCollectionInfo.cs
System.ServiceModel.Syndication/Rss20FeedFormatter.cs
System.ServiceModel.Syndication/Rss20FeedFormatter_1.cs
System.ServiceModel.Syndication/Rss20ItemFormatter.cs
System.ServiceModel.Syndication/Rss20ItemFormatter_1.cs
System.ServiceModel.Syndication/ServiceDocument.cs
System.ServiceModel.Syndication/ServiceDocumentFormatter.cs
System.ServiceModel.Syndication/SyndicationCategory.cs
System.ServiceModel.Syndication/SyndicationContent.cs
System.ServiceModel.Syndication/SyndicationElementExtension.cs
System.ServiceModel.Syndication/SyndicationElementExtensionCollection.cs
System.ServiceModel.Syndication/SyndicationExtensions.cs
System.ServiceModel.Syndication/SyndicationFeed.cs
System.ServiceModel.Syndication/SyndicationFeedFormatter.cs
System.ServiceModel.Syndication/SyndicationItem.cs
System.ServiceModel.Syndication/SyndicationItemFormatter.cs
System.ServiceModel.Syndication/SyndicationLink.cs
System.ServiceModel.Syndication/SyndicationPerson.cs
System.ServiceModel.Syndication/SyndicationVersions.cs
System.ServiceModel.Syndication/TextSyndicationContent.cs
System.ServiceModel.Syndication/TextSyndicationContentKind.cs
System.ServiceModel.Syndication/UrlSyndicationContent.cs
System.ServiceModel.Syndication/Workspace.cs
System.ServiceModel.Syndication/XmlSyndicationContent.cs
@@ -1,3 +1,4 @@
#if !XAMMAC_4_5
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.Serialization;
@@ -187,3 +188,4 @@ namespace Mono.Xml.XPath
class Dummy {}
}
#endif
#endif
@@ -0,0 +1,69 @@
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.CompilerServices;
using System.ServiceModel.Channels;
using System.ServiceModel.Dispatcher;
using System.Text;
using System.Xml;
namespace System.ServiceModel
{
public class InstanceContext
{
public InstanceContext (object dummy) {}
}
}
namespace System.ServiceModel.PeerResolvers
{
class Dummy {}
}
namespace System.ServiceModel.Configuration
{
class Dummy {}
}
namespace System.ServiceModel.Channels.Http
{
}
namespace System.ServiceModel.Channels.NetTcp
{
}
namespace System.ServiceModel.Dispatcher
{
public sealed class EndpointDispatcher
{
internal EndpointDispatcher ()
{
}
}
}
namespace System.ServiceModel.Channels
{
public static class UrlUtility {
public static string UrlEncode (string s, Encoding e)
{
return System.Net.WebUtility.UrlEncode (s);
}
public static string UrlDecode (string s, Encoding e)
{
return System.Net.WebUtility.UrlDecode (s);
}
}
}
namespace System.ServiceModel.Description
{
public interface IPolicyExportExtension {}
public interface IPolicyImportExtension {}
public interface IWsdlExportExtension {}
public interface IWsdlImportExtension {}
}
namespace System.ServiceModel.Channels
{
public interface ITransportTokenAssertionProvider {}
}
+25 -2
View File
@@ -18,6 +18,10 @@ LIB_MCS_FLAGS = \
/r:System.Runtime.Serialization.dll \
$(RESOURCE_FILES:%=/resource:%)
ifdef XAMMAC_4_5
LIB_REFS += System.ServiceModel.Internals
endif
ifneq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += /d:NET_3_0 \
/r:System.Configuration.dll \
@@ -27,22 +31,41 @@ LIB_MCS_FLAGS += /d:NET_3_0 \
/r:System.IdentityModel.Selectors.dll \
/r:System.Transactions.dll \
/r:System.Messaging.dll \
/r:System.Web.dll \
/r:System.Web.Services.dll \
/r:Mono.Security.dll
ifdef XAMAMC_4_5
LIB_MCS_FLAGS += /r:System.Net.dll
endif
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += /r:System.Web.dll
endif
endif
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
LIB_MCS_FLAGS += /r:System.Web.ApplicationServices.dll
endif
ifndef NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
activation = $(the_libdir_base)System.ServiceModel.Activation.dll
servicemodel_deps = $(activation)
endif
ifneq (plainservice/,$(intermediate))
ifndef NO_SYSTEM_SERVICEMODEL_ACTIVATION_DEPENDENCY
LIB_MCS_FLAGS += -define:HAS_ACTIVATION -r:System.ServiceModel.Activation.dll
endif
ifndef NO_SYSTEM_WEB_APPSERVICES_DEPENDENCY
LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll
endif
endif
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
TEST_EXTRA_FILES = \
@@ -87,4 +110,4 @@ CLEAN_FILES = $(the_libdir_base)plainservice/System.ServiceModel.dll
ifndef intermediate
csproj-local:
$(MAKE) csproj-local intermediate=plainservice/
endif
endif
@@ -131,7 +131,7 @@ namespace System.ServiceModel.Channels
return new BinaryMessageEncoderFactory (this);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO]
void IWsdlExportExtension.ExportContract (WsdlExporter exporter,
WsdlContractConversionContext context)
@@ -137,7 +137,7 @@ namespace System.ServiceModel.Channels
OperationContext ctx = OperationContext.Current;
// FIXME: support more fault code depending on the exception type.
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
// FIXME: set correct fault reason.
if (ctx != null && ctx.EndpointDispatcher.ChannelDispatcher.IncludeExceptionDetailInFaults) {
ExceptionDetail detail = new ExceptionDetail (error);
@@ -185,7 +185,7 @@ namespace System.ServiceModel.Channels
return typeof (TChannel) == typeof (IRequestChannel);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public override bool CanBuildChannelListener<TChannel> (
BindingContext context)
{
@@ -201,7 +201,7 @@ namespace System.ServiceModel.Channels
return new HttpChannelFactory<TChannel> (this, context);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
internal static object ListenerBuildLock = new object ();
public override IChannelListener<TChannel> BuildChannelListener<TChannel> (
@@ -242,7 +242,7 @@ namespace System.ServiceModel.Channels
set { throw new NotImplementedException (); }
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
void IPolicyExportExtension.ExportPolicy (
MetadataExporter exporter,
PolicyConversionContext context)
@@ -68,7 +68,7 @@ namespace System.ServiceModel.Channels
return base.BuildChannelFactory <TChannel> (context);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO]
public override IChannelListener<TChannel>
BuildChannelListener<TChannel> (
@@ -83,7 +83,7 @@ namespace System.ServiceModel.Channels
return new HttpsTransportBindingElement (this);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public XmlElement GetTransportTokenAssertion ()
{
var doc = new XmlDocument ();
@@ -59,7 +59,7 @@ namespace System.ServiceModel.Channels
return ctx.GetInnerProperty<T> ();
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO]
protected virtual void OnImportPolicy (XmlElement assertion,
MessageVersion messageVersion,
@@ -99,7 +99,7 @@ namespace System.ServiceModel.Channels
throw new NotImplementedException ();
}
#if !MOBILE
#if !MOBILE && !XAMMAC_4_5
void IPolicyExportExtension.ExportPolicy (MetadataExporter exporter, PolicyConversionContext context)
{
throw new NotImplementedException ();
@@ -30,7 +30,7 @@ using System.Collections.ObjectModel;
using System.ServiceModel.Description;
using System.ServiceModel.Channels;
using System.ServiceModel.Security;
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
using System.ServiceModel.Channels.Security;
using System.IdentityModel.Selectors;
using System.IdentityModel.Tokens;
@@ -44,7 +44,7 @@ namespace System.ServiceModel.Channels
{
internal SecurityBindingElement ()
{
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
DefaultAlgorithmSuite = SecurityAlgorithmSuite.Default;
MessageSecurityVersion = MessageSecurityVersion.Default;
KeyEntropyMode = SecurityKeyEntropyMode.CombinedEntropy;
@@ -60,7 +60,7 @@ namespace System.ServiceModel.Channels
internal SecurityBindingElement (SecurityBindingElement other)
{
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
alg_suite = other.alg_suite;
key_entropy_mode = other.key_entropy_mode;
security_header_layout = other.security_header_layout;
@@ -79,7 +79,7 @@ namespace System.ServiceModel.Channels
LocalClientSettings = other.LocalClientSettings.Clone ();
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
SecurityAlgorithmSuite alg_suite;
SecurityKeyEntropyMode key_entropy_mode;
SecurityHeaderLayout security_header_layout;
@@ -93,7 +93,7 @@ namespace System.ServiceModel.Channels
public LocalClientSecuritySettings LocalClientSettings { get; private set; }
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public SecurityAlgorithmSuite DefaultAlgorithmSuite {
get { return alg_suite; }
set { alg_suite = value; }
@@ -138,7 +138,7 @@ namespace System.ServiceModel.Channels
[MonoTODO ("Implement for TransportSecurityBindingElement")]
public override bool CanBuildChannelFactory<TChannel> (BindingContext context)
{
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
// not sure this should be like this, but there isn't Symmetric/Asymmetric elements in 2.1 anyways.
return context.CanBuildInnerChannelFactory<TChannel> ();
#else
@@ -183,7 +183,7 @@ namespace System.ServiceModel.Channels
protected abstract IChannelFactory<TChannel>
BuildChannelFactoryCore<TChannel> (BindingContext context);
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO ("Implement for TransportSecurityBindingElement")]
public override bool CanBuildChannelListener<TChannel> (BindingContext context)
{
@@ -270,7 +270,7 @@ namespace System.ServiceModel.Channels
#endif
#region Factory methods
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public static SymmetricSecurityBindingElement
CreateAnonymousForCertificateBindingElement ()
{
@@ -559,14 +559,14 @@ namespace System.ServiceModel.Channels
CreateUserNameOverTransportBindingElement ()
{
var be = new TransportSecurityBindingElement ();
#if !NET_2_1 // FIXME: there should be whatever else to do for 2.1 instead.
#if !NET_2_1 && !XAMMAC_4_5 // FIXME: there should be whatever else to do for 2.1 instead.
be.EndpointSupportingTokenParameters.SignedEncrypted.Add (new UserNameSecurityTokenParameters ());
#endif
return be;
}
#endregion
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
// It seems almost internal, hardcoded like this (I tried
// custom parameters that sets IssuedTokenSecurityTokenParameters
// like below ones, but that didn't trigger this method).
@@ -143,7 +143,7 @@ namespace System.ServiceModel.Channels
return new TextMessageEncoderFactory (this);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO]
protected override void OnImportPolicy (XmlElement assertion,
MessageVersion messageVersion,
@@ -92,7 +92,7 @@ namespace System.ServiceModel.Channels
return context.GetInnerProperty<T> ();
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
internal static XmlElement CreateTransportBinding (XmlElement transportToken)
{
var doc = new XmlDocument ();
@@ -65,7 +65,7 @@ namespace System.ServiceModel.Channels
throw new NotImplementedException ();
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
[MonoTODO]
protected override IChannelListener<TChannel>
BuildChannelListenerCore<TChannel> (
@@ -35,7 +35,9 @@ using System.ServiceModel.Channels;
using System.ServiceModel.Configuration;
using System.ServiceModel.Description;
using System.ServiceModel.Dispatcher;
#if !XAMMAC_4_5
using System.Web.Configuration;
#endif
using SysConfig = System.Configuration.Configuration;
@@ -43,6 +45,7 @@ namespace System.ServiceModel.Configuration
{
internal static class ConfigUtil
{
#if !XAMMAC_4_5
static object GetSection (string name)
{
if (ServiceHostingEnvironment.InAspNet)
@@ -242,6 +245,7 @@ namespace System.ServiceModel.Configuration
{
return new EndpointAddress (el.Address, el.Identity != null ? el.Identity.CreateInstance () : null, el.Headers.Headers);
}
#endif
public static EndpointIdentity CreateInstance (this IdentityElement el)
{
@@ -299,6 +303,7 @@ namespace System.ServiceModel.Configuration
return CreateCertificateFrom (el.StoreLocation, el.StoreName, el.X509FindType, el.FindValue);
}
#if !XAMMAC_4_5
public static BindingCollectionElement FindCollectionElement (Binding binding, SysConfig config)
{
var section = (BindingsSection) config.GetSection ("system.serviceModel/bindings");
@@ -309,6 +314,7 @@ namespace System.ServiceModel.Configuration
return null;
}
#endif
}
enum NamedConfigCategory
@@ -40,7 +40,7 @@ using System.ServiceModel.Security.Tokens;
namespace System.ServiceModel.Description
{
public class ClientCredentials
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
: IEndpointBehavior
#else
: SecurityCredentialsManager, IEndpointBehavior
@@ -128,7 +128,7 @@ namespace System.ServiceModel.Description
return new ClientCredentials (this);
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public override SecurityTokenManager CreateSecurityTokenManager ()
{
return new ClientCredentialsSecurityTokenManager (this);
@@ -112,7 +112,7 @@ namespace System.ServiceModel.Description
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
//IWsdlExportExtension
void IWsdlExportExtension.ExportContract (WsdlExporter exporter,
@@ -100,7 +100,7 @@ namespace System.ServiceModel.Description
set { type = value; }
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
internal XsdDataContractImporter DataContractImporter { get; set; }
internal XmlSerializerMessageContractImporterInternal XmlSerializationImporter { get; set; }
internal System.CodeDom.CodeTypeReference CodeTypeReference { get; set; }
@@ -104,7 +104,7 @@ namespace System.ServiceModel.Description
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
void IWsdlExportExtension.ExportContract (
WsdlExporter exporter,
WsdlContractConversionContext context)
@@ -36,7 +36,7 @@ namespace System.ServiceModel.Diagnostics
{
public MessageLoggingSettings ()
{
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
var e = ConfigUtil.DiagnosticSection.MessageLogging;
LogEntireMessage = e.LogEntireMessage;
LogKnownPii = e.LogKnownPii;
@@ -214,7 +214,7 @@ namespace System.ServiceModel.Dispatcher
void ThrowIfOpened ()
{
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
// FIXME: get callback client runtime status when ChannelDispatcher is not available.
var state = Parent.ChannelDispatcher != null ? Parent.ChannelDispatcher.State : CommunicationState.Created; // Parent.CallbackClientRuntime.ChannelFactory.State;
switch (state) {
@@ -31,8 +31,10 @@ using System.Collections.ObjectModel;
using System.Reflection;
#if !NET_2_1
using System.IdentityModel.Policy;
#if !XAMMAC_4_5
using System.Web.Security;
#endif
#endif
using System.Text;
using System.Threading;
using System.ServiceModel;
@@ -43,7 +45,7 @@ namespace System.ServiceModel.Dispatcher
{
public sealed class DispatchRuntime
{
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
internal DispatchRuntime (EndpointDispatcher dispatcher, ClientRuntime callbackClientRuntime)
{
UnhandledDispatchOperation = new DispatchOperation (
@@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public BasicHttpBinding (string configurationName)
: this ()
{
@@ -110,7 +110,7 @@ namespace System.ServiceModel
SecurityBindingElement element;
switch (Security.Mode) {
case BasicHttpSecurityMode.Message:
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@@ -121,7 +121,7 @@ namespace System.ServiceModel
#endif
case BasicHttpSecurityMode.TransportWithMessageCredential:
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@@ -135,7 +135,7 @@ namespace System.ServiceModel
return null;
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
element.SetKeyDerivation (false);
element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
#endif
@@ -150,7 +150,7 @@ namespace System.ServiceModel
ReaderQuotas.CopyTo (tm.ReaderQuotas);
return tm;
} else {
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (
@@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public BasicHttpsBinding (string configurationName)
: this ()
{
@@ -101,7 +101,8 @@ namespace System.ServiceModel
SecurityBindingElement element;
switch (Security.Mode) {
case BasicHttpsSecurityMode.TransportWithMessageCredential:
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@@ -115,7 +116,7 @@ namespace System.ServiceModel
return null;
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
element.SetKeyDerivation (false);
element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
#endif
@@ -130,7 +131,7 @@ namespace System.ServiceModel
ReaderQuotas.CopyTo (tm.ReaderQuotas);
return tm;
} else {
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (
@@ -90,7 +90,7 @@ namespace System.ServiceModel
if (endpointConfig == null)
return;
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
try {
// It should automatically use XmlXapResolver
var cfg = new SilverlightClientConfigLoader ().Load (XmlReader.Create ("ServiceReferences.ClientConfig"));
@@ -160,7 +160,7 @@ namespace System.ServiceModel
#endif
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
private void ApplyBehavior (string behaviorConfig)
{
BehaviorsSection behaviorsSection = ConfigUtil.BehaviorsSection;
@@ -45,7 +45,7 @@ namespace System.ServiceModel
}
Message incoming_message;
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
EndpointDispatcher dispatcher;
#endif
IContextChannel channel;
@@ -83,7 +83,7 @@ namespace System.ServiceModel
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public EndpointDispatcher EndpointDispatcher {
get { return dispatcher; }
set { dispatcher = value; }
@@ -25,7 +25,8 @@
// 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_2_1
#if NET_2_1 || XAMMAC_4_5
using System;
using System.Collections.Generic;
using System.ServiceModel.Channels;
@@ -0,0 +1,64 @@
#include mobile_System.ServiceModel.dll.sources
System.ServiceModel.Channels/IChannelListener.cs
System.ServiceModel.Channels/IReplyChannel.cs
System.ServiceModel.Channels/IReplySessionChannel.cs
System.ServiceModel.Configuration/CertificateElement.cs
System.ServiceModel.Configuration/CertificateReferenceElement.cs
System.ServiceModel.Configuration/ConfigUtil.cs
System.ServiceModel.Configuration/DnsElement.cs
System.ServiceModel.Configuration/IdentityElement.cs
System.ServiceModel.Configuration/RsaElement.cs
System.ServiceModel.Configuration/ServicePrincipalNameElement.cs
System.ServiceModel.Configuration/UserPrincipalNameElement.cs
System.ServiceModel.Configuration/X509ClientCertificateCredentialsElement.cs
System.ServiceModel.Configuration/X509DefaultServiceCertificateElement.cs
System.ServiceModel.Configuration/X509ScopedServiceCertificateElement.cs
System.ServiceModel.Description/MetadataLocation.cs
System.ServiceModel.Description/MetadataReference.cs
System.ServiceModel.Description/MetadataSection.cs
System.ServiceModel.Description/MetadataSectionSerializerBase.cs
System.ServiceModel.Description/MetadataSet.cs
System.ServiceModel.Dispatcher/ActionMessageFilter.cs
System.ServiceModel.Dispatcher/ActionMessageFilterTable.cs
System.ServiceModel.Dispatcher/ICallContextInitializer.cs
System.ServiceModel.Dispatcher/IMessageFilterTable.cs
System.ServiceModel.Dispatcher/IOperationInvoker.cs
System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs
System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs
System.ServiceModel.Dispatcher/MessageFilter.cs
System.ServiceModel.Dispatcher/MessageFilterTable.cs
System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs
System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs
System.ServiceModel.Dispatcher/XPathMessageFilter.cs
System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs
System.ServiceModel.Security.Tokens/SslnegoCookieResolver.cs
System.ServiceModel.Security/ChannelProtectionRequirements.cs
System.ServiceModel.Security/IdentityVerifier.cs
System.ServiceModel.Security/IssuedTokenClientCredential.cs
System.ServiceModel.Security/KeyEntropyMode.cs
System.ServiceModel.Security/MessagePartSpecification.cs
System.ServiceModel.Security/PeerCredential.cs
System.ServiceModel.Security/ScopedMessagePartSpecification.cs
System.ServiceModel.Security/SecurityAlgorithmSuite.cs
System.ServiceModel.Security/SecurityContextKeyIdentifierClause.cs
System.ServiceModel.Security/SecurityMessageProperty.cs
System.ServiceModel.Security/SecurityStateEncoder.cs
System.ServiceModel.Security/SecurityTokenAttachmentMode.cs
System.ServiceModel.Security/SecurityTokenSpecification.cs
System.ServiceModel.Security/SupportingTokenSpecification.cs
System.ServiceModel.Security/X509CertificateInitiatorClientCredential.cs
System.ServiceModel.Security/X509CertificateRecipientClientCredential.cs
System.ServiceModel.Security/X509PeerCertificateAuthentication.cs
System.ServiceModel.Security/X509ServiceCertificateAuthentication.cs
System.ServiceModel/DnsEndpointIdentity.cs
System.ServiceModel/EndpointAddressAugust2004.cs
System.ServiceModel/EndpointIdentity.cs
System.ServiceModel/IDuplexClientChannel.cs
System.ServiceModel/OperationBehaviorAttribute.cs
System.ServiceModel/RsaEndpointIdentity.cs
System.ServiceModel/ServiceSecurityContext.cs
System.ServiceModel/SpnEndpointIdentity.cs
System.ServiceModel/UpnEndpointIdentity.cs
System.ServiceModel/X509CertificateEndpointIdentity.cs
System.ServiceModel.Dispatcher/IErrorHandler.cs
Dummy_XM_4_5.cs
+5 -2
View File
@@ -20,13 +20,16 @@ LIB_MCS_FLAGS = \
-r:System.dll \
-r:System.EnterpriseServices.dll \
-r:System.Xml.dll \
-r:System.Web.dll
ifndef NO_SYSTEM_WEB_DEPENDENCY
LIB_MCS_FLAGS += -r:System.Web.dll
plainweb_dir = $(the_libdir_base)plainweb
LOCAL_MCS_FLAGS = -lib:$(plainweb_dir)
plainweb = $(plainweb_dir)/System.Web.dll
system_web_services_deps = $(plainweb)
LOCAL_MCS_FLAGS += -lib:$(plainweb_dir)
endif
ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
LIB_MCS_FLAGS += \
@@ -53,4 +56,4 @@ $(the_libdir_base)$(LIBRARY): $(system_web_services_deps)
$(plainweb):
(cd ../System.Web; $(MAKE) $@)
.NOTPARALLEL: $(plainweb)
.NOTPARALLEL: $(plainweb)
@@ -71,7 +71,7 @@ namespace System.Web.Services.Description
RegisterExtensionType (typeof (Soap12HeaderBinding));
RegisterExtensionType (typeof (Soap12OperationBinding));
#if !MOBILE
#if !MOBILE && !XAMMAC_4_5
/*
* Currently, the mobile profile has not support for
* System.Configuration, so there are no external modules
@@ -164,7 +164,7 @@ namespace System.Web.Services.Description
/*
* The mobile profile lacks support for configuration
*/
#if MOBILE
#if MOBILE || XAMMAC_4_5
public static ArrayList BuildExtensionImporters ()
{
return new ArrayList (0);
@@ -142,7 +142,7 @@ namespace System.Web.Services.Description {
schemas.Add (serviceDescription.Types.Schemas);
}
#if !MOBILE
#if !MOBILE && !XAMMAC_4_5
public ServiceDescriptionImportWarnings Import (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)
{
foreach (ProtocolImporter importer in GetSupportedImporters ()) {
@@ -163,9 +163,6 @@ namespace System.Web.Services.Description {
list.Add (new HttpPostProtocolImporter ());
return list;
}
#endif
#if !MOBILE
[MonoTODO] // where to use Verbose and Extensions in options?
public static StringCollection GenerateWebReferences (
@@ -487,7 +487,7 @@ namespace System.Web.Services.Protocols {
xmlImporter.IncludeTypes (Type);
soapImporter.IncludeTypes (Type);
#if MOBILE
#if MOBILE || XAMMAC_4_5
SoapExtensions = new SoapExtensionRuntimeConfig [2][];
#else
SoapExtensions = SoapExtension.GetTypeExtensions (Type);
@@ -207,7 +207,7 @@ namespace System.Web.Services.Protocols
soap12Protocol.Initialize ();
}
return soap12Protocol;
#if !MOBILE
#if !MOBILE && !XAMMAC_4_5
case "HttpGet":
if (httpGetProtocol == null){
httpGetProtocol = new HttpGetTypeStubInfo (this);
@@ -100,7 +100,7 @@ namespace System.Web.Services.Protocols {
return pos;
}
#if !MOBILE
#if !MOBILE && !XAMMAC_4_5
static void InitializeGlobalExtensions ()
{
globalExtensions = new ArrayList[2];
@@ -0,0 +1,3 @@
#include mobile_System.Web.Services.dll.sources
System.Web.Services.Description/ServiceDescription.cs
System.Web.Services.Description/ServiceDescriptionImportWarnings.cs
@@ -35,7 +35,7 @@ using System.Collections.Generic;
using System.Configuration;
using System.IO;
using System.Text;
#if NET_4_0 && !MOBILE
#if !NO_SYSTEM_WEB_DEPENDENCY && NET_4_0 && !MOBILE
using System.Web.Configuration;
#endif
@@ -163,7 +163,7 @@ namespace System.Web.Util
static HttpEncoder GetCustomEncoderFromConfig ()
{
#if MOBILE
#if MOBILE || NO_SYSTEM_WEB_DEPENDENCY
return defaultEncoder.Value;
#else
var cfg = HttpRuntime.Section;
@@ -511,7 +511,7 @@ namespace System.Web {
if (value == null)
return null;
#if !MOBILE
#if !(MOBILE || NO_SYSTEM_WEB_DEPENDENCY)
IHtmlString htmlString = value as IHtmlString;
if (htmlString != null)
return htmlString.ToHtmlString ();
+9 -1
View File
@@ -1491,7 +1491,7 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
/*
* Try loading the module using a variety of names
*/
for (i = 0; i < 4; ++i) {
for (i = 0; i < 5; ++i) {
char *base_name = NULL, *dir_name = NULL;
gboolean is_absolute = is_absolute_path (new_scope);
@@ -1525,6 +1525,14 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
break;
}
continue;
case 3:
if (!is_absolute && mono_dl_get_system_dir ()) {
dir_name = mono_dl_get_system_dir ();
file_name = g_path_get_basename (new_scope);
base_name = NULL;
} else
continue;
break;
default:
#ifndef TARGET_WIN32
if (!g_ascii_strcasecmp ("user32.dll", new_scope) ||
+8 -7
View File
@@ -1167,24 +1167,25 @@ arch_emit_specific_trampoline_pages (MonoAotCompile *acfg)
guint8 *code;
guint8 *loop_start, *loop_branch_back, *loop_end_check, *imt_found_check;
int i;
int pagesize = MONO_AOT_TRAMP_PAGE_SIZE;
#define COMMON_TRAMP_SIZE 16
int count = (mono_pagesize () - COMMON_TRAMP_SIZE) / 8;
int count = (pagesize - COMMON_TRAMP_SIZE) / 8;
int imm8, rot_amount;
char symbol [128];
if (!acfg->aot_opts.use_trampolines_page)
return;
acfg->tramp_page_size = mono_pagesize ();
acfg->tramp_page_size = pagesize;
sprintf (symbol, "%sspecific_trampolines_page", acfg->user_symbol_prefix);
emit_alignment (acfg, mono_pagesize ());
emit_alignment (acfg, pagesize);
emit_global (acfg, symbol, TRUE);
emit_label (acfg, symbol);
/* emit the generic code first, the trampoline address + 8 is in the lr register */
code = buf;
imm8 = mono_arm_is_rotated_imm8 (mono_pagesize (), &rot_amount);
imm8 = mono_arm_is_rotated_imm8 (pagesize, &rot_amount);
ARM_SUB_REG_IMM (code, ARMREG_LR, ARMREG_LR, imm8, rot_amount);
ARM_LDR_IMM (code, ARMREG_R1, ARMREG_LR, -8);
ARM_LDR_IMM (code, ARMREG_PC, ARMREG_LR, -4);
@@ -1212,7 +1213,7 @@ arch_emit_specific_trampoline_pages (MonoAotCompile *acfg)
emit_global (acfg, symbol, TRUE);
emit_label (acfg, symbol);
code = buf;
imm8 = mono_arm_is_rotated_imm8 (mono_pagesize (), &rot_amount);
imm8 = mono_arm_is_rotated_imm8 (pagesize, &rot_amount);
ARM_SUB_REG_IMM (code, ARMREG_IP, ARMREG_IP, imm8, rot_amount);
ARM_LDR_IMM (code, MONO_ARCH_RGCTX_REG, ARMREG_IP, -8);
ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, -4);
@@ -1239,7 +1240,7 @@ arch_emit_specific_trampoline_pages (MonoAotCompile *acfg)
emit_label (acfg, symbol);
code = buf;
ARM_PUSH (code, (1 << ARMREG_R0) | (1 << ARMREG_R1) | (1 << ARMREG_R2) | (1 << ARMREG_R3));
imm8 = mono_arm_is_rotated_imm8 (mono_pagesize (), &rot_amount);
imm8 = mono_arm_is_rotated_imm8 (pagesize, &rot_amount);
ARM_SUB_REG_IMM (code, ARMREG_IP, ARMREG_IP, imm8, rot_amount);
ARM_LDR_IMM (code, ARMREG_R0, ARMREG_IP, -8);
ARM_LDR_IMM (code, ARMREG_PC, ARMREG_IP, -4);
@@ -1269,7 +1270,7 @@ arch_emit_specific_trampoline_pages (MonoAotCompile *acfg)
/* Need at least two free registers, plus a slot for storing the pc */
ARM_PUSH (code, (1 << ARMREG_R0)|(1 << ARMREG_R1)|(1 << ARMREG_R2));
imm8 = mono_arm_is_rotated_imm8 (mono_pagesize (), &rot_amount);
imm8 = mono_arm_is_rotated_imm8 (pagesize, &rot_amount);
ARM_SUB_REG_IMM (code, ARMREG_IP, ARMREG_IP, imm8, rot_amount);
ARM_LDR_IMM (code, ARMREG_R0, ARMREG_IP, -8);
+6 -7
View File
@@ -4596,16 +4596,15 @@ get_new_trampoline_from_page (int tramp_type)
return code;
}
mono_aot_page_unlock ();
psize = mono_pagesize ();
/* the trampoline template page is in the mscorlib module */
image = mono_defaults.corlib;
g_assert (image);
psize = MONO_AOT_TRAMP_PAGE_SIZE;
amodule = image->aot_module;
g_assert (amodule);
g_assert (amodule->info.tramp_page_size == psize);
if (tramp_type == MONO_AOT_TRAMP_SPECIFIC)
tpage = load_function (amodule, "specific_trampolines_page");
else if (tramp_type == MONO_AOT_TRAMP_STATIC_RGCTX)
@@ -4687,7 +4686,7 @@ get_new_specific_trampoline_from_page (gpointer tramp, gpointer arg)
code = get_new_trampoline_from_page (MONO_AOT_TRAMP_SPECIFIC);
data = (gpointer*)((char*)code - mono_pagesize ());
data = (gpointer*)((char*)code - MONO_AOT_TRAMP_PAGE_SIZE);
data [0] = arg;
data [1] = tramp;
/*g_warning ("new trampoline at %p for data %p, tramp %p (stored at %p)", code, arg, tramp, data);*/
@@ -4703,7 +4702,7 @@ get_new_rgctx_trampoline_from_page (gpointer tramp, gpointer arg)
code = get_new_trampoline_from_page (MONO_AOT_TRAMP_STATIC_RGCTX);
data = (gpointer*)((char*)code - mono_pagesize ());
data = (gpointer*)((char*)code - MONO_AOT_TRAMP_PAGE_SIZE);
data [0] = arg;
data [1] = tramp;
/*g_warning ("new rgctx trampoline at %p for data %p, tramp %p (stored at %p)", code, arg, tramp, data);*/
@@ -4719,7 +4718,7 @@ get_new_imt_trampoline_from_page (gpointer arg)
code = get_new_trampoline_from_page (MONO_AOT_TRAMP_IMT_THUNK);
data = (gpointer*)((char*)code - mono_pagesize ());
data = (gpointer*)((char*)code - MONO_AOT_TRAMP_PAGE_SIZE);
data [0] = arg;
/*g_warning ("new imt trampoline at %p for data %p, (stored at %p)", code, arg, data);*/
return code;
@@ -4734,7 +4733,7 @@ get_new_gsharedvt_arg_trampoline_from_page (gpointer tramp, gpointer arg)
code = get_new_trampoline_from_page (MONO_AOT_TRAMP_GSHAREDVT_ARG);
data = (gpointer*)((char*)code - mono_pagesize ());
data = (gpointer*)((char*)code - MONO_AOT_TRAMP_PAGE_SIZE);
data [0] = arg;
data [1] = tramp;
/*g_warning ("new rgctx trampoline at %p for data %p, tramp %p (stored at %p)", code, arg, tramp, data);*/
+2
View File
@@ -117,6 +117,8 @@
#define MONO_TYPE_IS_PRIMITIVE(t) ((!(t)->byref && ((((t)->type >= MONO_TYPE_BOOLEAN && (t)->type <= MONO_TYPE_R8) || ((t)->type >= MONO_TYPE_I && (t)->type <= MONO_TYPE_U)))))
#define MONO_AOT_TRAMP_PAGE_SIZE 16384
/* Constants used to encode different types of methods in AOT */
enum {
MONO_AOT_METHODREF_MIN = 240,
+11
View File
@@ -50,4 +50,15 @@ mono_dl_get_executable_path (char *buf, int buflen)
return -1;
}
const char*
mono_dl_get_system_dir (void)
{
#ifdef TARGET_IOS
/* IOS9 can't load system libraries using relative paths, i.e. 'libc' doesn't work, but '/usr/lib/libc' does. */
return "/usr/lib";
#else
return NULL;
#endif
}
#endif
+7
View File
@@ -47,6 +47,13 @@ mono_dl_get_executable_path (char *buf, int buflen)
{
return readlink ("/proc/self/exe", buf, buflen - 1);
}
const char*
mono_dl_get_system_dir (void)
{
return NULL;
}
#endif
void *
+6
View File
@@ -159,4 +159,10 @@ mono_dl_get_executable_path (char *buf, int buflen)
return -1; //TODO
}
const char*
mono_dl_get_system_dir (void)
{
return NULL;
}
#endif
+1 -1
View File
@@ -34,7 +34,6 @@ char* mono_dl_build_path (const char *directory, const char *name, void **
MonoDl* mono_dl_open_runtime_lib (const char *lib_name, int flags, char **error_msg) MONO_INTERNAL;
//Platform API for mono_dl
const char* mono_dl_get_so_prefix (void) MONO_INTERNAL;
const char** mono_dl_get_so_suffixes (void) MONO_INTERNAL;
void* mono_dl_open_file (const char *file, int flags) MONO_INTERNAL;
@@ -43,6 +42,7 @@ void* mono_dl_lookup_symbol (MonoDl *module, const char *name) MONO_INTERNAL;
int mono_dl_convert_flags (int flags) MONO_INTERNAL;
char* mono_dl_current_error_string (void) MONO_INTERNAL;
int mono_dl_get_executable_path (char *buf, int buflen) MONO_INTERNAL;
const char* mono_dl_get_system_dir (void);
#endif /* __MONO_UTILS_DL_H__ */
+1 -1
View File
@@ -47,7 +47,7 @@ build_profiles += monotouch monotouch_runtime
endif
if INSTALL_XAMMAC
build_profiles += xammac
build_profiles += xammac xammac_net_4_5
endif
test_profiles = $(build_profiles)