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

4
mcs/class/System.Data/Assembly/AssemblyInfo.cs
View File

@@ -51,18 +51,14 @@ using System.Runtime.InteropServices;
[assembly: SatelliteContractVersion (Consts.FxVersion)]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
#if !TARGET_JVM
[assembly: CLSCompliant (true)]
#endif
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign (true)]
#if !TARGET_JVM
[assembly: AssemblyKeyFile("../ecma.pub")]
#endif
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]

8
mcs/class/System.Data/Makefile
View File

@@ -24,13 +24,6 @@ LIB_MCS_FLAGS = \
-r:System.Xml.dll \
ifeq (net_1_1_java, $(PROFILE))
OTHER_RES = $(RESOURCE_FILES)
LIB_MCS_FLAGS += \
-r:rt.dll \
-r:J2SE.Helpers.dll \
$(OTHER_LIB_MCS_FLAGS)
else
MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE))
ifdef MOBILE
LIB_MCS_FLAGS += \
@@ -42,7 +35,6 @@ LIB_MCS_FLAGS += \
-r:Mono.Data.Tds.dll \
$(OTHER_LIB_MCS_FLAGS)
endif
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Core.dll -r:Mono.Data.Sqlite.dll -nowarn:618,169,612,219,168

2
mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
View File

@@ -30,7 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
namespace System.Data.Common {
public enum CatalogLocation

2
mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
View File

@@ -30,7 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
using System.ComponentModel;
using System.Data;

4
mcs/class/System.Data/System.Data.Common/DbConnection.cs
View File

@@ -32,7 +32,7 @@
using System.ComponentModel;
using System.Data;
#if NET_2_0 && !TARGET_JVM
#if NET_2_0
using System.Transactions;
#endif
@@ -97,7 +97,7 @@ namespace System.Data.Common {
protected abstract DbCommand CreateDbCommand ();
#if NET_2_0 && !TARGET_JVM
#if NET_2_0
public virtual void EnlistTransaction (Transaction transaction)
{
throw new NotSupportedException ();

2
mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
View File

@@ -659,7 +659,7 @@ namespace System.Data.Common
}
RowUpdatingEventArgs argsUpdating = CreateRowUpdatingEvent (row, command, statementType, tableMapping);
row.RowError = null;
row.RowError = String.Empty;
OnRowUpdating (argsUpdating);
switch (argsUpdating.Status) {
case UpdateStatus.Continue :

2
mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs
View File

@@ -30,7 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
namespace System.Data.Common {
public abstract class DbDataSourceEnumerator

2
mcs/class/System.Data/System.Data.Common/DbParameter.cs
View File

@@ -30,7 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
using System.Collections;
using System.ComponentModel;

2
mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
View File

@@ -30,7 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
using System.Collections;
using System.ComponentModel;

4
mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs
View File

@@ -49,11 +49,7 @@ namespace System.Data.Common {
public static DbProviderFactory GetFactory (DataRow providerRow)
{
string assemblyType = (string) providerRow ["AssemblyQualifiedName"];
#if TARGET_JVM // case insensitive GetType is not supported
Type type = Type.GetType (assemblyType, false);
#else
Type type = Type.GetType (assemblyType, false, true);
#endif
if (type != null && type.IsSubclassOf (typeof (DbProviderFactory))) {
// Provider factories are singletons with Instance field having
// the sole instance

2
mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
View File

@@ -30,7 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
using System.Collections;
using System.Security;

212
mcs/class/System.Data/System.Data.Common/DbTable.cs
View File

@@ -30,215 +30,3 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if TARGET_JVM
using System.ComponentModel;
namespace System.Data.Common {
public abstract class DbTable : DataTable
{
#region Constructors
[MonoTODO]
protected DbTable (DbProviderFactory providerFactory)
{
}
#endregion // Constructors
#region Properties
[MonoTODO]
public ConflictOption ConflictOption {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DbConnection Connection {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DbCommand DeleteCommand {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DbCommand InsertCommand {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DbProviderFactory ProviderFactory {
get { throw new NotImplementedException (); }
}
[MonoTODO]
public bool ReturnProviderSpecificTypes {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DbCommand SelectCommand {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public override ISite Site {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DataTableMapping TableMapping {
get { throw new NotImplementedException (); }
}
[MonoTODO]
public int UpdateBatchSize {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
[MonoTODO]
public DbCommand UpdateCommand {
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
#endregion // Properties
#region Methods
[MonoTODO]
public DataRelation AddChildTable (string relationName, DbTable childTable, string parentColumnName, string childColumnName)
{
throw new NotImplementedException ();
}
[MonoTODO]
public DataRelation AddChildTable (string relationName, DbTable childTable, string[] parentColumnNames, string[] childColumnNames)
{
throw new NotImplementedException ();
}
[MonoTODO]
public override void BeginInit ()
{
throw new NotImplementedException ();
}
[MonoTODO]
protected virtual DbCommandBuilder CreateCommandBuilder (DbConnection connection)
{
throw new NotImplementedException ();
}
[MonoTODO]
protected override void Dispose (bool disposing)
{
throw new NotImplementedException ();
}
[MonoTODO]
public override void EndInit ()
{
throw new NotImplementedException ();
}
[MonoTODO]
public int Fill (object[] parameterValues)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int Fill (FillOptions options, object[] parameterValues)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int Fill (FillOptions options, DbTransaction transaction, object[] parameterValues)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int FillPage (int startRecord, int maxRecords, object[] parameterValues)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int FillPage (int startRecord, int maxRecords, FillOptions options, object[] parameterValues)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int FillPage (int startRecord, int maxRecords, FillOptions options, DbTransaction transaction, object[] parameterValues)
{
throw new NotImplementedException ();
}
[MonoTODO]
protected virtual string GenerateQuery (DbCommandBuilder cmdBuilder)
{
throw new NotImplementedException ();
}
[MonoTODO]
protected virtual string GenerateQueryForHierarchy (DbCommandBuilder builder, DataTable[] tableList)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int Update ()
{
throw new NotImplementedException ();
}
[MonoTODO]
public int Update (UpdateOptions updateOptions)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int Update (UpdateOptions updateOptions, DbTransaction transaction)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int UpdateRows (DataRow[] dataRows)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int UpdateRows (DataRow[] dataRows, UpdateOptions updateOptions)
{
throw new NotImplementedException ();
}
[MonoTODO]
public int UpdateRows (DataRow[] dataRows, UpdateOptions updateOptions, DbTransaction transaction)
{
throw new NotImplementedException ();
}
#endregion // Methods
}
}
#endif

2
mcs/class/System.Data/System.Data.Common/DbTransaction.cs
View File

@@ -28,7 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
namespace System.Data.Common
{

2
mcs/class/System.Data/System.Data.Odbc/OdbcConnection.cs
View File

@@ -37,7 +37,7 @@ using System.Data.Common;
using System.EnterpriseServices;
using System.Runtime.InteropServices;
using System.Text;
#if NET_2_0 && !TARGET_JVM
#if NET_2_0
using System.Transactions;
#endif

4
mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
View File

@@ -31,9 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !TARGET_JVM
using Mono.Data.Tds.Protocol;
#endif
using System;
using System.Xml;
using System.Text;
@@ -348,7 +346,6 @@ namespace System.Data.SqlTypes
return AdjustScale (n, -(n.Scale), false);
}
#if !TARGET_JVM
internal static SqlDecimal FromTdsBigDecimal (TdsBigDecimal x)
{
if (x == null)
@@ -356,7 +353,6 @@ namespace System.Data.SqlTypes
else
return new SqlDecimal (x.Precision, x.Scale, !x.IsNegative, x.Data);
}
#endif
public override int GetHashCode ()
{

2
mcs/class/System.Data/System.Data/ConflictOption.cs
View File

@@ -27,7 +27,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0 || TARGET_JVM
#if NET_2_0
namespace System.Data {
public enum ConflictOption

1
mcs/class/System.Data/System.Data/DataRow.cs
View File

@@ -96,6 +96,7 @@ namespace System.Data {
{
_table = table;
_rowId = rowId;
rowError = String.Empty;
}
#endregion // Constructors

2
mcs/class/System.Data/Test/System.Data.Common/DBDataPermissionAttributeTest.cs
View File

@@ -60,9 +60,7 @@ namespace MonoTests.System.Data.Common
public void Default ()
{
DBDataPermissionAttribute a = new NonAbstractDBDataPermissionAttribute (SecurityAction.Assert);
#if !TARGET_JVM
Assert.AreEqual (a.ToString (), a.TypeId.ToString (), "TypeId");
#endif
Assert.IsFalse (a.Unrestricted, "Unrestricted");
Assert.IsFalse (a.AllowBlankPassword, "AllowBlankPassword");
Assert.AreEqual (String.Empty, a.ConnectionString, "ConnectionString");

3
mcs/class/System.Data/Test/System.Data.Common/DataColumnMappingCollectionTest.cs
View File

@@ -376,9 +376,6 @@ namespace MonoTests.System.Data.Common
}
[Test]
#if TARGET_JVM
[Ignore ("Does not work with TARGET_JVM")]
#endif
public void ToStringTest()
{
Assert.AreEqual ("System.Data.Common.DataColumnMappingCollection", columnMapCollection.ToString(), "test1");

3
mcs/class/System.Data/Test/System.Data.Common/DataTableMappingCollectionTest.cs
View File

@@ -360,9 +360,6 @@ namespace MonoTests.System.Data.Common
}
[Test]
#if TARGET_JVM
[Ignore ("Does not work with TARGET_JVM")]
#endif
public void ToStringTest()
{
Assert.AreEqual("System.Data.Common.DataTableMappingCollection", tableMapCollection.ToString(), "test1");

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