Imported Upstream version 4.0.0~alpha1

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

View File

@@ -38,7 +38,6 @@ using System.EnterpriseServices;
// General Information about the System.EnterpriseServices assembly
#if NET_2_0
[assembly: AssemblyTitle ("System.EnterpriseServices.dll")]
[assembly: AssemblyDescription ("System.EnterpriseServices.dll")]
[assembly: AssemblyDefaultAlias ("System.EnterpriseServices.dll")]
@@ -46,7 +45,6 @@ using System.EnterpriseServices;
[assembly: AssemblyCompany (Consts.MonoCompany)]
[assembly: AssemblyProduct (Consts.MonoProduct)]
[assembly: AssemblyCopyright (Consts.MonoCopyright)]
#endif
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]

View File

@@ -3,13 +3,9 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = System.EnterpriseServices.dll
LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /r:$(corlib)
LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /r:$(corlib) /r:System.Transactions.dll
NO_TEST = yes
ifneq (net_1_1, $(PROFILE))
LIB_MCS_FLAGS += /r:System.Transactions.dll
endif
EXTRA_DISTFILES = System.EnterpriseServices.Internal/ChangeLog
include ../../build/library.make

View File

@@ -29,9 +29,7 @@
//
using System;
#if NET_2_0
using System.Transactions;
#endif
namespace System.EnterpriseServices {
public sealed class ContextUtil {
@@ -104,12 +102,10 @@ namespace System.EnterpriseServices {
get { throw new NotImplementedException (); }
}
#if NET_2_0
public static Transaction SystemTransaction {
[MonoTODO]
get { throw new NotImplementedException (); }
}
#endif
public static Guid TransactionId {
[MonoTODO]
@@ -144,13 +140,11 @@ namespace System.EnterpriseServices {
throw new NotImplementedException ();
}
#if NET_2_0
[MonoTODO]
public static bool IsDefaultContext ()
{
throw new NotImplementedException ();
}
#endif
[MonoTODO]
public static void SetAbort ()
@@ -164,13 +158,11 @@ namespace System.EnterpriseServices {
throw new NotImplementedException ();
}
#if NET_2_0
[MonoTODO]
public static void SetNamedProperty (string name, object property)
{
throw new NotImplementedException ();
}
#endif
#endregion // Methods
}
}

View File

@@ -34,9 +34,7 @@ using System.Runtime.InteropServices;
namespace System.EnterpriseServices {
[Guid("0FB15084-AF41-11CE-BD2B-204C4F4F5020")]
[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
#if NET_2_0
[ComImport]
#endif
public interface ITransaction {
#region Methods

View File

@@ -49,7 +49,6 @@ namespace System.EnterpriseServices {
{
}
#if NET_2_0
public RegistrationException ()
: this ("Registration error")
{
@@ -59,7 +58,6 @@ namespace System.EnterpriseServices {
: base (msg, innerException)
{
}
#endif
#endregion // Constructors

View File

@@ -28,9 +28,7 @@
using System;
using System.Runtime.InteropServices;
#if NET_2_0
using System.Transactions;
#endif
namespace System.EnterpriseServices {
@@ -60,7 +58,6 @@ namespace System.EnterpriseServices {
}
}
#if NET_2_0
[MonoTODO]
public Transaction BringYourOwnSystemTransaction {
get {
@@ -70,7 +67,6 @@ namespace System.EnterpriseServices {
throw new NotImplementedException ();
}
}
#endif
[MonoTODO]
public ITransaction BringYourOwnTransaction {