Author: kostat
Date: 2005-05-02 08:53:53 -0400 (Mon, 02 May 2005)
New Revision: 43878
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameter.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTable.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs
Log:
restore NET_2_0 ifdef
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data.Common {
public enum CatalogLocation
{
@@ -40,4 +40,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommand.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.ComponentModel;
using System.Data;
@@ -160,4 +160,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.ComponentModel;
using System.Data;
@@ -228,4 +228,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,6 +30,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
using System.ComponentModel;
using System.Data;
@@ -95,4 +96,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbConnection.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.ComponentModel;
using System.Data;
#if MONO_ONLY
@@ -138,3 +138,4 @@
}
}
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.Collections;
using System.Data;
@@ -119,3 +119,4 @@
}
}
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data.Common {
public abstract class DbDataSourceEnumerator
{
@@ -52,4 +52,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameter.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameter.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameter.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data.Common {
public abstract class DbParameter : MarshalByRefObject,
IDbDataParameter, IDataParameter
{
@@ -72,3 +72,4 @@
}
}
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.Collections;
using System.Runtime.InteropServices;
@@ -104,4 +104,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.Collections;
using System.Security;
using System.Security.Permissions;
@@ -118,4 +118,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -31,8 +31,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data.Common {
public enum DbProviderSupportedClasses
{
@@ -49,4 +49,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTable.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTable.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTable.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
using System.ComponentModel;
namespace System.Data.Common {
@@ -241,4 +241,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data.Common {
public abstract class DbTransaction : MarshalByRefObject,
IDbTransaction, IDisposable
{
@@ -70,4 +70,4 @@
}
}
-
+#endif
Modified:
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs
===================================================================
---
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs
2005-05-02 12:51:40 UTC (rev 43877)
+++
branches/Mainsoft.System.Data/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs
2005-05-02 12:53:53 UTC (rev 43878)
@@ -30,8 +30,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if NET_2_0 || TARGET_JVM
-
namespace System.Data.Common {
public enum SchemaLocation
{
@@ -40,4 +40,4 @@
}
}
-
+#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
