diff options
| author | Martin Baulig <martin@novell.com> | 2004-04-23 06:24:02 +0400 |
|---|---|---|
| committer | Martin Baulig <martin@novell.com> | 2004-04-23 06:24:02 +0400 |
| commit | dfedf08d980d94226d3633164af1696343cbf717 (patch) | |
| tree | 0c821cc1e7c35951cb6cd047ac434461b4898c32 /mcs/class | |
| parent | 84ce456dd22c91479af29f81fd6125bfe196e26b (diff) | |
2004-04-22 Martin Baulig <martin@ximian.com>
Renamed the `NET_1_2' conditional to `NET_2_0' in all files.
svn path=/trunk/mcs/; revision=25877
Diffstat (limited to 'mcs/class')
527 files changed, 717 insertions, 713 deletions
diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog index 7ff34571819..19da04ab967 100644 --- a/mcs/class/ChangeLog +++ b/mcs/class/ChangeLog @@ -1,3 +1,7 @@ +2004-04-22 Martin Baulig <martin@ximian.com> + + Renamed the `NET_1_2' conditional to `NET_2_0' in all files. + 2004-03-31 Dick Porter <dick@ximian.com> * I18N/CJK/gb2312.table: diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog b/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog index b03148badfb..efc33ab9f97 100644 --- a/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog +++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/ChangeLog @@ -233,7 +233,7 @@ 2004-01-12 Atsushi Enomoto <atsushi@ximian.com> - * JSMethodInfo.cs : tiny fix for NET_1_2 build. + * JSMethodInfo.cs : tiny fix for NET_2_0 build. 2003-12-24 Cesar Lopez Nataren <cesar@ciencias.unam.mx> diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/JSMethodInfo.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/JSMethodInfo.cs index 28f083ba20e..e7cec1acf64 100644 --- a/mcs/class/Microsoft.JScript/Microsoft.JScript/JSMethodInfo.cs +++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/JSMethodInfo.cs @@ -44,7 +44,7 @@ namespace Microsoft.JScript.Tmp } -#if NET_1_2 +#if NET_2_0 public sealed override Type [] GetGenericArguments () { throw new NotImplementedException (); diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs index bb021131f1c..0d2114651f2 100644 --- a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs +++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs @@ -18,12 +18,12 @@ namespace Mono.Data.PostgreSqlClient { public sealed class PgSqlClientPermission : DBDataPermission { -#if NET_1_2 +#if NET_2_0 [Obsolete ("use PgSqlClientPermission(PermissionState.None)", true)] #endif [MonoTODO] public PgSqlClientPermission() -#if NET_1_2 +#if NET_2_0 : base (PermissionState.None) #endif { @@ -36,12 +36,12 @@ namespace Mono.Data.PostgreSqlClient { // FIXME: do constructor } -#if NET_1_2 +#if NET_2_0 [Obsolete ("use PgSqlClientPermission(PermissionState.None)", true)] #endif [MonoTODO] public PgSqlClientPermission(PermissionState state, bool allowBlankPassword) -#if NET_1_2 +#if NET_2_0 : base (PermissionState.None) #endif { diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybasePermission.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybasePermission.cs index 5a3aead77dc..5f5aa7580f7 100644 --- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybasePermission.cs +++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybasePermission.cs @@ -16,12 +16,12 @@ using System.Security.Permissions; namespace Mono.Data.SybaseClient { public sealed class SybasePermission : DBDataPermission { -#if NET_1_2 +#if NET_2_0 [Obsolete ("Use SybasePermission(PermissionState.None)", true)] #endif [MonoTODO] public SybasePermission () -#if NET_1_2 +#if NET_2_0 : base (PermissionState.None) #endif { @@ -35,12 +35,12 @@ namespace Mono.Data.SybaseClient { // FIXME: do constructor } -#if NET_1_2 +#if NET_2_0 [Obsolete ("Use SybasePermission(PermissionState.None)", true)] #endif [MonoTODO] public SybasePermission (PermissionState state, bool allowBlankPassword) -#if NET_1_2 +#if NET_2_0 : base (PermissionState.None) #endif { diff --git a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs index 19b38084105..d0562eec08d 100755 --- a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; #elif (NET_1_1) [assembly: AssemblyVersion ("1.0.5000.0")] [assembly: SatelliteContractVersion ("1.0.5000.0")] -#elif (NET_1_2) +#elif (NET_2_0) [assembly: AssemblyVersion ("1.2.3400.0")] [assembly: SatelliteContractVersion ("1.2.3400.0")] #endif diff --git a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs index df903422dc6..1b393e2655e 100755 --- a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; #elif (NET_1_1) [assembly: AssemblyVersion ("1.0.5000.0")] [assembly: SatelliteContractVersion ("1.0.5000.0")] -#elif (NET_1_2) +#elif (NET_2_0) [assembly: AssemblyVersion ("1.2.3400.0")] [assembly: SatelliteContractVersion ("1.2.3400.0")] #endif diff --git a/mcs/class/README b/mcs/class/README index edb4d0f65cc..fbb7a68a101 100644 --- a/mcs/class/README +++ b/mcs/class/README @@ -27,8 +27,8 @@ testing. * Supporting .NET 1.2, .NET 1.1 and .NET 1.0 builds - The defines NET_1_1 and NET_1_2 are used to include - features. When NET_1_2 is defined, it also implies that the + The defines NET_1_1 and NET_2_0 are used to include + features. When NET_2_0 is defined, it also implies that the NET_1_1 is defined. To have code which is only available in an old version, use ONLY_1_0, diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ASTQueryParser.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ASTQueryParser.cs index 82645b7edbf..01e685a1fea 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ASTQueryParser.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ASTQueryParser.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Axis.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Axis.cs index 1c3c56c1a26..737fe93caa6 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Axis.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Axis.cs @@ -7,7 +7,7 @@ // Tim Coleman (tim@timcoleman.com) // -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Binary.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Binary.cs index e95f3914195..d4f8cc73d62 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Binary.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Binary.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Conditional.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Conditional.cs index 089fb73fba4..92e0944c6f4 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Conditional.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Conditional.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Context.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Context.cs index 6f31c06db42..8f8b28b17e9 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Context.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Context.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Delegates.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Delegates.cs index 111a034c6cc..a7a51babe90 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Delegates.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Delegates.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Empty.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Empty.cs index 0171f4f4e2d..c22337e1c5e 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Empty.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Empty.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Enumerations.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Enumerations.cs index 65d6ea5f53e..24305392d3c 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Enumerations.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Enumerations.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Expression.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Expression.cs index 0f9c432926e..adfb43a8ca9 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Expression.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Expression.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Filter.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Filter.cs index 7a144a12877..24675369da1 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Filter.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Filter.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Function.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Function.cs index 075e178ee83..63e637ae515 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Function.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Function.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Literal.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Literal.cs index 832bfde6114..faf5761afb6 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Literal.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Literal.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OPath.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OPath.cs index 273d3dfd519..3bce317a0b2 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OPath.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OPath.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.ObjectSpaces.Schema; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectExpression.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectExpression.cs index 08ae911a0cd..910ba31d690 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectExpression.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectExpression.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.ObjectSpaces; using System.Data.ObjectSpaces.Schema; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectSpaceNode.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectSpaceNode.cs index f92c649a4cd..d4341f25426 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectSpaceNode.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/ObjectSpaceNode.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.ObjectSpaces.Query { public class ObjectSpaceNode : Expression diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderBy.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderBy.cs index 162542484aa..afe8d07bfad 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderBy.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderBy.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItem.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItem.cs index b0438d4253d..fb09208e4ea 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItem.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItem.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItemCollection.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItemCollection.cs index 8dc6c7cc95f..aa7829ca569 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItemCollection.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/OrderByItemCollection.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parameter.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parameter.cs index 42a4454311f..ac17eab04b4 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parameter.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parameter.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parent.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parent.cs index 7542a90dd5b..9a5bffd721f 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parent.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Parent.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Property.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Property.cs index 26ffd13b23c..14ae48d2776 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Property.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Property.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/RelTraversal.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/RelTraversal.cs index f0e447004b2..922eb75430b 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/RelTraversal.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/RelTraversal.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Span.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Span.cs index eaef599dac8..11debcef5c8 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Span.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Span.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanProperty.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanProperty.cs index 72711d6a55e..be8957192e8 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanProperty.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanProperty.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanPropertyCollection.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanPropertyCollection.cs index 68104b38595..ffcdb4e6f19 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanPropertyCollection.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/SpanPropertyCollection.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeCast.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeCast.cs index d05976d22a3..8ad4cf1db98 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeCast.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeCast.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeConversion.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeConversion.cs index be033f0300d..7eed37f1625 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeConversion.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeConversion.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeFilter.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeFilter.cs index b9bafa471e1..f538513548e 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeFilter.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/TypeFilter.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Unary.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Unary.cs index f3722cf239a..f4d8da153e7 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Unary.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Query/Unary.cs @@ -6,7 +6,7 @@ // Richard Thombs (stony@stony.org) // -#if NET_1_2 +#if NET_2_0 using System; using System.Xml; diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedProperty.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedProperty.cs index a182019c982..23aab8e2a88 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedProperty.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedProperty.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Xml;
@@ -60,4 +60,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedPropertyCollection.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedPropertyCollection.cs index 5584b2be979..51c74ceaaaf 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedPropertyCollection.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ExtendedPropertyCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Xml;
@@ -123,4 +123,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationship.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationship.cs index 84fe8d5e2c4..fc9d27d3eb5 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationship.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationship.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.Mapping;
@@ -121,4 +121,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipCollection.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipCollection.cs index f1921d27e01..7cc45bde87d 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipCollection.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
@@ -83,4 +83,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipType.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipType.cs index 2de3e47f1e3..b72c0a573f5 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipType.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectRelationshipType.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces.Schema {
public enum ObjectRelationshipType
@@ -18,4 +18,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectSchema.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectSchema.cs index e5f45a2ec28..091ee2c2b74 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectSchema.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/ObjectSchema.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.Mapping;
using System.IO;
@@ -283,4 +283,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClass.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClass.cs index 781521624ac..bc047b30fbd 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClass.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClass.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.Mapping;
using System.Xml;
@@ -88,4 +88,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClassCollection.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClassCollection.cs index 14410404048..ea9e480510b 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClassCollection.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaClassCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
@@ -75,4 +75,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMember.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMember.cs index 2b06139f271..1e43fe1927c 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMember.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMember.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.Mapping;
using System.Reflection;
@@ -109,4 +109,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMemberCollection.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMemberCollection.cs index 5f78c8574f2..5599264f49d 100644 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMemberCollection.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces.Schema/SchemaMemberCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
@@ -75,4 +75,4 @@ namespace System.Data.ObjectSpaces.Schema { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ASTBaseParser.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ASTBaseParser.cs index 514647d0f71..675898e2d36 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ASTBaseParser.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ASTBaseParser.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
using System.Data.ObjectSpaces.Query;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/AstKeywords.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/AstKeywords.cs index 36b88163638..412ec2189aa 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/AstKeywords.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/AstKeywords.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CommonObjectContext.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CommonObjectContext.cs index ed85f9d12fc..d31618026fd 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CommonObjectContext.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CommonObjectContext.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Data.ObjectSpaces.Schema;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CompiledQuery.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CompiledQuery.cs index 5fc64072482..7ecc9d927f2 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CompiledQuery.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/CompiledQuery.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ContextException.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ContextException.cs index 16d595af61f..3d2164ec51a 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ContextException.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ContextException.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
using System.Globalization;
using System.Runtime.Serialization;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DbObjectReader.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DbObjectReader.cs index d4567ffafcf..1a62c7b1fad 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DbObjectReader.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DbObjectReader.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
using System.Data;
using System.Data.Mapping;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/Depth.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/Depth.cs index 89a9b7f064d..030f74f8d52 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/Depth.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/Depth.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DynamicAssembly.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DynamicAssembly.cs index c73089a0653..e88e733132d 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DynamicAssembly.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/DynamicAssembly.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
using System.Data.Mapping;
using System.Reflection;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectHelper.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectHelper.cs index facddcaabef..aee6be23bba 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectHelper.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectHelper.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectNotification.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectNotification.cs index 71e2d7279f3..746e9eeb71e 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectNotification.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/IObjectNotification.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/InitialState.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/InitialState.cs index 7deda4ec91d..d2cea0613cc 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/InitialState.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/InitialState.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/KeyGenerator.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/KeyGenerator.cs index f5dbb194365..ec7b41345ef 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/KeyGenerator.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/KeyGenerator.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToManyRelationship.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToManyRelationship.cs index 7e9df59656a..e46ebf9d0cc 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToManyRelationship.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToManyRelationship.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToOneRelationship.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToOneRelationship.cs index 9773a45a669..72a274221ef 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToOneRelationship.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ManyToOneRelationship.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectContext.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectContext.cs index 9bcb6714b90..ee890e524b2 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectContext.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectContext.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectEngine.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectEngine.cs index 51478172b78..4ebb154bd18 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectEngine.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectEngine.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Data.Mapping;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectException.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectException.cs index 47a6bf62e32..d051bac7aff 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectException.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Globalization;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectHolder.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectHolder.cs index 9f5521095fc..5e88c02e427 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectHolder.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectHolder.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKey.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKey.cs index 1164e2f42eb..f27eaab09f5 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKey.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKey.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKeyManager.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKeyManager.cs index ebde85c0b00..4a6584a47d3 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKeyManager.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectKeyManager.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces {
public abstract class ObjectKeyManager
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectList.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectList.cs index 7ba921441b7..d2b12576ab9 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectList.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectList.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Reflection;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectQuery.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectQuery.cs index 66b34718adc..85a6d3414c6 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectQuery.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectQuery.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectReader.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectReader.cs index 734ce92b2b6..0fa1edbe920 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectReader.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectReader.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSet.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSet.cs index 07afafdcd5a..047c01d1135 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSet.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.ComponentModel;
@@ -146,4 +146,4 @@ namespace System.Data.ObjectSpaces }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSources.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSources.cs index 670c04c64b2..3ae40a903e7 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSources.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSources.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSpace.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSpace.cs index dfa1b850d5f..872e7d30be5 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSpace.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectSpace.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Data;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectState.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectState.cs index d5b0d598093..b6ce087fd8c 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectState.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ObjectState.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToManyRelationship.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToManyRelationship.cs index 06ea05c2079..7792c06189d 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToManyRelationship.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToManyRelationship.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToOneRelationship.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToOneRelationship.cs index 754490bfac2..99b30da7225 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToOneRelationship.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/OneToOneRelationship.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces {
public class OneToOneRelationship : ObjectKeyManager
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceError.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceError.cs index c113e589b0d..3fad0342cd6 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceError.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceError.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces {
public class PersistenceError
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorBehavior.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorBehavior.cs index 255201c9752..700b902d74e 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorBehavior.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorBehavior.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorType.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorType.cs index d87e7a5bc0a..217bfd1a951 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorType.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceErrorType.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceException.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceException.cs index faf48b97508..b7e0ce334bf 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceException.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Runtime.Serialization;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceOptions.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceOptions.cs index b78b12f844f..1a24acb05a5 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceOptions.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/PersistenceOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003-2004
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces {
public class PersistenceOptions
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/UpdateErrorType.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/UpdateErrorType.cs index 50ef4a0a449..7100f65c07e 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/UpdateErrorType.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/UpdateErrorType.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecord.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecord.cs index b860d8d4c9f..ba2c87ec7f9 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecord.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecord.cs @@ -6,7 +6,7 @@ //
// (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventArgs.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventArgs.cs index 77969a40387..0be3fe978dd 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventArgs.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventArgs.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventHandler.cs b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventHandler.cs index 37a3c595b97..fb312853d10 100755 --- a/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventHandler.cs +++ b/mcs/class/System.Data.ObjectSpaces/System.Data.ObjectSpaces/ValueRecordMergeEventHandler.cs @@ -7,7 +7,7 @@ // (C) BLiNK Software Ltd. http://www.blinksoftware.co.uk
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.ObjectSpaces
{
diff --git a/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces.Query/ObjectExpressionTests.cs b/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces.Query/ObjectExpressionTests.cs index 3e2ddc52090..0c81e2bdd4e 100755 --- a/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces.Query/ObjectExpressionTests.cs +++ b/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces.Query/ObjectExpressionTests.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Data.ObjectSpaces;
diff --git a/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces/CommonObjectContextTests.cs b/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces/CommonObjectContextTests.cs index 880e88e208a..a383a08b620 100755 --- a/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces/CommonObjectContextTests.cs +++ b/mcs/class/System.Data.ObjectSpaces/Test/System.Data.ObjectSpaces/CommonObjectContextTests.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Data.ObjectSpaces;
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Condition.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Condition.cs index ad1bdf595e7..f2d9768d6f5 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Condition.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Condition.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -55,4 +55,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/ConditionCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/ConditionCollection.cs index cb36ce9a111..f895140b053 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/ConditionCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/ConditionCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSource.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSource.cs index ee2215457fa..214e7777f88 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSource.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSource.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -65,4 +65,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSourceCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSourceCollection.cs index 68dbda291fa..0138d952b4d 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSourceCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/DataSourceCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Data.SqlXml;
@@ -47,4 +47,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Field.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Field.cs index 5fe03398d20..80baf360edc 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Field.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Field.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -35,4 +35,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldCollection.cs index c1e72a2694f..4c1b6ce022a 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoin.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoin.cs index bf10c132aa7..49cfdc6c524 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoin.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoin.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -45,4 +45,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoinCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoinCollection.cs index 3feb404d742..41f41d82cdd 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoinCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldJoinCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMap.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMap.cs index 1e19db9fddf..b77e3ecbc0a 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMap.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMap.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -80,4 +80,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMapCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMapCollection.cs index e3eecc361b0..1871d152406 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMapCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/FieldMapCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainConstraint.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainConstraint.cs index 37935ef8112..890048e0ca7 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainConstraint.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainConstraint.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public interface IDomainConstraint
@@ -25,4 +25,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainField.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainField.cs index 7830bf14bc4..74abc0dab0a 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainField.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainField.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public interface IDomainField
@@ -21,4 +21,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoin.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoin.cs index b744925461d..3a9bff8d29c 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoin.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoin.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public interface IDomainFieldJoin
@@ -21,4 +21,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoinCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoinCollection.cs index 3dbd02f88ea..f24b95ae0d3 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoinCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainFieldJoinCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public interface IDomainFieldJoinCollection
@@ -28,4 +28,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainSchema.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainSchema.cs index 10e294323ff..e26bd182fc2 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainSchema.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainSchema.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.IO;
using System.Xml;
@@ -47,4 +47,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainStructure.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainStructure.cs index 2145baf4757..e5e9ab78d81 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainStructure.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/IDomainStructure.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Xml;
@@ -29,4 +29,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Map.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Map.cs index da184e17ce8..23dfa253efb 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Map.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Map.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -60,4 +60,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MapCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MapCollection.cs index 9a7166a2e6d..0994e430c15 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MapCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MapCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingAccess.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingAccess.cs index 5810fba7047..0bc757b054a 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingAccess.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingAccess.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public enum MappingAccess
@@ -18,4 +18,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingArgumentType.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingArgumentType.cs index f14fa055cd1..b1a393b6c49 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingArgumentType.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingArgumentType.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public enum MappingArgumentType
@@ -20,4 +20,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingConditionOperator.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingConditionOperator.cs index 916df9e3f0f..609213d0fe7 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingConditionOperator.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingConditionOperator.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public enum MappingConditionOperator
@@ -25,4 +25,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDataSourceType.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDataSourceType.cs index c26a18a75a2..b6dfcdbb38c 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDataSourceType.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDataSourceType.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public enum MappingDataSourceType
@@ -18,4 +18,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDirection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDirection.cs index 042c4e8c75a..700c789161a 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDirection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingDirection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.Mapping {
public enum MappingDirection
@@ -17,4 +17,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameter.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameter.cs index 4cbfa41a168..a466024d7e0 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameter.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameter.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Xml.Schema;
@@ -46,4 +46,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameterCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameterCollection.cs index f86f35b9da5..1aee05a4c04 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameterCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingParameterCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingSchema.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingSchema.cs index faae23b12e1..3ba9aaed0ca 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingSchema.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/MappingSchema.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.IO;
@@ -171,4 +171,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Relationship.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Relationship.cs index d4670c935f0..9284cc9f8f2 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Relationship.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Relationship.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -65,4 +65,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipCollection.cs index 72a50e2aec3..d5523bbdeda 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMap.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMap.cs index 4f1029f8a25..bffc05e56b7 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMap.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMap.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -40,4 +40,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMapCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMapCollection.cs index 2d73b17d612..af293c131a5 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMapCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/RelationshipMapCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Variable.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Variable.cs index e577b46877e..ee9d38cf03b 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/Variable.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/Variable.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -50,4 +50,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.Mapping/VariableCollection.cs b/mcs/class/System.Data.SqlXml/System.Data.Mapping/VariableCollection.cs index 4af7089a4c1..19e9b6a50f3 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.Mapping/VariableCollection.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.Mapping/VariableCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
using System.Collections;
@@ -42,4 +42,4 @@ namespace System.Data.Mapping { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObject.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObject.cs index ca7921a9d91..7a2ef1cf90a 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObject.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObject.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data;
using System.IO;
@@ -89,4 +89,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObjectException.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObjectException.cs index 34a88197657..ae8c4c07fe2 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObjectException.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/DBObjectException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Runtime.Serialization;
@@ -60,4 +60,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/FillStatus.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/FillStatus.cs index 4736b24cd80..2113df97ed8 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/FillStatus.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/FillStatus.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Data.SqlXml {
public enum FillStatus
@@ -18,4 +18,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFilledEventArgs.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFilledEventArgs.cs index 39fc1d89da1..fe981022786 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFilledEventArgs.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFilledEventArgs.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
@@ -51,4 +51,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFillingEventArgs.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFillingEventArgs.cs index b4f07a19f04..4ce76f4ef11 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFillingEventArgs.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/RowFillingEventArgs.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
@@ -51,4 +51,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoad.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoad.cs index 639907634b0..196853d4b60 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoad.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoad.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data;
using System.Data.Mapping;
@@ -98,4 +98,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoadException.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoadException.cs index a1e4158be3d..f94ebd0d3d0 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoadException.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlBulkLoadException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Runtime.Serialization;
@@ -60,4 +60,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapter.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapter.cs index 325f03bf9ac..5a90d41be15 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapter.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapter.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.Mapping;
using System.Xml;
@@ -81,4 +81,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapterException.cs b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapterException.cs index bfc6ac8c77f..58a573fa3f0 100755 --- a/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapterException.cs +++ b/mcs/class/System.Data.SqlXml/System.Data.SqlXml/XmlRowsetAdapterException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Runtime.Serialization;
@@ -60,4 +60,4 @@ namespace System.Data.SqlXml { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryOptions.cs b/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryOptions.cs index 6405844d725..81e730db9e9 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryOptions.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data.SqlXml;
@@ -40,4 +40,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryPlan.cs b/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryPlan.cs index 2f030ca9efa..d159bef0867 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryPlan.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml.Query/SqlQueryPlan.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
namespace System.Xml.Query {
public enum SqlQueryPlan
@@ -18,4 +18,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryProcessor.cs b/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryProcessor.cs index 5ec1615377f..ee18ee4e611 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryProcessor.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryProcessor.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Data;
using System.Data.SqlXml;
@@ -102,4 +102,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchema.cs b/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchema.cs index aca3ec754c8..2e5e1b1d1b7 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchema.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchema.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Data.SqlXml;
@@ -32,4 +32,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchemaDictionary.cs b/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchemaDictionary.cs index a4c674716bf..f07cf9dd453 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchemaDictionary.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml.Query/XmlViewSchemaDictionary.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Data.Mapping;
@@ -167,4 +167,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.Data.SqlXml/System.Xml/UpdateEventHandler.cs b/mcs/class/System.Data.SqlXml/System.Xml/UpdateEventHandler.cs index c6458709292..969c637335b 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml/UpdateEventHandler.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml/UpdateEventHandler.cs @@ -6,7 +6,7 @@ // // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { public delegate void UpdateEventHandler (object sender, XmlUpdateEventArgs e); diff --git a/mcs/class/System.Data.SqlXml/System.Xml/XmlAdapter.cs b/mcs/class/System.Data.SqlXml/System.Xml/XmlAdapter.cs index 44518b7e761..da07cc1371a 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml/XmlAdapter.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml/XmlAdapter.cs @@ -6,7 +6,7 @@ // // (C)2003 Novell inc. // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data.SqlXml/System.Xml/XmlDataSourceResolver.cs b/mcs/class/System.Data.SqlXml/System.Xml/XmlDataSourceResolver.cs index 481b57dc1c5..07809c18e8c 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml/XmlDataSourceResolver.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml/XmlDataSourceResolver.cs @@ -6,7 +6,7 @@ // // (C)2003 Novell inc. // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data.SqlXml/System.Xml/XmlUpdateEventArgs.cs b/mcs/class/System.Data.SqlXml/System.Xml/XmlUpdateEventArgs.cs index ebec93cc16f..bd4303436ab 100755 --- a/mcs/class/System.Data.SqlXml/System.Xml/XmlUpdateEventArgs.cs +++ b/mcs/class/System.Data.SqlXml/System.Xml/XmlUpdateEventArgs.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog index 304f4c1752f..7afbd2aca9b 100644 --- a/mcs/class/System.Data/ChangeLog +++ b/mcs/class/System.Data/ChangeLog @@ -66,7 +66,7 @@ 2003-11-26 Tim Coleman <tim@timcoleman.com> * System.Data.dll.sources: - Add many new System.Data classes for NET_1_2 build. + Add many new System.Data classes for NET_2_0 build. 2003-11-25 Tim Coleman <tim@timcoleman.com> * System.Data.dll.sources: diff --git a/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs b/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs index b71c8085bd3..82097e49da3 100644 --- a/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs +++ b/mcs/class/System.Data/System.Data.Common/CatalogLocation.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum CatalogLocation diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs index 127edaa46a7..512fdd65b4d 100644 --- a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs +++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs @@ -27,7 +27,7 @@ namespace System.Data.Common private MissingSchemaAction missingSchemaAction; private DataTableMappingCollection tableMappings; -#if NET_1_2 +#if NET_2_0 private bool acceptChangesDuringUpdate; private LoadOption fillLoadOption; private bool returnProviderSpecificTypes; @@ -58,7 +58,7 @@ namespace System.Data.Common set { acceptChangesDuringFill = value; } } -#if NET_1_2 +#if NET_2_0 public bool AcceptChangesDuringUpdate { get { return acceptChangesDuringUpdate; } set { acceptChangesDuringUpdate = value; } @@ -73,7 +73,7 @@ namespace System.Data.Common set { continueUpdateOnError = value; } } -#if NET_1_2 +#if NET_2_0 public LoadOption FillLoadOption { get { return fillLoadOption; } set { fillLoadOption = value; } @@ -100,7 +100,7 @@ namespace System.Data.Common set { missingSchemaAction = value; } } -#if NET_1_2 +#if NET_2_0 public virtual bool ReturnProviderSpecificTypes { get { return returnProviderSpecificTypes; } set { returnProviderSpecificTypes = value; } @@ -118,7 +118,7 @@ namespace System.Data.Common #region Events -#if NET_1_2 +#if NET_2_0 public event FillErrorEventHandler FillError; #endif @@ -149,7 +149,7 @@ namespace System.Data.Common public abstract int Fill (DataSet dataSet); -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual int Fill (DataTable dataTable, IDataReader dataReader) { @@ -183,7 +183,7 @@ namespace System.Data.Common public abstract DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType); -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual DataTable FillSchema (DataTable dataTable, SchemaType schemaType, IDataReader dataReader) { @@ -199,7 +199,7 @@ namespace System.Data.Common public abstract IDataParameter[] GetFillParameters (); -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected bool HasTableMappings () { diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs index e1204ba7939..b1bcc68641b 100644 --- a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs +++ b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs @@ -71,7 +71,7 @@ namespace System.Data.Common { return new DataColumn (dataSetColumn, dataType); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public static DataColumn GetDataColumnBySchemaAction (string sourceColumn, string dataSetColumn, DataTable dataTable, Type dataType, MissingSchemaAction schemaAction) { diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs index 0f89115a21c..7d9111842a0 100644 --- a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs +++ b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs @@ -122,7 +122,7 @@ namespace System.Data.Common { return mapping; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void AddRange (Array values) { @@ -173,7 +173,7 @@ namespace System.Data.Common { return new DataColumnMapping (sourceColumn, sourceColumn); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public static DataColumn GetDataColumn (DataColumnMappingCollection columnMappings, string sourceColumn, Type dataType, DataTable dataTable, MissingMappingAction mappingAction, MissingSchemaAction schemaAction) { diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs index cadf2dc8dab..1990228d835 100644 --- a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs +++ b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs @@ -84,7 +84,7 @@ namespace System.Data.Common { return DataColumnMappingCollection.GetColumnMappingBySchemaAction (columnMappings, sourceColumn, mappingAction); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataColumn GetDataColumn (string sourceColumn, Type dataType, DataTable dataTable, MissingMappingAction mappingAction, MissingSchemaAction schemaAction) { diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs index 675580968e9..0df6d9b098b 100644 --- a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs +++ b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs @@ -122,7 +122,7 @@ namespace System.Data.Common { return mapping; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void AddRange (Array values) { diff --git a/mcs/class/System.Data/System.Data.Common/DbCommand.cs b/mcs/class/System.Data/System.Data.Common/DbCommand.cs index 4bd058ce304..21eea6f94b5 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommand.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs index 58cda0aab23..24bc9dd9953 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs b/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs index 97493e5bbaf..42e64e224b6 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommandOptionalFeatures.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum DbCommandOptionalFeatures diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs b/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs index 9318cb7fcf3..22cd6f423a3 100644 --- a/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs +++ b/mcs/class/System.Data/System.Data.Common/DbCommandSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbConnection.cs b/mcs/class/System.Data/System.Data.Common/DbConnection.cs index 91f046e1c91..2f95e67458b 100644 --- a/mcs/class/System.Data/System.Data.Common/DbConnection.cs +++ b/mcs/class/System.Data/System.Data.Common/DbConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; using System.Data; diff --git a/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs b/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs index 606927c0be5..9483693aa1f 100644 --- a/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs +++ b/mcs/class/System.Data/System.Data.Common/DbConnectionString.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; diff --git a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs index 8ba194e61ed..ed947af38aa 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs @@ -35,7 +35,7 @@ namespace System.Data.Common { #region Properties -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual IDbConnection BaseConnection { get { throw new NotImplementedException (); } @@ -52,7 +52,7 @@ namespace System.Data.Common { get { return ((IDbDataAdapter) this).DeleteCommand; } } -#if NET_1_2 +#if NET_2_0 protected internal CommandBehavior FillCommandBehavior { get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } @@ -63,7 +63,7 @@ namespace System.Data.Common { get { return ((IDbDataAdapter) this).InsertCommand; } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual IDbCommand this [[Optional] StatementType statementType] { get { throw new NotImplementedException (); } @@ -79,7 +79,7 @@ namespace System.Data.Common { get { return ((IDbDataAdapter) this).SelectCommand; } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public IDbTransaction Transaction { get { throw new NotImplementedException (); } @@ -112,7 +112,7 @@ namespace System.Data.Common { #region Methods -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual void BeginInit () { @@ -154,7 +154,7 @@ namespace System.Data.Common { } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual void EndInit () { @@ -180,7 +180,7 @@ namespace System.Data.Common { return Fill (dataSet, 0, 0, srcTable, SelectCommand, CommandBehavior.Default); } -#if NET_1_2 +#if NET_2_0 protected override int Fill (DataTable dataTable, IDataReader dataReader) #else protected virtual int Fill (DataTable dataTable, IDataReader dataReader) @@ -218,7 +218,7 @@ namespace System.Data.Common { return Fill (dataTable, command.ExecuteReader (commandBehavior)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public int Fill (int startRecord, int maxRecords, DataTable[] dataTables) { @@ -231,7 +231,7 @@ namespace System.Data.Common { return this.Fill (dataSet, startRecord, maxRecords, srcTable, SelectCommand, CommandBehavior.Default); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected virtual int Fill (DataTable[] dataTables, int startRecord, int maxRecords, IDbCommand command, CommandBehavior behavior) { @@ -239,7 +239,7 @@ namespace System.Data.Common { } #endif -#if NET_1_2 +#if NET_2_0 protected override int Fill (DataSet dataSet, string srcTable, IDataReader dataReader, int startRecord, int maxRecords) #else protected virtual int Fill (DataSet dataSet, string srcTable, IDataReader dataReader, int startRecord, int maxRecords) @@ -412,7 +412,7 @@ namespace System.Data.Common { return (DataTable[]) output.ToArray (typeof (DataTable)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataSet GetDataSet () { diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs index 57d953e2abd..0c98c455b7c 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs @@ -26,7 +26,7 @@ namespace System.Data.Common { #region Constructors -#if NET_1_2 +#if NET_2_0 [Obsolete ("use DBDataPermission (PermissionState.None)", true)] #endif protected DBDataPermission () @@ -34,7 +34,7 @@ namespace System.Data.Common { { } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected DBDataPermission (DbConnectionString constr) { @@ -46,7 +46,7 @@ namespace System.Data.Common { { } -#if NET_1_2 +#if NET_2_0 [Obsolete ("use DBDataPermission (PermissionState.None)", true)] #endif public DBDataPermission (PermissionState state, bool allowBlankPassword) @@ -86,7 +86,7 @@ namespace System.Data.Common { } #endif -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected void AddConnectionString (DbConnectionString constr) { @@ -130,7 +130,7 @@ namespace System.Data.Common { return (state == PermissionState.Unrestricted); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] protected void SetConnectionString (DbConnectionString constr) { diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs index 5863bf90327..a2265dcd585 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs @@ -61,7 +61,7 @@ namespace System.Data.Common { #endregion // Properties #region // Methods -#if NET_1_2 +#if NET_2_0 [MonoTODO] public bool ShouldSerializeConnectionString () { diff --git a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs index cf8fded17ed..efdf7897ff3 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data; @@ -86,4 +86,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs b/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs index a5a2b8d524e..f173e7e4537 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataRecord.cs @@ -25,7 +25,7 @@ namespace System.Data.Common { #region Constructors -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DbDataRecord (object[] values, PropertyDescriptorCollection descriptors, FieldNameLookup fieldNameLookup) { @@ -182,7 +182,7 @@ namespace System.Data.Common { return (string) lookup [i]; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual object GetObjectRef (int i) { @@ -319,7 +319,7 @@ namespace System.Data.Common { { return GetValue (i) == null; } -#if NET_1_2 +#if NET_2_0 public virtual bool IsSetAsDefault (int i) { throw new NotImplementedException (); diff --git a/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs b/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs index a9a593dce56..c5a16e176e1 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataSourceEnumerator.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public abstract class DbDataSourceEnumerator @@ -29,4 +29,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs b/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs index c61a90b23e4..1f9c3bf5b02 100644 --- a/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs +++ b/mcs/class/System.Data/System.Data.Common/DbDataUpdatableRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; @@ -375,4 +375,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbParameter.cs b/mcs/class/System.Data/System.Data.Common/DbParameter.cs index 46de6f82e03..0aa19304f7c 100644 --- a/mcs/class/System.Data/System.Data.Common/DbParameter.cs +++ b/mcs/class/System.Data/System.Data.Common/DbParameter.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public abstract class DbParameter : MarshalByRefObject, IDbDataParameter, IDataParameter @@ -46,4 +46,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs b/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs index b54f6aae2fd..778fa378861 100644 --- a/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs +++ b/mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Runtime.InteropServices; @@ -81,4 +81,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs b/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs index 637c4ce987d..fb40fd82a37 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderConfigurationHandler.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Configuration; using System.Xml; @@ -36,4 +36,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs index 0964c5b2957..646740aa75d 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; @@ -38,4 +38,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs index 89a4d98cc3a..2bf46a1442d 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactoriesConfigurationHandler.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Configuration; using System.Xml; @@ -36,4 +36,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs b/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs index c9e572eee14..0fefbda3185 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Security; @@ -95,4 +95,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs b/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs index 1e3968820c6..d00d5f53e08 100644 --- a/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs +++ b/mcs/class/System.Data/System.Data.Common/DbProviderSupportedClasses.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum DbProviderSupportedClasses diff --git a/mcs/class/System.Data/System.Data.Common/DbTable.cs b/mcs/class/System.Data/System.Data.Common/DbTable.cs index d0b2feceef0..ea856c7418c 100644 --- a/mcs/class/System.Data/System.Data.Common/DbTable.cs +++ b/mcs/class/System.Data/System.Data.Common/DbTable.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.ComponentModel; @@ -218,4 +218,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/DbTransaction.cs b/mcs/class/System.Data/System.Data.Common/DbTransaction.cs index 7dc0155fa5c..1a124b6c801 100644 --- a/mcs/class/System.Data/System.Data.Common/DbTransaction.cs +++ b/mcs/class/System.Data/System.Data.Common/DbTransaction.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public abstract class DbTransaction : MarshalByRefObject, IDbTransaction, IDisposable @@ -47,4 +47,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs b/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs index 5782bc82657..3fa3d2db04a 100644 --- a/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs +++ b/mcs/class/System.Data/System.Data.Common/FieldNameLookup.cs @@ -11,7 +11,7 @@ using System.Collections; using System.Data; namespace System.Data.Common { -#if NET_1_2 +#if NET_2_0 // FIXME: Need to clean this up public sealed class FieldNameLookup #else diff --git a/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs b/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs index e8490e9174a..7f7a181d402 100644 --- a/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs +++ b/mcs/class/System.Data/System.Data.Common/GroupByBehavior.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum GroupByBehavior diff --git a/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs b/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs index fe901e9ed34..ed9424bebcc 100644 --- a/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs +++ b/mcs/class/System.Data/System.Data.Common/IdentifierCase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum IdentifierCase diff --git a/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs b/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs index 30b6b38b3e2..ba237322ab4 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaInfo.cs @@ -10,7 +10,7 @@ using System; namespace System.Data.Common { -#if NET_1_2 +#if NET_2_0 // FIXME: This needs to be cleaned up to be compatible with both versions. // Unfortunately, the SchemaInfo class we made is different from the MS // version which is now public. diff --git a/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs b/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs index d7bf68b5764..474ede877de 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaLocation.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public enum SchemaLocation diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs index 218f4a9636a..fb73bf7c1b2 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaTableColumn.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public sealed class SchemaTableColumn @@ -34,4 +34,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs b/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs index f1789082a6b..e9b77f2dab2 100644 --- a/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs +++ b/mcs/class/System.Data/System.Data.Common/SchemaTableOptionalColumn.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Common { public sealed class SchemaTableOptionalColumn @@ -25,4 +25,4 @@ namespace System.Data.Common { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data.OleDb/ChangeLog b/mcs/class/System.Data/System.Data.OleDb/ChangeLog index 0c09615530c..7eccaf5456e 100644 --- a/mcs/class/System.Data/System.Data.OleDb/ChangeLog +++ b/mcs/class/System.Data/System.Data.OleDb/ChangeLog @@ -5,7 +5,7 @@ 2004-01-10 Atsushi Enomoto <atsushi@ximian.com> - * OleDbPermission.cs : NET_1_2 fix not to call obsolete .ctor. + * OleDbPermission.cs : NET_2_0 fix not to call obsolete .ctor. 2002-11-01 Daniel Morgan <danmorg@sc.rr.com> diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs index 37fc0399310..058b8e9412f 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbCommandBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs index 05d809ecf39..d0a7d6261a7 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; using System.EnterpriseServices; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs index 29694168ecf..23314405bb3 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionFactory.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs index ee3206b57d0..466174fc1e3 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionInternal.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; using System.EnterpriseServices; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs index 6c7f2772ed1..1d7f64d2e98 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolCounters.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs index d02cccf39b4..266fd0887ff 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionPoolOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs index 2deeb64208c..d29c4af01ec 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbDataReaderBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs index 5b4b6c9324b..0114f31c866 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbMetaDataFactory.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; using System.IO; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs index 4ab02cd6331..0db80e8886b 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs index 18599e8a17c..651c239e921 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs index 37f415de5f8..08d024a476b 100644 --- a/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs +++ b/mcs/class/System.Data/System.Data.ProviderBase/DbReferenceCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs b/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs index 99808bd55f6..df37ea27f2e 100644 --- a/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs +++ b/mcs/class/System.Data/System.Data.Sql/DataAccessKind.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum DataAccessKind diff --git a/mcs/class/System.Data/System.Data.Sql/Format.cs b/mcs/class/System.Data/System.Data.Sql/Format.cs index 8aa4266cedc..d1e195fdb1e 100644 --- a/mcs/class/System.Data/System.Data.Sql/Format.cs +++ b/mcs/class/System.Data/System.Data.Sql/Format.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum Format diff --git a/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs b/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs index 8066de97293..462bde30843 100644 --- a/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs +++ b/mcs/class/System.Data/System.Data.Sql/IBinarySerialize.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.IO; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs b/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs index 5b65d834555..bc5b14d190b 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs b/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs index eb69d91e9a3..1c8a8e58775 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlConnection : IDbConnection, IDisposable diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs b/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs index 9db30fe6744..ff9db0b9faf 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlExecutionContext.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs b/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs index 4937b775a74..0ba3abc942b 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlGetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.SqlTypes; using System.Xml; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs b/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs index 36d1b8e4feb..92b86707c5a 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlParameter.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs b/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs index 6d43f9b87a5..60ff8e4f6c9 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlParameterCollection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Runtime.InteropServices; using System.Collections; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs b/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs index c7a9eb3681d..20f0bfd450b 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlReader : IDisposable, ISqlRecord, ISqlGetTypedData, IGetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs b/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs index 3a3205a907b..aada212819f 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlRecord : ISqlGetTypedData, IGetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs b/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs index 25993e33238..a2c2771ba28 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlResultSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlResultSet : ISqlReader, IDisposable, ISqlUpdatableRecord, ISqlRecord, ISqlGetTypedData, IGetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs b/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs index f9d18dcc7ed..779f35c70f7 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlSetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs b/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs index f0893efbb25..4a3fe022b6d 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlTransaction.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlTransaction : IDbTransaction, IDisposable diff --git a/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs b/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs index a7631ac6257..e869d0e4041 100644 --- a/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs +++ b/mcs/class/System.Data/System.Data.Sql/ISqlUpdatableRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlUpdatableRecord : ISqlRecord, ISqlGetTypedData, ISqlSetTypedData, ISetTypedData diff --git a/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs b/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs index dc3e86b6ae4..05d61946f74 100644 --- a/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs +++ b/mcs/class/System.Data/System.Data.Sql/InvalidUdtException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs b/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs index 91de0db4405..d2d656e632a 100644 --- a/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs +++ b/mcs/class/System.Data/System.Data.Sql/SerializationHelper.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.IO; diff --git a/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs b/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs index 53f57976846..c545f8896d0 100644 --- a/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs +++ b/mcs/class/System.Data/System.Data.Sql/SerializationVersion.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum SerializationVersion diff --git a/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs index 62b922bd8f5..2c23dfb1dd7 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlContextBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs index 7e45f7d1794..68eeb25a2ce 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs b/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs index 62d31a6a843..6c5097db3bb 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlDefinition.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs index a1095eb174c..5528d518baa 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlFunctionAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs b/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs index 1d34ad71785..bec244fa590 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlMetaData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs index a055e8eff90..2e6837ddf43 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlMethodAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs index 95de363710f..20f4f5c644b 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs index c42c3c69f7d..b1359b48181 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlPipeBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.SqlClient; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs index 355659e88f6..f4b70650fe2 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlServerFactoryBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.Common; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs b/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs index 5d7a4cd568c..770853c7806 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlTriggerContextBase.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Data.SqlTypes; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs index 416a8dfe090..ed211839ca9 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedAggregateAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs index 87ce99dbb71..f3cf19229a5 100644 --- a/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs +++ b/mcs/class/System.Data/System.Data.Sql/SqlUserDefinedTypeAttribute.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs b/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs index 789b1920762..8f84ee4c109 100644 --- a/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs +++ b/mcs/class/System.Data/System.Data.Sql/SystemDataAccessKind.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum SystemDataAccessKind diff --git a/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs b/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs index 7fa76332a44..ac8bf154e92 100644 --- a/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs +++ b/mcs/class/System.Data/System.Data.Sql/TriggerAction.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public enum TriggerAction diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog index 9c412157571..3b58b978a7e 100755 --- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog +++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog @@ -18,7 +18,7 @@ 2004-01-10 Atsushi Enomoto <atsushi@ximian.com> - * SqlClientPermission.cs : Fixed NET_1_2 build related to + * SqlClientPermission.cs : Fixed NET_2_0 build related to obsolete attribute problem (see DbDataPermission.cs) 2003-12-28 Tim Coleman <tim@timcoleman.com> diff --git a/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs b/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs index 605a274bee3..e89c2bf6675 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/ISqlNotificationReceiver.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data.Sql { public interface ISqlNotificationReceiver diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs index f581bc36f02..a05e1eb3ee7 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs @@ -604,7 +604,7 @@ namespace System.Data.SqlClient { case "MIN POOL SIZE" : minPoolSize = Int32.Parse (value); break; -#if NET_1_2 +#if NET_2_0 case "MULTIPLEACTIVERESULTSETS": break; #endif diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs index 8632c132c60..596498f4c98 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlResultSet.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs index 93091e35c1c..b51395aaff0 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBytes.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs index 076af263ad3..d83988e0107 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlChars.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs index 4bb65c74aae..2f971472028 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDate.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs index 742e7251f26..1acf1aaf7c5 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlStreamChars.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs index d549f43644d..a31829a003c 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlTime.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs index 1c3ea55ba3b..eddc80cf732 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlUtcDateTime.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs index de9c5bb3df0..37c2ea47476 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlXmlReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System; using System.Globalization; diff --git a/mcs/class/System.Data/System.Data/AdapterMappingException.cs b/mcs/class/System.Data/System.Data/AdapterMappingException.cs index 73d7781d3f7..f27707e224c 100644 --- a/mcs/class/System.Data/System.Data/AdapterMappingException.cs +++ b/mcs/class/System.Data/System.Data/AdapterMappingException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Globalization; using System.Runtime.Serialization; @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog index 90bcd87a822..3e87117408c 100644 --- a/mcs/class/System.Data/System.Data/ChangeLog +++ b/mcs/class/System.Data/System.Data/ChangeLog @@ -463,10 +463,10 @@ * LoadOption.cs OperationAbortedException.cs ResultSetOptions.cs * ResultSetSensitivity.cs StatementCompletedEventArgs.cs * StatementCompletedEventHandler.cs UpdateOptions.cs: - New classes added for NET_1_2 + New classes added for NET_2_0 * DBConcurrencyException.cs DataRelation.cs DataSet.cs DataTable.cs * DataTableCollection.cs DataView.cs ForeignKeyConstraint.cs: - Modifications to add new NET_1_2 functions + Modifications to add new NET_2_0 functions 2003-11-25 Tim Coleman <tim@timcoleman.com> * IDataSources.cs: diff --git a/mcs/class/System.Data/System.Data/ConflictOptions.cs b/mcs/class/System.Data/System.Data/ConflictOptions.cs index 79628d8f3bf..90e49e34d10 100644 --- a/mcs/class/System.Data/System.Data/ConflictOptions.cs +++ b/mcs/class/System.Data/System.Data/ConflictOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum ConflictOptions @@ -29,4 +29,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs index 7bf504af06c..3a74a3b187e 100644 --- a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs +++ b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs @@ -32,7 +32,7 @@ namespace System.Data { { } -#if NET_1_2 +#if NET_2_0 public DBConcurrencyException (DataRow[] dataRows, string message, Exception inner) : base (message, inner) { @@ -47,7 +47,7 @@ namespace System.Data { set { row = value;} // setting the row has no effect } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public int RowCount { get { throw new NotImplementedException (); } @@ -58,7 +58,7 @@ namespace System.Data { #region Methods -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void CopyToRows (DataRow[] array) { @@ -66,7 +66,7 @@ namespace System.Data { } #endif -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void CopyToRows (DataRow[] array, int ArrayIndex) { diff --git a/mcs/class/System.Data/System.Data/DataAdapterException.cs b/mcs/class/System.Data/System.Data/DataAdapterException.cs index 13ebb8516aa..33a879e5081 100644 --- a/mcs/class/System.Data/System.Data/DataAdapterException.cs +++ b/mcs/class/System.Data/System.Data/DataAdapterException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Globalization; using System.Runtime.Serialization; @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/DataRelation.cs b/mcs/class/System.Data/System.Data/DataRelation.cs index f41537297bd..06ebe7cdbb2 100644 --- a/mcs/class/System.Data/System.Data/DataRelation.cs +++ b/mcs/class/System.Data/System.Data/DataRelation.cs @@ -84,7 +84,7 @@ namespace System.Data throw new NotImplementedException (); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataRelation (string relationName, string parentTableName, string parentTableNamespace, string childTableName, string childTableNamespace, string[] parentColumnNames, string[] childColumnNames, bool nested) { diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs index 523ff53b9bf..27e36f5eafc 100644 --- a/mcs/class/System.Data/System.Data/DataSet.cs +++ b/mcs/class/System.Data/System.Data/DataSet.cs @@ -466,7 +466,7 @@ namespace System.Data { addedRows.Add (row,row); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTableReader GetDataReader (DataTable[] dataTables) { @@ -554,7 +554,7 @@ namespace System.Data { } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void Load (IDataReader reader, LoadOption loadOption, DataTable[] tables) { diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs index 7ca9c85498c..aa45e346f50 100644 --- a/mcs/class/System.Data/System.Data/DataTable.cs +++ b/mcs/class/System.Data/System.Data/DataTable.cs @@ -142,7 +142,7 @@ namespace System.Data { loader.Load (xtr); } -#if NET_1_2 +#if NET_2_0 public DataTable (string tableName, string tbNamespace) : this (tableName) { @@ -864,7 +864,7 @@ namespace System.Data { return copyTable; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTableReader GetDataReader () { @@ -958,7 +958,7 @@ namespace System.Data { info.AddValue ("XmlDiffGram", sw.ToString(), typeof(string)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void Load (IDataReader reader) { @@ -1013,7 +1013,7 @@ namespace System.Data { return row; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataRow LoadDataRow (object[] values, LoadOption loadOption) { @@ -1072,7 +1072,7 @@ namespace System.Data { -#if NET_1_2 +#if NET_2_0 [MonoTODO] XmlReadMode ReadXml (Stream stream) { @@ -1326,7 +1326,7 @@ namespace System.Data { return retVal; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public void WriteXml (Stream stream) { diff --git a/mcs/class/System.Data/System.Data/DataTableCollection.cs b/mcs/class/System.Data/System.Data/DataTableCollection.cs index 1c7aac27805..b74ddcdb2dd 100644 --- a/mcs/class/System.Data/System.Data/DataTableCollection.cs +++ b/mcs/class/System.Data/System.Data/DataTableCollection.cs @@ -49,7 +49,7 @@ namespace System.Data { } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTable this [string name, string tbNamespace] { get { throw new NotImplementedException (); } @@ -110,7 +110,7 @@ namespace System.Data { return table; } -#if NET_1_2 +#if NET_2_0 public virtual DataTable Add (string name, string tbNamespace) { DataTable table = new DataTable (name, tbNamespace); diff --git a/mcs/class/System.Data/System.Data/DataTableReader.cs b/mcs/class/System.Data/System.Data/DataTableReader.cs index 12d2bcb0394..cd3af2eb8ba 100644 --- a/mcs/class/System.Data/System.Data/DataTableReader.cs +++ b/mcs/class/System.Data/System.Data/DataTableReader.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Data.Common; @@ -263,4 +263,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs index 8c3e38641ab..b5c7829aae4 100644 --- a/mcs/class/System.Data/System.Data/DataView.cs +++ b/mcs/class/System.Data/System.Data/DataView.cs @@ -318,7 +318,7 @@ namespace System.Data OnListChanged (new ListChangedEventArgs (ListChangedType.ItemDeleted, index)); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual bool Equals (DataView dv) { @@ -474,7 +474,7 @@ namespace System.Data OnListChanged (new ListChangedEventArgs (ListChangedType.Reset, -1)); }
-#if NET_1_2 +#if NET_2_0 [MonoTODO] public DataTable ToTable () { diff --git a/mcs/class/System.Data/System.Data/DbMetaData.cs b/mcs/class/System.Data/System.Data/DbMetaData.cs index 2a15b599629..ada8fac2403 100644 --- a/mcs/class/System.Data/System.Data/DbMetaData.cs +++ b/mcs/class/System.Data/System.Data/DbMetaData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public class DbMetaData @@ -61,4 +61,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/FillOptions.cs b/mcs/class/System.Data/System.Data/FillOptions.cs index 7263a527840..f8b1c4d8825 100644 --- a/mcs/class/System.Data/System.Data/FillOptions.cs +++ b/mcs/class/System.Data/System.Data/FillOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum FillOptions @@ -19,4 +19,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs index 20ac1434fe0..21c9c9f3a3b 100644 --- a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs +++ b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs @@ -135,7 +135,7 @@ namespace System.Data { _childColumns = childColumns; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public ForeignKeyConstraint (string constraintName, string parentTableName, string parentTableNamespace, string[] parentColumnNames, string[] childColumnNames, AcceptRejectRule acceptRejectRule, Rule deleteRule, Rule updateRule) { diff --git a/mcs/class/System.Data/System.Data/IDataReader2.cs b/mcs/class/System.Data/System.Data/IDataReader2.cs index f40a90f7525..b018e9911a3 100644 --- a/mcs/class/System.Data/System.Data/IDataReader2.cs +++ b/mcs/class/System.Data/System.Data/IDataReader2.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataReader2 diff --git a/mcs/class/System.Data/System.Data/IDataRecord2.cs b/mcs/class/System.Data/System.Data/IDataRecord2.cs index 888d804280b..86057fa0089 100644 --- a/mcs/class/System.Data/System.Data/IDataRecord2.cs +++ b/mcs/class/System.Data/System.Data/IDataRecord2.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataRecord2 diff --git a/mcs/class/System.Data/System.Data/IDataSources.cs b/mcs/class/System.Data/System.Data/IDataSources.cs index 4cc9fca9f86..cdf1b1bd2a8 100644 --- a/mcs/class/System.Data/System.Data/IDataSources.cs +++ b/mcs/class/System.Data/System.Data/IDataSources.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataSources @@ -31,4 +31,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs b/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs index 1b3767424e5..58a4f306fae 100644 --- a/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs +++ b/mcs/class/System.Data/System.Data/IDataUpdatableRecord.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDataUpdatableRecord @@ -26,4 +26,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs b/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs index 2e8369c2a1b..8fdf30769c8 100644 --- a/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs +++ b/mcs/class/System.Data/System.Data/IDbAsyncCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDbAsyncCommand @@ -23,4 +23,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs b/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs index 6dc19661809..d7b4516cc6c 100644 --- a/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs +++ b/mcs/class/System.Data/System.Data/IDbAsyncConnection.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDbAsyncConnection @@ -21,4 +21,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IDbExecutionContext.cs b/mcs/class/System.Data/System.Data/IDbExecutionContext.cs index 2144eda3090..01b85a3334c 100644 --- a/mcs/class/System.Data/System.Data/IDbExecutionContext.cs +++ b/mcs/class/System.Data/System.Data/IDbExecutionContext.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IDbExecutionContext @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/IGetTypedData.cs b/mcs/class/System.Data/System.Data/IGetTypedData.cs index 0ca85b79465..a20ef1d787a 100644 --- a/mcs/class/System.Data/System.Data/IGetTypedData.cs +++ b/mcs/class/System.Data/System.Data/IGetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface IGetTypedData @@ -37,4 +37,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ISetTypedData.cs b/mcs/class/System.Data/System.Data/ISetTypedData.cs index 87bd35386ad..c18c6a853b6 100644 --- a/mcs/class/System.Data/System.Data/ISetTypedData.cs +++ b/mcs/class/System.Data/System.Data/ISetTypedData.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public interface ISetTypedData @@ -35,4 +35,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/LoadOption.cs b/mcs/class/System.Data/System.Data/LoadOption.cs index c275b70e10c..3cf2a19cbfa 100644 --- a/mcs/class/System.Data/System.Data/LoadOption.cs +++ b/mcs/class/System.Data/System.Data/LoadOption.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum LoadOption @@ -18,4 +18,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/OperationAbortedException.cs b/mcs/class/System.Data/System.Data/OperationAbortedException.cs index 4dee0ee99ac..b6b6a1c261d 100644 --- a/mcs/class/System.Data/System.Data/OperationAbortedException.cs +++ b/mcs/class/System.Data/System.Data/OperationAbortedException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 using System.Globalization; using System.Runtime.Serialization; @@ -41,4 +41,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ResultSetOptions.cs b/mcs/class/System.Data/System.Data/ResultSetOptions.cs index a7c0056a7bb..2bd26bf0b9f 100644 --- a/mcs/class/System.Data/System.Data/ResultSetOptions.cs +++ b/mcs/class/System.Data/System.Data/ResultSetOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum ResultSetOptions @@ -20,4 +20,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs b/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs index c2478f75dd3..e94572b76eb 100644 --- a/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs +++ b/mcs/class/System.Data/System.Data/ResultSetSensitivity.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum ResultSetSensitivity @@ -18,4 +18,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs b/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs index 6c7b2148fba..7eaae2d9084 100644 --- a/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs +++ b/mcs/class/System.Data/System.Data/StatementCompletedEventArgs.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public class StatementCompletedEventArgs : EventArgs @@ -37,4 +37,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs b/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs index c22631fa17e..b1bdbbe662a 100644 --- a/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs +++ b/mcs/class/System.Data/System.Data/StatementCompletedEventHandler.cs @@ -7,10 +7,10 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public delegate void StatementCompletedEventHandler (object sender, StatementCompletedEventArgs e); } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Data/System.Data/UpdateOptions.cs b/mcs/class/System.Data/System.Data/UpdateOptions.cs index fdd971e5c0d..3cbc9c586ae 100644 --- a/mcs/class/System.Data/System.Data/UpdateOptions.cs +++ b/mcs/class/System.Data/System.Data/UpdateOptions.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003 // -#if NET_1_2 +#if NET_2_0 namespace System.Data { public enum UpdateOptions @@ -19,4 +19,4 @@ namespace System.Data { } } -#endif // NET_1_2 +#endif // NET_2_0 diff --git a/mcs/class/System.Security/Assembly/AssemblyInfo.cs b/mcs/class/System.Security/Assembly/AssemblyInfo.cs index 6b572916d63..f5812318a0d 100755 --- a/mcs/class/System.Security/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Security/Assembly/AssemblyInfo.cs @@ -22,7 +22,7 @@ using System.Runtime.InteropServices; #elif (NET_1_1) [assembly: AssemblyVersion ("1.0.5000.0")] [assembly: SatelliteContractVersion ("1.0.5000.0")] -#elif (NET_1_2) +#elif (NET_2_0) [assembly: AssemblyVersion ("1.2.3400.0")] [assembly: SatelliteContractVersion ("1.2.3400.0")] #endif diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CryptographicAttribute.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CryptographicAttribute.cs index 2e9c08beaa0..a0c073f775c 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CryptographicAttribute.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/CryptographicAttribute.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedPkcs7.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedPkcs7.cs index 012759e17ee..5a36ff9e25a 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedPkcs7.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedPkcs7.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeKeyChoice.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeKeyChoice.cs index 2d7972e7dd3..601465a8fce 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeKeyChoice.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeKeyChoice.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs index 6e371d7c1b1..f18978f0c94 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyAgreeRecipientInfo.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs index f6833ed5033..26874f4b748 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/KeyTransRecipientInfo.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Recipient.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Recipient.cs index 0d4e86fda09..45c6ba96466 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Recipient.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Recipient.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientCollection.cs index c64c26501c2..4518df16fef 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientEnumerator.cs index 129b61af6f5..c6d716f9335 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7RecipientEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Signer.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Signer.cs index ecf6998a4a9..6106c3daec2 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Signer.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs7Signer.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs index e419fd68cef..1a6bdf82ae5 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9Attribute.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeCollection.cs index 6186c5895df..0e92b685abb 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeEnumerator.cs index a169f5bc95e..b9ee65cb42c 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9AttributeEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs index fb02aa68711..8cec09b0559 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescription.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs index ddef847f5d0..1c5b65d56d0 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9DocumentName.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs index f01e82def3b..71166f99398 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/Pkcs9SigningTime.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs index dd4312495f3..095098746d0 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/PublicKeyInfo.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs index 7f1576e4207..c70dc4778c9 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfo.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs index fdfc80d584d..0a6d870058f 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs index bbecdecbeea..2a58e180ca3 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoType.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoType.cs index 7a98cb04a49..f944f8156a1 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientInfoType.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientSubType.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientSubType.cs index a7a2815cd6e..17881238976 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientSubType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/RecipientSubType.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedPkcs7.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedPkcs7.cs index a442637e650..88884ac63f7 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedPkcs7.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignedPkcs7.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs index 0058ac515d2..b900ba420a0 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Security.Cryptography.X509Certificates; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs index 8749394d7a4..9edec668d7b 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs index f9be57e531f..dd0c8bafabd 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfoEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifier.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifier.cs index 750c02f7763..04e73063898 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifier.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifier.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs index 6608c7efb88..eeeaada3c87 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKey.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKeyType.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKeyType.cs index 50e8b56ddfc..080c2e767ba 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKeyType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierOrKeyType.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierType.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierType.cs index 093029c89b3..51463fbf9d1 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SubjectIdentifierType.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/OpenFlags.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/OpenFlags.cs index b576ec3f1d7..2c0b07be6a4 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/OpenFlags.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/OpenFlags.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/PublicKey.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/PublicKey.cs index 2efd8a02264..39658bcd2a0 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/PublicKey.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/PublicKey.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreLocation.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreLocation.cs index 1fcc4670aa4..8e22083a289 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreLocation.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreLocation.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreName.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreName.cs index 8e4c42091de..fa1f5561351 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreName.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/StoreName.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs index a6eb1ae26ed..d8038476bb7 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509BasicConstraintsExtension.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs index 29cb5385010..126b8ea1001 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateEx.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Text; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs index 691149de093..c5d3710601b 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs index a2563925f70..5d86f85cacd 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509CertificateExEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs index 994424cc91f..2a67e9fbbf0 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Chain.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs index 28c7b75bd4a..244ebded0a5 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElement.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs index 4d9254562c3..361b2ca5057 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs index f2720c2d9bd..35bfa7cde22 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainElementEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs index 43829c5d747..a7ad3b35a52 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainPolicy.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Security.Cryptography; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs index d5da0a61d1f..15d8053e3d4 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatus.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs index a393e57cc0e..96c58d57426 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ChainStatusFlags.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Extension.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Extension.cs index 8528826dd9a..6359b39a064 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Extension.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Extension.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs index bb84c059df2..b4dc2319ae4 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs index 2f8d1fc47b3..1ca364e79a1 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509ExtensionEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509FindType.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509FindType.cs index d9771596fda..89e94a8b211 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509FindType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509FindType.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs index 54cda8bb354..31d5ef3a46e 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509IncludeOption.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs index 1c9377cbf3d..d6419bafc87 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509KeyUsageFlags.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509NameType.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509NameType.cs index c0e4c643d44..90997d6d503 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509NameType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509NameType.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs index 59968738ae6..c66ec59907b 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationFlag.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs index 58701b44d0b..355a71661d5 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509RevocationMode.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs index 92a51a19ff2..49e0e1b85d6 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509SelectionFlag.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs index 5e0e826df5c..a76d1c8a16e 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509Store.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs index 20ad5a45831..0c6b5aa1400 100755 --- a/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.X509Certificates/X509VerificationFlags.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherData.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherData.cs index 4cddbbcb08e..ea0cc4242f2 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherData.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherData.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Security.Cryptography; using System.IO; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs index d4cd9f3fc5b..7729ef55a05 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/CipherReference.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs index 664bc61ee2e..942b03cf341 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/DataReference.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs index 8ff6af6d629..4141fed12b9 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedData.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs index 07c2397584a..20b3bdda4a1 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedKey.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs index 5e403c127ee..a8f955f607c 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs index 1f5085db45c..cf83bcc15d0 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedType.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs index 7856cd65925..328965206bc 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedXml.cs @@ -6,7 +6,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.IO; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs index a8eedd13d7b..7b0ef45272d 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionMethod.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs index 13177bc46ec..a5d94c1c712 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperties.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs index 4c4abb2d0ce..4a83db4d937 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs index fa020329fde..d48cb61717b 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoEncryptedKey.cs @@ -8,7 +8,7 @@ // Copyright (C) Tim Coleman, 2004 // -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs index 0d456001def..e71f129d96e 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyInfoRetrievalMethod.cs @@ -18,7 +18,7 @@ namespace System.Security.Cryptography.Xml { private string URI; private XmlElement element; -#if NET_1_2 +#if NET_2_0 string type; #endif @@ -29,7 +29,7 @@ namespace System.Security.Cryptography.Xml { URI = strUri; } -#if NET_1_2 +#if NET_2_0 public KeyInfoRetrievalMethod (string strUri, string strType) : this (strUri) { @@ -63,7 +63,7 @@ namespace System.Security.Cryptography.Xml { XmlElement xel = document.CreateElement (XmlSignature.ElementNames.RetrievalMethod, XmlSignature.NamespaceURI); if (URI != null) xel.SetAttribute (XmlSignature.AttributeNames.URI, URI); -#if NET_1_2 +#if NET_2_0 if (Type != null) xel.SetAttribute (XmlSignature.AttributeNames.Type, Type); #endif @@ -79,7 +79,7 @@ namespace System.Security.Cryptography.Xml { URI = ""; // not null - so we return URI="" as attribute !!! } else { URI = value.Attributes [XmlSignature.AttributeNames.URI].Value; -#if NET_1_2 +#if NET_2_0 if (value.HasAttribute (XmlSignature.AttributeNames.Type)) Type = value.Attributes [XmlSignature.AttributeNames.Type].Value; #endif diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs index f9b76f20a01..8e7184defc9 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/KeyReference.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs index 204e95c8ce6..e1c64fbedef 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/ReferenceList.cs @@ -7,7 +7,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/SymmetricKeyWrap.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/SymmetricKeyWrap.cs index ee823fe9c19..20898784315 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/SymmetricKeyWrap.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/SymmetricKeyWrap.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2004 // -#if NET_1_2 +#if NET_2_0 using System.IO; using System.Security.Cryptography; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs index bea812a009e..7ce46a0957d 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/X509IssuerSerial.cs @@ -6,7 +6,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 namespace System.Security.Cryptography.Xml { public struct X509IssuerSerial { diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDecryptionTransform.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDecryptionTransform.cs index c92f85f96b8..a656454ac02 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDecryptionTransform.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlDecryptionTransform.cs @@ -6,7 +6,7 @@ // // Copyright (C) Tim Coleman, 2004 -#if NET_1_2 +#if NET_2_0 using System.Xml; diff --git a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlEncryption.cs b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlEncryption.cs index 7ba38113be2..543b8e0bf2f 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlEncryption.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Xml/XmlEncryption.cs @@ -9,7 +9,7 @@ // Copyright (C) Tim Coleman, 2004 // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography/AsnEncodedData.cs b/mcs/class/System.Security/System.Security.Cryptography/AsnEncodedData.cs index 3c69d6f1d43..8bb499456b6 100755 --- a/mcs/class/System.Security/System.Security.Cryptography/AsnEncodedData.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/AsnEncodedData.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Text; diff --git a/mcs/class/System.Security/System.Security.Cryptography/Oid.cs b/mcs/class/System.Security/System.Security.Cryptography/Oid.cs index 61983061ff8..c467078ab01 100755 --- a/mcs/class/System.Security/System.Security.Cryptography/Oid.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/Oid.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.Security/System.Security.Cryptography/OidCollection.cs b/mcs/class/System.Security/System.Security.Cryptography/OidCollection.cs index e3d0946841d..69b4c8a0df0 100755 --- a/mcs/class/System.Security/System.Security.Cryptography/OidCollection.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/OidCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/System.Security.Cryptography/OidEnumerator.cs b/mcs/class/System.Security/System.Security.Cryptography/OidEnumerator.cs index cd16a74cb64..f4b4abd9a44 100755 --- a/mcs/class/System.Security/System.Security.Cryptography/OidEnumerator.cs +++ b/mcs/class/System.Security/System.Security.Cryptography/OidEnumerator.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs index d0365d8bc30..3a63e6ad124 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/AlgorithmIdentifierTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs index 622917ec216..7a4f40bf4d6 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/ContentInfoTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs index d60604e0b24..4d3aba0c111 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/CryptographicAttributeTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedPkcs7Test.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedPkcs7Test.cs index 8d2fdd7b704..8bcb71ce250 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedPkcs7Test.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/EnvelopedPkcs7Test.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs index 5ce5060a703..c83d2fba984 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/KeyTransRecipientInfoTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7RecipientTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7RecipientTest.cs index c09c5195650..310cfc090ff 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7RecipientTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7RecipientTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7SignerTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7SignerTest.cs index 8b547656356..33a731c87b2 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7SignerTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs7SignerTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs index 78cf8ad4e3a..bc220944ed1 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9AttributeTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs index c8c229b6dd5..c34a440bd6d 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentDescriptionTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs index 518b579c44f..2182347693e 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9DocumentNameTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs index 8850d8b9178..5e1c0958a69 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/Pkcs9SigningTimeTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/RecipientInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/RecipientInfoTest.cs index 2c5bfe282fe..532d9d75b0b 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/RecipientInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/RecipientInfoTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedPkcs7Test.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedPkcs7Test.cs index fce9597cd69..5d836eb7a04 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedPkcs7Test.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignedPkcs7Test.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs index eaa44b97614..50e61f15d21 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SignerInfoTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs index 9c202ec7ae7..00a1029926b 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.Pkcs/SubjectIdentifierTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs index 2f42ae625eb..46c91d2e3d8 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainPolicyTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainTest.cs index 370c46ef73d..953607bcf42 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509ChainTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509StoreTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509StoreTest.cs index 42e4124c559..63da817ba54 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509StoreTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography.X509Certificates/X509StoreTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/AsnEncodedDataTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/AsnEncodedDataTest.cs index 08ea1fc0806..ebb6c2d26fa 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/AsnEncodedDataTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/AsnEncodedDataTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/OidCollectionTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/OidCollectionTest.cs index bc0f8b0b9a3..da0e7066ba9 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/OidCollectionTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/OidCollectionTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/OidEnumeratorTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/OidEnumeratorTest.cs index 42574942a0a..72e45b20d55 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/OidEnumeratorTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/OidEnumeratorTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Security/Test/System.Security.Cryptography/OidTest.cs b/mcs/class/System.Security/Test/System.Security.Cryptography/OidTest.cs index a021c76de33..39f39b788bb 100755 --- a/mcs/class/System.Security/Test/System.Security.Cryptography/OidTest.cs +++ b/mcs/class/System.Security/Test/System.Security.Cryptography/OidTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs index 2622588c373..a17bcf3cbfe 100644 --- a/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs +++ b/mcs/class/System.Web/System.Web.Handlers/AssemblyResourceLoader.cs @@ -14,7 +14,7 @@ using System.IO; namespace System.Web.Handlers { [MonoTODO ("Should we cache stuff?")] - #if NET_1_2 + #if NET_2_0 public #else internal // since this is in the .config file, we need to support it, since we dont have versoned support. @@ -33,7 +33,7 @@ namespace System.Web.Handlers { [MonoTODO ("Substitution not implemented")] void System.Web.IHttpHandler.ProcessRequest (HttpContext context) { -#if NET_1_2 +#if NET_2_0 string resourceName = context.Request.QueryString ["resource"]; Assembly assembly = Assembly.Load (context.Request.QueryString ["assembly"]); diff --git a/mcs/class/System.Web/System.Web.Security/ADMembershipProvider.cs b/mcs/class/System.Web/System.Web.Security/ADMembershipProvider.cs index bb5f447ce57..62561833df4 100644 --- a/mcs/class/System.Web/System.Web.Security/ADMembershipProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/ADMembershipProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/AccessMembershipProvider.cs b/mcs/class/System.Web/System.Web.Security/AccessMembershipProvider.cs index d0399829a07..60928c57f11 100644 --- a/mcs/class/System.Web/System.Web.Security/AccessMembershipProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/AccessMembershipProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/AccessRoleProvider.cs b/mcs/class/System.Web/System.Web.Security/AccessRoleProvider.cs index 3575cd88e4f..bb54fa57051 100644 --- a/mcs/class/System.Web/System.Web.Security/AccessRoleProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/AccessRoleProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventArgs.cs b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventArgs.cs index 222a9e4058c..f9c83f63863 100644 --- a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventArgs.cs +++ b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventArgs.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public sealed class AnonymousIdentificationEventArgs : EventArgs { public AnonymousIdentificationEventArgs (HttpContext context) diff --git a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventHandler.cs b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventHandler.cs index 60eb7742c8c..346b169a278 100644 --- a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventHandler.cs +++ b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationEventHandler.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public delegate void AnonymousIdentificationEventHandler (object sender, AnonymousIdentificationEventArgs e); } diff --git a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs index 21a147a0edc..b10bba01801 100644 --- a/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs +++ b/mcs/class/System.Web/System.Web.Security/AnonymousIdentificationModule.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/CookieProtection.cs b/mcs/class/System.Web/System.Web.Security/CookieProtection.cs index 703cfc4e2f2..2fd45d09933 100644 --- a/mcs/class/System.Web/System.Web.Security/CookieProtection.cs +++ b/mcs/class/System.Web/System.Web.Security/CookieProtection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public enum CookieProtection { None, diff --git a/mcs/class/System.Web/System.Web.Security/IMembershipProvider.cs b/mcs/class/System.Web/System.Web.Security/IMembershipProvider.cs index 4db3b7f7f43..4e420173012 100644 --- a/mcs/class/System.Web/System.Web.Security/IMembershipProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/IMembershipProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Configuration.Provider; namespace System.Web.Security { diff --git a/mcs/class/System.Web/System.Web.Security/IRoleProvider.cs b/mcs/class/System.Web/System.Web.Security/IRoleProvider.cs index 1fed1361e23..0f5c32dac46 100644 --- a/mcs/class/System.Web/System.Web.Security/IRoleProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/IRoleProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Configuration.Provider; namespace System.Web.Security { diff --git a/mcs/class/System.Web/System.Web.Security/Membership.cs b/mcs/class/System.Web/System.Web.Security/Membership.cs index 109fb23470c..9e6b2d8ca60 100644 --- a/mcs/class/System.Web/System.Web.Security/Membership.cs +++ b/mcs/class/System.Web/System.Web.Security/Membership.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/MembershipCreateStatus.cs b/mcs/class/System.Web/System.Web.Security/MembershipCreateStatus.cs index 67c17086a35..1bf87dc4541 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipCreateStatus.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipCreateStatus.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public enum MembershipCreateStatus { Success, diff --git a/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs b/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs index 8d318962bd1..08ea2c4aa57 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipCreateUserException.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { [MonoTODO ("make strings for the messages")] public class MembershipCreateUserException : HttpException { diff --git a/mcs/class/System.Web/System.Web.Security/MembershipOnlineStatus.cs b/mcs/class/System.Web/System.Web.Security/MembershipOnlineStatus.cs index 85eb74457c5..6282c945fc3 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipOnlineStatus.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipOnlineStatus.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public enum MembershipOnlineStatus { All, diff --git a/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs b/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs index 2d0f9691d15..52d9fab69b8 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipPasswordException.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public class MembershipPasswordException : HttpException { public MembershipPasswordException () : base () {} diff --git a/mcs/class/System.Web/System.Web.Security/MembershipPasswordFormat.cs b/mcs/class/System.Web/System.Web.Security/MembershipPasswordFormat.cs index 08fb0db7254..2dc311080cb 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipPasswordFormat.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipPasswordFormat.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public enum MembershipPasswordFormat { Clear, diff --git a/mcs/class/System.Web/System.Web.Security/MembershipProviderCollection.cs b/mcs/class/System.Web/System.Web.Security/MembershipProviderCollection.cs index 0547d69c708..2abb45a1c62 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipProviderCollection.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipProviderCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Configuration.Provider; namespace System.Web.Security { diff --git a/mcs/class/System.Web/System.Web.Security/MembershipSortOptions.cs b/mcs/class/System.Web/System.Web.Security/MembershipSortOptions.cs index 9d71fcbac51..1c58766bd3e 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipSortOptions.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipSortOptions.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public enum MembershipSortOptions { UserName, diff --git a/mcs/class/System.Web/System.Web.Security/MembershipUser.cs b/mcs/class/System.Web/System.Web.Security/MembershipUser.cs index f53bf87954b..98559217afb 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipUser.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipUser.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public class MembershipUser { protected MembershipUser () diff --git a/mcs/class/System.Web/System.Web.Security/MembershipUserCollection.cs b/mcs/class/System.Web/System.Web.Security/MembershipUserCollection.cs index 69b2d407777..1ccc491521f 100644 --- a/mcs/class/System.Web/System.Web.Security/MembershipUserCollection.cs +++ b/mcs/class/System.Web/System.Web.Security/MembershipUserCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Web.UI; diff --git a/mcs/class/System.Web/System.Web.Security/RoleManagerEventArgs.cs b/mcs/class/System.Web/System.Web.Security/RoleManagerEventArgs.cs index 547b8c3028c..ab64f385524 100644 --- a/mcs/class/System.Web/System.Web.Security/RoleManagerEventArgs.cs +++ b/mcs/class/System.Web/System.Web.Security/RoleManagerEventArgs.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs b/mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs index 82c2d5645b3..9369cec15f8 100644 --- a/mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs +++ b/mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.Security { public delegate void RoleManagerEventHandler (object sender, RoleManagerEventArgs e); } diff --git a/mcs/class/System.Web/System.Web.Security/RoleManagerModule.cs b/mcs/class/System.Web/System.Web.Security/RoleManagerModule.cs index c600f318db8..6aed9628d6b 100644 --- a/mcs/class/System.Web/System.Web.Security/RoleManagerModule.cs +++ b/mcs/class/System.Web/System.Web.Security/RoleManagerModule.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/RolePrincipal.cs b/mcs/class/System.Web/System.Web.Security/RolePrincipal.cs index 2f663384e2a..052d6c80282 100644 --- a/mcs/class/System.Web/System.Web.Security/RolePrincipal.cs +++ b/mcs/class/System.Web/System.Web.Security/RolePrincipal.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/RoleProviderCollection.cs b/mcs/class/System.Web/System.Web.Security/RoleProviderCollection.cs index d759cf6dd4d..92e1791303b 100644 --- a/mcs/class/System.Web/System.Web.Security/RoleProviderCollection.cs +++ b/mcs/class/System.Web/System.Web.Security/RoleProviderCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Configuration.Provider; namespace System.Web.Security { diff --git a/mcs/class/System.Web/System.Web.Security/Roles.cs b/mcs/class/System.Web/System.Web.Security/Roles.cs index 02b931ccdb1..b1fa6cd5873 100644 --- a/mcs/class/System.Web/System.Web.Security/Roles.cs +++ b/mcs/class/System.Web/System.Web.Security/Roles.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs b/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs index cc6ab319f6b..b4f2d97f9e7 100644 --- a/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/SqlMembershipProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs b/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs index 35af34fe86d..6c820588af6 100644 --- a/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs +++ b/mcs/class/System.Web/System.Web.Security/SqlRoleProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs index 03136fae87d..df57ff776e6 100755 --- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs @@ -52,7 +52,7 @@ namespace System.Web.UI.WebControls public override void DataBind()
{ - #if NET_1_2 + #if NET_2_0 RequiresDataBinding = false; #endif
OnDataBinding(EventArgs.Empty);
@@ -274,7 +274,7 @@ namespace System.Web.UI.WebControls protected abstract void PrepareControlHierarchy();
protected abstract void CreateControlHierarchy(bool useDataSource); - #if NET_1_2 + #if NET_2_0 // should be `internal protected' (why, oh WHY did they do that !?!) diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletStyle.cs index a5648d8d985..a3fc5d2ba8a 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/BulletStyle.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BulletStyle.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI.WebControls { public enum BulletStyle { NotSet, diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs index 9ad78cd8ad1..3a3576aa36d 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedList.cs @@ -6,7 +6,7 @@ // // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.IO; using System.Collections; using System.Globalization; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListDisplayMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListDisplayMode.cs index 84e05536bce..5f15fa85584 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListDisplayMode.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListDisplayMode.cs @@ -6,7 +6,7 @@ // // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI.WebControls { public enum BulletedListDisplayMode { Text, diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventArgs.cs index 250aa2523d0..0a29aa9918b 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventArgs.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventArgs.cs @@ -6,7 +6,7 @@ // // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI.WebControls { public class BulletedListEventArgs : EventArgs { int index; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs index 1e3f1fd6662..eeb6335f2b3 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs @@ -6,7 +6,7 @@ // // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI.WebControls { public delegate void BulletedListEventHandler (object sender, BulletedListEventArgs e); } diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs index c3f8868a451..70824ab04e5 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ControlParameter.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs index b6d269050b6..9b53695b8ba 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/CookieParameter.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs index c6b7601c08b..06a3c7fb84a 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControl.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs index 8c2903fcb93..08c5ae47001 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/FormParameter.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs index d2571e6205c..f75d64517ac 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs @@ -20,14 +20,14 @@ using System.Web.Util; namespace System.Web.UI.WebControls
{
[DefaultEvent("SelectedIndexChanged")]
- #if !NET_1_2 + #if !NET_2_0 [DefaultProperty("DataSource")] #endif
[Designer ("System.Web.UI.Design.WebControls.ListControlDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
[DataBindingHandler("System.Web.UI.Design.ListControlDataBindingHandler, " + Consts.AssemblySystem_Design)]
[ParseChildren(true, "Items")]
public abstract class ListControl : - #if NET_1_2 + #if NET_2_0 DataBoundControl #else WebControl @@ -35,7 +35,7 @@ namespace System.Web.UI.WebControls {
private static readonly object SelectedIndexChangedEvent = new object();
- #if !NET_1_2
+ #if !NET_2_0
private object dataSource; #endif @@ -44,7 +44,7 @@ namespace System.Web.UI.WebControls private int cachedSelectedIndex = -1;
private string cachedSelectedValue; - #if !NET_1_2
+ #if !NET_2_0
public ListControl(): base(HtmlTextWriterTag.Select)
{
} @@ -85,7 +85,7 @@ namespace System.Web.UI.WebControls }
}
- #if !NET_1_2 + #if !NET_2_0 [DefaultValue (""), WebCategory ("Data")] [WebSysDescription ("The name of the table that is used for binding when a DataSource is specified.")]
public virtual string DataMember
@@ -316,7 +316,7 @@ namespace System.Web.UI.WebControls }
}
- #if NET_1_2 + #if NET_2_0 protected override void PerformDataBinding () { base.PerformDataBinding (); diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs index 2d4d305c375..a64d27be769 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs index 244f6518660..e00b63e8950 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ParameterCollection.cs @@ -5,7 +5,7 @@ // // (C) 2003 Todd Berman -#if NET_1_2 +#if NET_2_0 using System.Web.UI; using System.Collections; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/QueryStringParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/QueryStringParameter.cs index aeab80ef497..a4d48eef3bb 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/QueryStringParameter.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/QueryStringParameter.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs index a7a614bab6d..37e2d5dfca2 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs @@ -234,7 +234,7 @@ namespace System.Web.UI.WebControls public override void DataBind () { - #if NET_1_2 + #if NET_2_0 RequiresDataBinding = false; #endif OnDataBinding (EventArgs.Empty); @@ -416,7 +416,7 @@ namespace System.Web.UI.WebControls InstantiateItem (item);
} - #if NET_1_2 + #if NET_2_0 // should be `internal protected' (why, oh WHY did they do that !?!) diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs index fa7441b0a98..509e05f5cc8 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs index 9c51dcbc671..a7882c25ef4 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs index 5ff0c9a80a6..596dc8ee410 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventArgs.cs index f58f345e35f..b62d82e3479 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventArgs.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventArgs.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs index 244a9cbad44..d8ada9daa5d 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI.WebControls { public delegate void SqlDataSourceCommandEventHandler (object source, SqlDataSourceCommandEventArgs e); } diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs index 4d9071ded87..dcef91c4ecf 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs index 1e37ee59c1d..2d624b2fcf8 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs index 2446e91b260..ff53f7a2e34 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI.WebControls { public delegate void SqlDataSourceStatusEventHandler (object source, SqlDataSourceStatusEventArgs e); } diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs index d78d702a852..26275881b7d 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs index 85ec067cec2..7ec53d909ea 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSource.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs index b6a050a1a65..8dc0355b6d4 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalDataSourceView.cs index fb17fd89666..1e62ea4c1b4 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalDataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalDataSourceView.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalEnumerable.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalEnumerable.cs index e3862ae21ec..68cf8dc5350 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalEnumerable.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchicalEnumerable.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchyData.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchyData.cs index 2470b56808e..c55b8baea2d 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchyData.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlHierarchyData.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs index 6de13929da4..8eb91859724 100644 --- a/mcs/class/System.Web/System.Web.UI/Control.cs +++ b/mcs/class/System.Web/System.Web.UI/Control.cs @@ -697,7 +697,7 @@ namespace System.Web.UI public virtual void DataBind() //DIT
{ - #if NET_1_2 + #if NET_2_0 bool foundDataItem = false; if (_isNamingContainer && Page != null) { @@ -712,7 +712,7 @@ namespace System.Web.UI OnDataBinding (EventArgs.Empty); DataBindChildren(); - #if NET_1_2 + #if NET_2_0 } finally { if (foundDataItem) Page.PopDataItemContext (); @@ -720,7 +720,7 @@ namespace System.Web.UI #endif } - #if NET_1_2 + #if NET_2_0 protected virtual #endif @@ -944,7 +944,7 @@ namespace System.Web.UI //TODO: I think there are some needed Interface implementations to do here. - #if NET_1_2 + #if NET_2_0 protected string GetWebResourceUrl (string resourceName) { return Page.GetWebResourceUrl (GetType(), resourceName); diff --git a/mcs/class/System.Web/System.Web.UI/DataBinder.cs b/mcs/class/System.Web/System.Web.UI/DataBinder.cs index ca114aff0ea..62f2931c57e 100755 --- a/mcs/class/System.Web/System.Web.UI/DataBinder.cs +++ b/mcs/class/System.Web/System.Web.UI/DataBinder.cs @@ -165,7 +165,7 @@ namespace System.Web.UI { return FormatResult (result, format); } - #if NET_1_2 + #if NET_2_0 public static object GetDataItem (object container, out bool foundDataItem) { foundDataItem = false; diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs b/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs index 84a067a7539..e30b3a57350 100644 --- a/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs +++ b/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs index 7612a66266d..73425482c22 100644 --- a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs b/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs index bd1f1fc6010..dfc7f5cf3b8 100644 --- a/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs +++ b/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceControl.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceView.cs b/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceView.cs index a1f255da8de..871e4bf3529 100644 --- a/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI/HierarchicalDataSourceView.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/IDataSource.cs b/mcs/class/System.Web/System.Web.UI/IDataSource.cs index a79bd195f21..dda53dc4ccd 100644 --- a/mcs/class/System.Web/System.Web.UI/IDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI/IDataSource.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs b/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs index b3f8615b269..d97d9bdc295 100644 --- a/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI/IHierarchicalDataSource.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs b/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs index 56eef423bbe..71d21174c68 100644 --- a/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs +++ b/mcs/class/System.Web/System.Web.UI/IHierarchicalEnumerable.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; namespace System.Web.UI { diff --git a/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs b/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs index 2eb33a63768..16fc1189ef5 100644 --- a/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs +++ b/mcs/class/System.Web/System.Web.UI/IHierarchyData.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI { public interface IHierarchyData { IHierarchicalEnumerable GetChildren (); diff --git a/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs b/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs index 334287e581d..69eed59e774 100644 --- a/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs +++ b/mcs/class/System.Web/System.Web.UI/INavigateUIData.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI { public interface INavigateUIData { string Name { get; } diff --git a/mcs/class/System.Web/System.Web.UI/KeyedList.cs b/mcs/class/System.Web/System.Web.UI/KeyedList.cs index ec3a061babb..d317536176f 100644 --- a/mcs/class/System.Web/System.Web.UI/KeyedList.cs +++ b/mcs/class/System.Web/System.Web.UI/KeyedList.cs @@ -5,7 +5,7 @@ // // (C) 2003 Todd Berman -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; diff --git a/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs b/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs index 4e80dd230ff..b4085efa39e 100644 --- a/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs +++ b/mcs/class/System.Web/System.Web.UI/KeyedListEnumerator.cs @@ -5,7 +5,7 @@ // // (C) 2003 Todd Berman -#if NET_1_2 +#if NET_2_0 using System.Collections; diff --git a/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs b/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs index b66967908ef..a98c7fcab4b 100644 --- a/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs +++ b/mcs/class/System.Web/System.Web.UI/ListSourceHelper.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs b/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs index f8d44b214eb..eadb7653922 100644 --- a/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs +++ b/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs @@ -21,7 +21,7 @@ using System.Web.Util; using System.Diagnostics; namespace System.Web.UI { - #if NET_1_2 + #if NET_2_0 public #else internal diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs index b8f05523a58..05ce29a5113 100755 --- a/mcs/class/System.Web/System.Web.UI/Page.cs +++ b/mcs/class/System.Web/System.Web.UI/Page.cs @@ -955,7 +955,7 @@ public class Page : TemplateControl, IHttpHandler #endregion - #if NET_1_2 + #if NET_2_0 public string GetWebResourceUrl(Type type, string resourceName) { if (type == null) diff --git a/mcs/class/System.Web/System.Web.UI/StateManagedCollection.cs b/mcs/class/System.Web/System.Web.UI/StateManagedCollection.cs index 839589de586..22a04628c35 100644 --- a/mcs/class/System.Web/System.Web.UI/StateManagedCollection.cs +++ b/mcs/class/System.Web/System.Web.UI/StateManagedCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs b/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs index 20081ec9767..94913d7d9eb 100644 --- a/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs +++ b/mcs/class/System.Web/System.Web.UI/WebResourceAttribute.cs @@ -6,7 +6,7 @@ // // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web.UI { public sealed class WebResourceAttribute : Attribute { public WebResourceAttribute (string webResource, string contentType) : this (webResource, contentType, false) {} diff --git a/mcs/class/System.Web/System.Web.UI/XPathBinder.cs b/mcs/class/System.Web/System.Web.UI/XPathBinder.cs index b0fd6b301f3..6bb041be1aa 100644 --- a/mcs/class/System.Web/System.Web.UI/XPathBinder.cs +++ b/mcs/class/System.Web/System.Web.UI/XPathBinder.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web/HttpException.cs b/mcs/class/System.Web/System.Web/HttpException.cs index e130317c0e5..39ac87181ea 100644 --- a/mcs/class/System.Web/System.Web/HttpException.cs +++ b/mcs/class/System.Web/System.Web/HttpException.cs @@ -18,7 +18,7 @@ using System.Web.Util; namespace System.Web { -#if NET_1_2 +#if NET_2_0 [Serializable] #endif public class HttpException : ExternalException @@ -45,7 +45,7 @@ namespace System.Web http_code = iHttpCode; } -#if NET_1_2 +#if NET_2_0 protected HttpException (SerializationInfo info, StreamingContext sc) : base (info, sc) { http_code = info.GetInt32 ("_httpCode"); diff --git a/mcs/class/System.Web/System.Web/HttpServerUtility.cs b/mcs/class/System.Web/System.Web/HttpServerUtility.cs index f4e35e23e8a..a8950eca0bc 100644 --- a/mcs/class/System.Web/System.Web/HttpServerUtility.cs +++ b/mcs/class/System.Web/System.Web/HttpServerUtility.cs @@ -151,7 +151,7 @@ namespace System.Web Execute (path, writer, false); } -#if NET_1_2 +#if NET_2_0 public #else internal diff --git a/mcs/class/System.Web/System.Web/ISiteMapProvider.cs b/mcs/class/System.Web/System.Web/ISiteMapProvider.cs index c4f68f58e45..be12b71ee9f 100644 --- a/mcs/class/System.Web/System.Web/ISiteMapProvider.cs +++ b/mcs/class/System.Web/System.Web/ISiteMapProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 namespace System.Web { public interface ISiteMapProvider { SiteMapNode FindSiteMapNode (string rawUrl); diff --git a/mcs/class/System.Web/System.Web/SiteMap.cs b/mcs/class/System.Web/System.Web/SiteMap.cs index 852c740cd04..222491c01fd 100644 --- a/mcs/class/System.Web/System.Web/SiteMap.cs +++ b/mcs/class/System.Web/System.Web/SiteMap.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web/SiteMapNode.cs b/mcs/class/System.Web/System.Web/SiteMapNode.cs index 84b141b7842..4e8395d8b1b 100644 --- a/mcs/class/System.Web/System.Web/SiteMapNode.cs +++ b/mcs/class/System.Web/System.Web/SiteMapNode.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs b/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs index 2a47beb4a95..e8bf2259440 100644 --- a/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs +++ b/mcs/class/System.Web/System.Web/SiteMapNodeCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web/SiteMapProvider.cs b/mcs/class/System.Web/System.Web/SiteMapProvider.cs index 500b728f15b..655da40ada4 100644 --- a/mcs/class/System.Web/System.Web/SiteMapProvider.cs +++ b/mcs/class/System.Web/System.Web/SiteMapProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web/SiteMapProviderCollection.cs b/mcs/class/System.Web/System.Web/SiteMapProviderCollection.cs index 9db31b39694..7177e98e638 100644 --- a/mcs/class/System.Web/System.Web/SiteMapProviderCollection.cs +++ b/mcs/class/System.Web/System.Web/SiteMapProviderCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Text; diff --git a/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs b/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs index 04fa42777f2..ae8cddabe02 100644 --- a/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs +++ b/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; using System.Configuration; diff --git a/mcs/class/System.XML/Mono.System.XML.csproj b/mcs/class/System.XML/Mono.System.XML.csproj index dfc13d86713..543475fab17 100644 --- a/mcs/class/System.XML/Mono.System.XML.csproj +++ b/mcs/class/System.XML/Mono.System.XML.csproj @@ -27,7 +27,7 @@ BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE;NET_1_1;NET_1_2"
+ DefineConstants = "DEBUG;TRACE;NET_1_1;NET_2_0"
DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
@@ -47,7 +47,7 @@ BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
- DefineConstants = "TRACE;NET_1_1;NET_1_2"
+ DefineConstants = "TRACE;NET_1_1;NET_2_0"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
diff --git a/mcs/class/System.XML/System.Xml.Query/XmlCommand.cs b/mcs/class/System.XML/System.Xml.Query/XmlCommand.cs index b0e0bab8538..26e35ce80fa 100755 --- a/mcs/class/System.XML/System.Xml.Query/XmlCommand.cs +++ b/mcs/class/System.XML/System.Xml.Query/XmlCommand.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.IO;
@@ -23,4 +23,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.XML/System.Xml.Query/XmlQueryArgumentList.cs b/mcs/class/System.XML/System.Xml.Query/XmlQueryArgumentList.cs index d5fa3fd436d..cff9c93c43c 100755 --- a/mcs/class/System.XML/System.Xml.Query/XmlQueryArgumentList.cs +++ b/mcs/class/System.XML/System.Xml.Query/XmlQueryArgumentList.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.Collections;
using System.Xml;
@@ -93,4 +93,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.XML/System.Xml.Query/XmlQueryCompileException.cs b/mcs/class/System.XML/System.Xml.Query/XmlQueryCompileException.cs index 9ae381be7e7..0a017ba991f 100755 --- a/mcs/class/System.XML/System.Xml.Query/XmlQueryCompileException.cs +++ b/mcs/class/System.XML/System.Xml.Query/XmlQueryCompileException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Runtime.Serialization;
@@ -60,4 +60,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.XML/System.Xml.Query/XmlQueryException.cs b/mcs/class/System.XML/System.Xml.Query/XmlQueryException.cs index 0aaa35320b5..fc32499bb38 100755 --- a/mcs/class/System.XML/System.Xml.Query/XmlQueryException.cs +++ b/mcs/class/System.XML/System.Xml.Query/XmlQueryException.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Runtime.Serialization;
@@ -81,4 +81,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.XML/System.Xml.Query/XsltProcessor.cs b/mcs/class/System.XML/System.Xml.Query/XsltProcessor.cs index d5fef945daf..9f7f9de3c77 100755 --- a/mcs/class/System.XML/System.Xml.Query/XsltProcessor.cs +++ b/mcs/class/System.XML/System.Xml.Query/XsltProcessor.cs @@ -7,7 +7,7 @@ // Copyright (C) Tim Coleman, 2003
//
-#if NET_1_2
+#if NET_2_0
using System.IO;
@@ -68,4 +68,4 @@ namespace System.Xml.Query { }
}
-#endif // NET_1_2
+#endif // NET_2_0
diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index 8e37a2cbf42..e837d942204 100755 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -190,7 +190,7 @@ XmlSchemaSimpleContentRestriction.cs, XmlSchemaContent.cs : Added IsExtension. GetXXX() became nonvirtual. * XmlSchemaType.cs : - - Added NET_1_2 BaseXmlSchemaType (other members are commented out). + - Added NET_2_0 BaseXmlSchemaType (other members are commented out). - Now BaseSchemaType redirects to new property BaseXmlSchemaType. * XmlSchemaComplexType.cs : - Now it fully uses BaseXmlSchemaType above. diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaBuiltInType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaBuiltInType.cs index 4b2ea34a522..b1d8e7cbe15 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaBuiltInType.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaBuiltInType.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 namespace System.Xml.Schema { diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs index 71dc252c1b1..103c7e0d06b 100644 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSet.cs @@ -18,7 +18,7 @@ using System.Xml.XPath; namespace System.Xml.Schema { -#if NET_1_2 +#if NET_2_0 public class XmlSchemaSet #else internal class XmlSchemaSet diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs index cf428ed5602..7d81255b99d 100755 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs @@ -9,7 +9,7 @@ using System; using System.Xml;
using System.ComponentModel;
using System.Xml.Serialization;
-#if NET_1_2_in_the_future
+#if NET_2_0_in_the_future
using MS.Internal.Xml;
#endif
@@ -65,7 +65,7 @@ namespace System.Xml.Schema }
[XmlIgnore]
-#if NET_1_2
+#if NET_2_0
[Obsolete ("This property is going away. Use BaseXmlSchemaType instead")]
#endif
public object BaseSchemaType {
@@ -80,7 +80,7 @@ namespace System.Xml.Schema }
[XmlIgnore]
-#if NET_1_2
+#if NET_2_0
public XmlSchemaType BaseXmlSchemaType {
#else
internal XmlSchemaType BaseXmlSchemaType {
@@ -105,7 +105,7 @@ namespace System.Xml.Schema }
#endregion
-#if NET_1_2
+#if NET_2_0
public static XmlSchemaComplexType GetBuiltInComplexType (XmlQualifiedName qualifiedName)
#else
internal static XmlSchemaComplexType GetBuiltInComplexType (XmlQualifiedName qualifiedName)
@@ -117,7 +117,7 @@ namespace System.Xml.Schema return null;
}
-#if NET_1_2_in_the_future
+#if NET_2_0_in_the_future
public static XmlSchemaSimpleType GetBuiltInSimpleType (XmlQualifiedName qualifiedName)
{
if (qualifiedName.Name == "anySimpleType" && qualifiedName.Namespace == XmlSchema.Namespace)
diff --git a/mcs/class/System.XML/System.Xml/AsyncXmlTextWriter.cs b/mcs/class/System.XML/System.Xml/AsyncXmlTextWriter.cs index 8242899ff1d..83ff1981888 100644 --- a/mcs/class/System.XML/System.Xml/AsyncXmlTextWriter.cs +++ b/mcs/class/System.XML/System.Xml/AsyncXmlTextWriter.cs @@ -5,7 +5,7 @@ // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // // -#if NET_1_2 +#if NET_2_0 using System; using System.IO; diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index f5b1f41dcc6..9260e63e350 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -195,7 +195,7 @@ * XmlElement.cs : Don't remove attributes twice (raises extraneous removal events). * XmlNamespaceManager.cs, XmlNodeChangedEventArgs : - Added NET_1_2 members. + Added NET_2_0 members. 2004-02-08 Atsushi Enomoto <atsushi@ximian.com> @@ -359,7 +359,7 @@ - Added its own EntityHandling property. * XmlValidatingReader.cs : Share XmlResolver with XmlTextReader. * XmlReader.cs, - XmlTextReader.cs : Added new NET_1_2 members. + XmlTextReader.cs : Added new NET_2_0 members. * XmlElement.cs : Removed extra lines (caused by XmlTextWriter bugs). * XmlEntityReference.cs : Forgot to add, the real fix by Boris. @@ -418,7 +418,7 @@ 2004-01-13 Atsushi Enomoto <atsushi@ximian.com> * XmlValidatingReader.cs : Throw exception only in case of errors. - Added NET_1_2 Evidences property. + Added NET_2_0 Evidences property. 2004-01-12 Atsushi Enomoto <atsushi@ximian.com> diff --git a/mcs/class/System.XML/System.Xml/IXPathChangeNavigator.cs b/mcs/class/System.XML/System.Xml/IXPathChangeNavigator.cs index 1c566d63e98..5a27e267cd6 100644 --- a/mcs/class/System.XML/System.Xml/IXPathChangeNavigator.cs +++ b/mcs/class/System.XML/System.Xml/IXPathChangeNavigator.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.XML/System.Xml/IXPathEditor.cs b/mcs/class/System.XML/System.Xml/IXPathEditor.cs index ab14a73a1c3..09e75737416 100644 --- a/mcs/class/System.XML/System.Xml/IXPathEditor.cs +++ b/mcs/class/System.XML/System.Xml/IXPathEditor.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/System.XML/System.Xml/IXPathNavigator.cs b/mcs/class/System.XML/System.Xml/IXPathNavigator.cs index 822b58ecee0..ff5a5bd5a9b 100644 --- a/mcs/class/System.XML/System.Xml/IXPathNavigator.cs +++ b/mcs/class/System.XML/System.Xml/IXPathNavigator.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs b/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs index 03fb4ffd984..814ed3ff108 100644 --- a/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs +++ b/mcs/class/System.XML/System.Xml/IXmlDataEvidence.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 using System; using System.Security.Policy; diff --git a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs index b521d62042f..5bab66ffdcb 100644 --- a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs +++ b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections.Specialized; diff --git a/mcs/class/System.XML/System.Xml/XPathChangeNavigator.cs b/mcs/class/System.XML/System.Xml/XPathChangeNavigator.cs index 8bb6201d9ed..8a11d1ec101 100644 --- a/mcs/class/System.XML/System.Xml/XPathChangeNavigator.cs +++ b/mcs/class/System.XML/System.Xml/XPathChangeNavigator.cs @@ -5,7 +5,7 @@ // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.XML/System.Xml/XPathDocument2.cs b/mcs/class/System.XML/System.Xml/XPathDocument2.cs index a11d9977845..d170d4e6b8e 100644 --- a/mcs/class/System.XML/System.Xml/XPathDocument2.cs +++ b/mcs/class/System.XML/System.Xml/XPathDocument2.cs @@ -6,7 +6,7 @@ // // (C)2003 Atsushi Enomoto // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventAction.cs b/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventAction.cs index b27df9480ca..73a49514c50 100644 --- a/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventAction.cs +++ b/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventAction.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { diff --git a/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventHandler.cs b/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventHandler.cs index edb3e93018f..7174c909862 100644 --- a/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventHandler.cs +++ b/mcs/class/System.XML/System.Xml/XPathDocument2ChangedEventHandler.cs @@ -6,7 +6,7 @@ // // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { public delegate void XPathDocument2ChangedEventHandler (object sender, XPathDocument2ChangedEventArgs e); diff --git a/mcs/class/System.XML/System.Xml/XPathEditor.cs b/mcs/class/System.XML/System.Xml/XPathEditor.cs index 82674f4a6ae..087b573c506 100644 --- a/mcs/class/System.XML/System.Xml/XPathEditor.cs +++ b/mcs/class/System.XML/System.Xml/XPathEditor.cs @@ -7,7 +7,7 @@ // (C)2003 Atsushi Enomoto
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Collections;
diff --git a/mcs/class/System.XML/System.Xml/XPathNavigator2.cs b/mcs/class/System.XML/System.Xml/XPathNavigator2.cs index cfa6b39179f..47d2e8016b4 100644 --- a/mcs/class/System.XML/System.Xml/XPathNavigator2.cs +++ b/mcs/class/System.XML/System.Xml/XPathNavigator2.cs @@ -6,7 +6,7 @@ //
// (C)2003 Atsushi Enomoto
//
-#if NET_1_2
+#if NET_2_0
using System;
using System.Collections;
diff --git a/mcs/class/System.XML/System.Xml/XmlChangeFilters.cs b/mcs/class/System.XML/System.Xml/XmlChangeFilters.cs index a5a5c2bee72..75760c08662 100644 --- a/mcs/class/System.XML/System.Xml/XmlChangeFilters.cs +++ b/mcs/class/System.XML/System.Xml/XmlChangeFilters.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { diff --git a/mcs/class/System.XML/System.Xml/XmlInfoItemType.cs b/mcs/class/System.XML/System.Xml/XmlInfoItemType.cs index 457ff5c64eb..1de5030ab37 100644 --- a/mcs/class/System.XML/System.Xml/XmlInfoItemType.cs +++ b/mcs/class/System.XML/System.Xml/XmlInfoItemType.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs index e69cd7d1f93..0d2a0dbccbf 100644 --- a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs +++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs @@ -108,7 +108,7 @@ namespace System.Xml AddNamespace (prefix, uri, false); } -#if NET_1_2 +#if NET_2_0 public virtual void AddNamespace (string prefix, string uri, bool atomizedNames) #else internal virtual void AddNamespace (string prefix, string uri, bool atomizedNames) @@ -180,7 +180,7 @@ namespace System.Xml return ht.Keys.GetEnumerator (); } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual StringDictionary GetNamespacesInScope (XmlNamespaceScope scope) { @@ -206,7 +206,7 @@ namespace System.Xml return LookupNamespace (prefix, false); } -#if NET_1_2 +#if NET_2_0 public string LookupNamespace (string prefix, bool atomizedName) #else internal string LookupNamespace (string prefix, bool atomizedName) @@ -244,7 +244,7 @@ namespace System.Xml return s1 == s2; } -#if NET_1_2 +#if NET_2_0 public string LookupPrefix (string uri, bool atomizedName) #else internal string LookupPrefix (string uri, bool atomizedName) @@ -304,7 +304,7 @@ namespace System.Xml RemoveNamespace (prefix, uri, false); } -#if NET_1_2 +#if NET_2_0 public virtual void RemoveNamespace (string prefix, string uri, bool atomizedNames) #else internal virtual void RemoveNamespace (string prefix, string uri, bool atomizedNames) diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceScope.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceScope.cs index 372d0cc24d9..1179cfd427b 100644 --- a/mcs/class/System.XML/System.Xml/XmlNamespaceScope.cs +++ b/mcs/class/System.XML/System.Xml/XmlNamespaceScope.cs @@ -7,7 +7,7 @@ // Note that this is different from "XPathNamespaceScope" // while the member definitions are all the same. // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { diff --git a/mcs/class/System.XML/System.Xml/XmlNodeChangeType.cs b/mcs/class/System.XML/System.Xml/XmlNodeChangeType.cs index 71ad70ee3b0..d780826962b 100644 --- a/mcs/class/System.XML/System.Xml/XmlNodeChangeType.cs +++ b/mcs/class/System.XML/System.Xml/XmlNodeChangeType.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { diff --git a/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs b/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs index 6f8f3c2e702..0739e67679c 100644 --- a/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs +++ b/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs @@ -49,7 +49,7 @@ namespace System.Xml }
-#if NET_1_2
+#if NET_2_0
public string OldValue
{
get
diff --git a/mcs/class/System.XML/System.Xml/XmlQualifiedNameTable.cs b/mcs/class/System.XML/System.Xml/XmlQualifiedNameTable.cs index e7e5a5428e7..c841dc7bc36 100644 --- a/mcs/class/System.XML/System.Xml/XmlQualifiedNameTable.cs +++ b/mcs/class/System.XML/System.Xml/XmlQualifiedNameTable.cs @@ -5,7 +5,7 @@ // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // // -#if NET_1_2 +#if NET_2_0 using System; using System.Collections; diff --git a/mcs/class/System.XML/System.Xml/XmlQueryDialect.cs b/mcs/class/System.XML/System.Xml/XmlQueryDialect.cs index 7bf29aa9c6b..88320413f65 100644 --- a/mcs/class/System.XML/System.Xml/XmlQueryDialect.cs +++ b/mcs/class/System.XML/System.Xml/XmlQueryDialect.cs @@ -4,7 +4,7 @@ // Author: // Atsushi Enomoto <ginga@kit.hi-ho.ne.jp> // -#if NET_1_2 +#if NET_2_0 namespace System.Xml { diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs index 1d6da5b8909..cdca1b850d9 100644 --- a/mcs/class/System.XML/System.Xml/XmlReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlReader.cs @@ -16,7 +16,7 @@ using System.Text; namespace System.Xml { -#if NET_1_2 +#if NET_2_0 public abstract class XmlReader : IDisposable, IXmlDataEvidence #else public abstract class XmlReader @@ -48,7 +48,7 @@ namespace System.Xml public abstract bool EOF { get; } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual Evidence [] Evidences { get { return evidences; } @@ -103,7 +103,7 @@ namespace System.Xml public abstract void Close (); -#if NET_1_2 +#if NET_2_0 [MonoTODO] public virtual void Dispose () { diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs index 6f0ee272e26..8f33f463127 100644 --- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs @@ -148,7 +148,7 @@ namespace System.Xml { get { return parserContext.Encoding; } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public EntityHandling EntityHandling { get { throw new NotImplementedException (); } @@ -165,7 +165,7 @@ namespace System.Xml } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public override Evidence [] Evidences { get { return base.Evidences; } @@ -652,7 +652,7 @@ namespace System.Xml throw new InvalidOperationException ("XmlTextReader cannot resolve external entities."); } -#if NET_1_2 +#if NET_2_0 [MonoTODO ("Implement for performance reason")] public override void Skip () { diff --git a/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs b/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs index 9deea5ed38b..85759effe3e 100644 --- a/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlValidatingReader.cs @@ -98,7 +98,7 @@ namespace System.Xml { get { return validatingReader == null ? false : validatingReader.EOF; } } -#if NET_1_2 +#if NET_2_0 [MonoTODO] public override Evidence [] Evidences { get { throw new NotImplementedException (); diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs index 8136eec89df..394bdb08a10 100644 --- a/mcs/class/System.XML/System.Xml/XmlWriter.cs +++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs @@ -13,7 +13,7 @@ using System; namespace System.Xml { -#if NET_1_2 +#if NET_2_0 public abstract class XmlWriter : IDisposable #else public abstract class XmlWriter @@ -39,7 +39,7 @@ namespace System.Xml public abstract void Close (); -#if NET_1_2 +#if NET_2_0 public virtual void Dispose () { Close (); diff --git a/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs b/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs index afc9f334d77..7c39771f45c 100644 --- a/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs +++ b/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs @@ -5,7 +5,7 @@ // // (C) 2003 Todd Berman -#if NET_1_2 +#if NET_2_0 namespace System.Collections.Specialized { diff --git a/mcs/class/System/System.Configuration.Provider/IProvider.cs b/mcs/class/System/System.Configuration.Provider/IProvider.cs index d6e19931b48..96e366e609e 100644 --- a/mcs/class/System/System.Configuration.Provider/IProvider.cs +++ b/mcs/class/System/System.Configuration.Provider/IProvider.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; using System.Collections.Specialized; diff --git a/mcs/class/System/System.Configuration.Provider/NotSupportedByProviderException.cs b/mcs/class/System/System.Configuration.Provider/NotSupportedByProviderException.cs index 21b8a1cea7c..2e6f52f50d6 100644 --- a/mcs/class/System/System.Configuration.Provider/NotSupportedByProviderException.cs +++ b/mcs/class/System/System.Configuration.Provider/NotSupportedByProviderException.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Runtime.Serialization; namespace System.Configuration.Provider { diff --git a/mcs/class/System/System.Configuration.Provider/ProviderCollection.cs b/mcs/class/System/System.Configuration.Provider/ProviderCollection.cs index b88a7eb67a6..10c9bc4b4bd 100644 --- a/mcs/class/System/System.Configuration.Provider/ProviderCollection.cs +++ b/mcs/class/System/System.Configuration.Provider/ProviderCollection.cs @@ -7,7 +7,7 @@ // (C) 2003 Ben Maurer // -#if NET_1_2 +#if NET_2_0 using System.Collections; namespace System.Configuration.Provider { diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog index 7b6747627be..168876b1e89 100644 --- a/mcs/class/System/System.Net/ChangeLog +++ b/mcs/class/System/System.Net/ChangeLog @@ -87,7 +87,7 @@ 2004-02-18 Sebastien Pouliot <sebastien@ximian.com> * SecurityProtocolType.cs: Added missing [Serializable] to enum. Added - Default and Ssl2 to NET_1_2 profile. Enum is now internal for NET_1_0 + Default and Ssl2 to NET_2_0 profile. Enum is now internal for NET_1_0 profile (as we need it for SslClientStream). * ServicePoint.cs: Added internal SetCertificates(client,server). * ServicePointManager.cs: Added CheckCertificateRevocationList and diff --git a/mcs/class/System/System.Net/SecurityProtocolType.cs b/mcs/class/System/System.Net/SecurityProtocolType.cs index ddf607dc552..40991f473f9 100644 --- a/mcs/class/System/System.Net/SecurityProtocolType.cs +++ b/mcs/class/System/System.Net/SecurityProtocolType.cs @@ -17,7 +17,7 @@ namespace System.Net { #endif enum SecurityProtocolType { -#if NET_1_2 +#if NET_2_0 Default = -1073741824, Ssl2 = 12, #endif diff --git a/mcs/class/corlib/System.Collections.Generic/ChangeLog b/mcs/class/corlib/System.Collections.Generic/ChangeLog index 3e1ee8f22b8..2bcacac8690 100644 --- a/mcs/class/corlib/System.Collections.Generic/ChangeLog +++ b/mcs/class/corlib/System.Collections.Generic/ChangeLog @@ -23,7 +23,7 @@ 2003-11-08 Ben Maurer <bmaurer@users.sourceforge.net> - * *.cs: require NET_1_2 and GENERICS + * *.cs: require NET_2_0 and GENERICS 2003-11-07 Ben Maurer <bmaurer@users.sourceforge.net> diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs index 5ec7a2f6a34..ca18d525ca5 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs @@ -215,7 +215,7 @@ namespace System.Reflection.Emit { throw not_after_created (); } -#if NET_1_2 +#if NET_2_0 public override bool Mono_IsInflatedMethod { get { return false; diff --git a/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs b/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs index 7a7be02b725..fd8fde412a1 100644 --- a/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs +++ b/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs @@ -8,7 +8,7 @@ // (C) 2003 Ximian, Inc. http://www.ximian.com // -#if NET_1_2 +#if NET_2_0 using System; using System.Reflection; diff --git a/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs index f77ae070101..f8e387743af 100755 --- a/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs @@ -265,7 +265,7 @@ namespace System.Reflection.Emit { SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute)); } -#if NET_1_2 +#if NET_2_0 public override Type[] GetGenericArguments () { throw new NotImplementedException (); diff --git a/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs index 5b6d8e0fcf8..f2ef917a26c 100644 --- a/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/GenericTypeParameterBuilder.cs @@ -13,7 +13,7 @@ using System.Runtime.CompilerServices; using System.Globalization; using System.Runtime.Serialization; -#if NET_1_2 +#if NET_2_0 namespace System.Reflection.Emit { public sealed class GenericTypeParameterBuilder : Type diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs index 5fcb4d0d80c..9edee8e0472 100755 --- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs @@ -38,7 +38,7 @@ namespace System.Reflection.Emit { private CallingConvention native_cc; private CallingConventions call_conv; private bool init_locals = true; -#if NET_1_2 +#if NET_2_0 private GenericTypeParameterBuilder[] generic_params; #else private Object generic_params; /* so offsets are the same */ @@ -306,7 +306,7 @@ namespace System.Reflection.Emit { return new NotSupportedException ("The invoked member is not supported in a dynamic module."); } -#if NET_1_2 +#if NET_2_0 [MethodImplAttribute(MethodImplOptions.InternalCall)] public override extern MethodInfo BindGenericParameters (Type [] types); diff --git a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs index 1378ec88c11..17524355bca 100644 --- a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs @@ -174,7 +174,7 @@ namespace System.Reflection.Emit { return DefineGlobalMethod (name, attributes, callingConvention, returnType, null, null, parameterTypes, null, null); } -#if NET_1_2 +#if NET_2_0 public #else internal diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs index 9d59e8a8f63..a364d1563b0 100644 --- a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs +++ b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs @@ -135,7 +135,7 @@ namespace System.Reflection.Emit { public static readonly OpCode Ldelem_U2; public static readonly OpCode Ldelem_U4; public static readonly OpCode Ldelema; -#if NET_1_2 +#if NET_2_0 public static readonly OpCode Ldelem_Any; #endif public static readonly OpCode Ldfld; @@ -210,7 +210,7 @@ namespace System.Reflection.Emit { public static readonly OpCode Stelem_R4; public static readonly OpCode Stelem_R8; public static readonly OpCode Stelem_Ref; -#if NET_1_2 +#if NET_2_0 public static readonly OpCode Stelem_Any; #endif public static readonly OpCode Stfld; @@ -238,12 +238,12 @@ namespace System.Reflection.Emit { public static readonly OpCode Throw; public static readonly OpCode Unaligned; public static readonly OpCode Unbox; -#if NET_1_2 +#if NET_2_0 public static readonly OpCode Unbox_Any; #endif public static readonly OpCode Volatile; public static readonly OpCode Xor; -#if NET_1_2 +#if NET_2_0 public static readonly OpCode Constrained; #endif @@ -381,7 +381,7 @@ namespace System.Reflection.Emit { Isinst = new OpCode("isinst", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x75); Conv_R_Un = new OpCode("conv.r.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0x76); Unbox = new OpCode("unbox", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x79); -#if NET_1_2 +#if NET_2_0 Unbox_Any = new OpCode("unbox.any", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xa5); #endif Throw = new OpCode("throw", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref, StackBehaviour.Push0, FlowControl.Throw, 0xFF, 0x7A); @@ -407,7 +407,7 @@ namespace System.Reflection.Emit { Newarr = new OpCode("newarr", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popi, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x8D); Ldlen = new OpCode("ldlen", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x8E); Ldelema = new OpCode("ldelema", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x8F); -#if NET_1_2 +#if NET_2_0 Ldelem_Any = new OpCode("ldelem.any", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref_popi, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xA3); #endif Ldloc_3 = new OpCode("ldloc.3", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x9); @@ -433,7 +433,7 @@ namespace System.Reflection.Emit { Stelem_R4 = new OpCode("stelem.r4", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popr4, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA0); Stelem_R8 = new OpCode("stelem.r8", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popr8, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA1); Stelem_Ref = new OpCode("stelem.ref", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popref, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA2); -#if NET_1_2 +#if NET_2_0 Stelem_Any = new OpCode("stelem.any", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref_popi_popref, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA4); #endif Stloc_1 = new OpCode("stloc.1", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xB); @@ -483,7 +483,7 @@ namespace System.Reflection.Emit { Prefix1 = new OpCode("prefix1", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFE); Prefixref = new OpCode("prefixref", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFF); -#if NET_1_2 +#if NET_2_0 Constrained = new OpCode("constrained.", 2, OpCodeType.Prefix, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFE, 0x16); #endif } diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs index b4cf59dd4cc..d51e53d0343 100644 --- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs +++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs @@ -41,7 +41,7 @@ namespace System.Reflection.Emit { private ModuleBuilder pmodule; private int class_size; private PackingSize packing_size; -#if NET_1_2 +#if NET_2_0 private GenericTypeParameterBuilder[] generic_params; #else private Object generic_params; /* so offsets don't change */ @@ -357,7 +357,7 @@ namespace System.Reflection.Emit { return DefineConstructor (attributes, callingConvention, parameterTypes, null, null); } -#if NET_1_2 +#if NET_2_0 public #else internal @@ -426,7 +426,7 @@ namespace System.Reflection.Emit { return DefineMethod (name, attributes, callingConvention, returnType, null, null, parameterTypes, null, null); } -#if NET_1_2 +#if NET_2_0 public #else internal @@ -451,7 +451,7 @@ namespace System.Reflection.Emit { return DefinePInvokeMethod (name, dllName, entryName, attributes, callingConvention, returnType, null, null, parameterTypes, null, null, nativeCallConv, nativeCharSet); } -#if NET_1_2 +#if NET_2_0 public #else internal @@ -522,7 +522,7 @@ namespace System.Reflection.Emit { return DefineField (fieldName, type, null, null, attributes); } -#if NET_1_2 +#if NET_2_0 public #else internal @@ -1262,7 +1262,7 @@ namespace System.Reflection.Emit { throw new ArgumentException (argName, "Illegal name."); } -#if NET_1_2 +#if NET_2_0 public override Type[] GetGenericArguments () { if (generic_params != null) diff --git a/mcs/class/corlib/System.Reflection/MethodBase.cs b/mcs/class/corlib/System.Reflection/MethodBase.cs index 9fbd6f6ffc8..c651efa7f99 100644 --- a/mcs/class/corlib/System.Reflection/MethodBase.cs +++ b/mcs/class/corlib/System.Reflection/MethodBase.cs @@ -44,7 +44,7 @@ namespace System.Reflection { return pi.Length; } -#if NET_1_2 +#if NET_2_0 virtual #endif public Object Invoke(Object obj, Object[] parameters) { @@ -141,7 +141,7 @@ namespace System.Reflection { throw new Exception ("Method is not a builder method"); } -#if NET_1_2 +#if NET_2_0 public virtual MethodInfo BindGenericParameters (Type [] types) { throw new NotSupportedException (); diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs index 4852f7e7556..7c4f23bb8c7 100755 --- a/mcs/class/corlib/System.Reflection/MonoMethod.cs +++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs @@ -165,7 +165,7 @@ namespace System.Reflection { if (ReturnType.IsClass && ReturnType.Namespace != "") return ReturnType.Namespace + "." + ReturnType.Name + " " + Name + "(" + parms + ")"; string generic = ""; -#if NET_1_2 +#if NET_2_0 if (HasGenericParameters) { Type[] gen_params = GetGenericArguments (); generic = "["; @@ -187,7 +187,7 @@ namespace System.Reflection { ReflectionSerializationHolder.Serialize ( info, Name, ReflectedType, ToString(), MemberTypes.Method);
}
-#if NET_1_2 +#if NET_2_0 [MethodImplAttribute(MethodImplOptions.InternalCall)] public override extern MethodInfo BindGenericParameters (Type [] types); @@ -314,7 +314,7 @@ namespace System.Reflection { return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit); } -#if NET_1_2 +#if NET_2_0 [MethodImplAttribute(MethodImplOptions.InternalCall)] extern MethodInfo GetGenericMethodDefinition_impl (); diff --git a/mcs/class/corlib/System.Reflection/TypeDelegator.cs b/mcs/class/corlib/System.Reflection/TypeDelegator.cs index fa83e81292c..f513dae24bb 100755 --- a/mcs/class/corlib/System.Reflection/TypeDelegator.cs +++ b/mcs/class/corlib/System.Reflection/TypeDelegator.cs @@ -229,7 +229,7 @@ namespace System.Reflection { throw new NotImplementedException (); //return typeImpl.IsValueTypeImpl (); } -#if NET_1_2 +#if NET_2_0 public override Type[] GetGenericArguments () { throw new NotImplementedException (); diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/NewConstraintAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/NewConstraintAttribute.cs index ffc640a9634..402b3911085 100644 --- a/mcs/class/corlib/System.Runtime.CompilerServices/NewConstraintAttribute.cs +++ b/mcs/class/corlib/System.Runtime.CompilerServices/NewConstraintAttribute.cs @@ -7,7 +7,7 @@ // (C) 2004 Novell, Inc. // -#if NET_1_2 +#if NET_2_0 using System.Runtime.InteropServices; diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs index e62661ab0b0..e83bf1c6a2e 100644 --- a/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs +++ b/mcs/class/corlib/System.Security.Cryptography/CryptoConfig.cs @@ -43,7 +43,7 @@ public class CryptoConfig { // LAMESPEC: undocumented classes (also undocumented in CryptoConfig ;-) private const string defaultDSASigDesc = defaultNamespace + "DSASignatureDescription"; private const string defaultRSASigDesc = defaultNamespace + "RSAPKCS1SHA1SignatureDescription"; -#if NET_1_2 +#if NET_2_0 private const string defaultRIPEMD160 = defaultNamespace + "RIPEMD160Managed"; #endif @@ -114,7 +114,7 @@ public class CryptoConfig { private const string nameMAC3DESb = "System.Security.Cryptography.MACTripleDES"; // LAMESPEC: only documentated in ".NET Framework Security" book private const string name3DESKeyWrap = "TripleDESKeyWrap"; -#if NET_1_2 +#if NET_2_0 private const string nameRIPEMD160a = "RIPEMD160"; private const string nameRIPEMD160b = "RIPEMD-160"; private const string nameRIPEMD160c = "System.Security.Cryptography.RIPEMD160"; @@ -202,7 +202,7 @@ public class CryptoConfig { algorithms.Add (nameHMACb, defaultHMAC); algorithms.Add (nameMAC3DESa, defaultMAC3DES); algorithms.Add (nameMAC3DESb, defaultMAC3DES); -#if NET_1_2 +#if NET_2_0 algorithms.Add (nameRIPEMD160a, defaultRIPEMD160); algorithms.Add (nameRIPEMD160b, defaultRIPEMD160); algorithms.Add (nameRIPEMD160c, defaultRIPEMD160); diff --git a/mcs/class/corlib/System.Security.Cryptography/CspKeyContainerInfo.cs b/mcs/class/corlib/System.Security.Cryptography/CspKeyContainerInfo.cs index b4689c7d9b7..6ba533304dd 100755 --- a/mcs/class/corlib/System.Security.Cryptography/CspKeyContainerInfo.cs +++ b/mcs/class/corlib/System.Security.Cryptography/CspKeyContainerInfo.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/DataProtectionScope.cs b/mcs/class/corlib/System.Security.Cryptography/DataProtectionScope.cs index ffc0a45493d..5a3e226c6ad 100755 --- a/mcs/class/corlib/System.Security.Cryptography/DataProtectionScope.cs +++ b/mcs/class/corlib/System.Security.Cryptography/DataProtectionScope.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/HMAC.cs b/mcs/class/corlib/System.Security.Cryptography/HMAC.cs index bcd48f595a6..cd54e5de9e3 100755 --- a/mcs/class/corlib/System.Security.Cryptography/HMAC.cs +++ b/mcs/class/corlib/System.Security.Cryptography/HMAC.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs b/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs index 469495d6ea8..3f8e3607acb 100755 --- a/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs +++ b/mcs/class/corlib/System.Security.Cryptography/HMACMD5.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs b/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs index 848af9ed69d..26f1c323e03 100755 --- a/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs +++ b/mcs/class/corlib/System.Security.Cryptography/HMACRIPEMD160.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACSHA256.cs b/mcs/class/corlib/System.Security.Cryptography/HMACSHA256.cs index 07ce4a380f9..1c17fc041cc 100755 --- a/mcs/class/corlib/System.Security.Cryptography/HMACSHA256.cs +++ b/mcs/class/corlib/System.Security.Cryptography/HMACSHA256.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs b/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs index b2613776847..295404d5a07 100755 --- a/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs +++ b/mcs/class/corlib/System.Security.Cryptography/HMACSHA384.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs b/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs index 5cdf9119440..d605e11d39f 100755 --- a/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs +++ b/mcs/class/corlib/System.Security.Cryptography/HMACSHA512.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/ICspAsymmetricAlgorithm.cs b/mcs/class/corlib/System.Security.Cryptography/ICspAsymmetricAlgorithm.cs index 4346b7a9052..7b092df6251 100755 --- a/mcs/class/corlib/System.Security.Cryptography/ICspAsymmetricAlgorithm.cs +++ b/mcs/class/corlib/System.Security.Cryptography/ICspAsymmetricAlgorithm.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/KeyNumber.cs b/mcs/class/corlib/System.Security.Cryptography/KeyNumber.cs index 622bb1cb06a..8bd8e736759 100755 --- a/mcs/class/corlib/System.Security.Cryptography/KeyNumber.cs +++ b/mcs/class/corlib/System.Security.Cryptography/KeyNumber.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/MemoryProtectionScope.cs b/mcs/class/corlib/System.Security.Cryptography/MemoryProtectionScope.cs index 06290653358..d8298de3a62 100755 --- a/mcs/class/corlib/System.Security.Cryptography/MemoryProtectionScope.cs +++ b/mcs/class/corlib/System.Security.Cryptography/MemoryProtectionScope.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs b/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs index 7d1b6d7c68e..748f5fe108b 100644 --- a/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs +++ b/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs @@ -20,7 +20,7 @@ namespace System.Security.Cryptography { None = 0x1, PKCS7, // Each byte contains the value of the number of padding bytes. Zeros, // Append zeros to the message. -#if NET_1_2 +#if NET_2_0 ANSIX923, // ISO10126 // #endif diff --git a/mcs/class/corlib/System.Security.Cryptography/ProtectedData.cs b/mcs/class/corlib/System.Security.Cryptography/ProtectedData.cs index 5973e1c37b6..dc3d48aed3b 100755 --- a/mcs/class/corlib/System.Security.Cryptography/ProtectedData.cs +++ b/mcs/class/corlib/System.Security.Cryptography/ProtectedData.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/ProtectedMemory.cs b/mcs/class/corlib/System.Security.Cryptography/ProtectedMemory.cs index e068acc4829..dec9579ddbc 100755 --- a/mcs/class/corlib/System.Security.Cryptography/ProtectedMemory.cs +++ b/mcs/class/corlib/System.Security.Cryptography/ProtectedMemory.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs index 930f9634e10..81bf5650cbb 100755 --- a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs +++ b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160.cs @@ -7,7 +7,7 @@ // (C) 2003 The Mentalis.org Team (http://www.mentalis.org/) // -#if NET_1_2 +#if NET_2_0 using System; diff --git a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs index d10d80a61db..c36d8854b76 100755 --- a/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs +++ b/mcs/class/corlib/System.Security.Cryptography/RIPEMD160Managed.cs @@ -10,7 +10,7 @@ // - http://www.esat.kuleuven.ac.be/~cosicart/ps/AB-9601/ // -#if NET_1_2 +#if NET_2_0 using System; using System.Runtime.InteropServices; diff --git a/mcs/class/corlib/System.Security.Cryptography/Rfc2898DeriveBytes.cs b/mcs/class/corlib/System.Security.Cryptography/Rfc2898DeriveBytes.cs index 98d7e1f8e78..e49817b7713 100755 --- a/mcs/class/corlib/System.Security.Cryptography/Rfc2898DeriveBytes.cs +++ b/mcs/class/corlib/System.Security.Cryptography/Rfc2898DeriveBytes.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using System.Text; diff --git a/mcs/class/corlib/System/MonoType.cs b/mcs/class/corlib/System/MonoType.cs index 4ebe6b53674..686a077471e 100644 --- a/mcs/class/corlib/System/MonoType.cs +++ b/mcs/class/corlib/System/MonoType.cs @@ -494,7 +494,7 @@ namespace System UnitySerializationHolder.GetTypeData (this, info, context); } -#if NET_1_2 +#if NET_2_0 [MethodImplAttribute(MethodImplOptions.InternalCall)] public extern override Type [] GetGenericArguments (); diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs index 90d6b61d3fa..9c7407ebbcf 100644 --- a/mcs/class/corlib/System/Type.cs +++ b/mcs/class/corlib/System/Type.cs @@ -919,7 +919,7 @@ namespace System { return FullName; } -#if NET_1_2 +#if NET_2_0 public abstract Type[] GetGenericArguments (); public abstract bool HasGenericArguments { diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/HMACMD5Test.cs b/mcs/class/corlib/Test/System.Security.Cryptography/HMACMD5Test.cs index 25b42fafcb9..288a43f43d0 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/HMACMD5Test.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/HMACMD5Test.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; using System; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/HMACRIPEMD160Test.cs b/mcs/class/corlib/Test/System.Security.Cryptography/HMACRIPEMD160Test.cs index 46445218fd9..d37b0c4cba8 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/HMACRIPEMD160Test.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/HMACRIPEMD160Test.cs @@ -8,7 +8,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; using System; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/HMACSHA256Test.cs b/mcs/class/corlib/Test/System.Security.Cryptography/HMACSHA256Test.cs index b58bde0fbd6..4c0eaa5f677 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/HMACSHA256Test.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/HMACSHA256Test.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; using System; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedDataTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedDataTest.cs index b8cf08cedfb..27e2d5bb237 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedDataTest.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedDataTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedMemoryTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedMemoryTest.cs index 6892e77ec7b..a8827ff41f1 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedMemoryTest.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/ProtectedMemoryTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160ManagedTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160ManagedTest.cs index a7d8d213d8b..2341c343d59 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160ManagedTest.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160ManagedTest.cs @@ -8,7 +8,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using System; using NUnit.Framework; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160Test.cs b/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160Test.cs index a6964bbd51f..05479f75e85 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160Test.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/RIPEMD160Test.cs @@ -8,7 +8,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; using System; diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/Rfc2898DeriveBytesTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/Rfc2898DeriveBytesTest.cs index 45ad175cd7e..9afa6f00238 100755 --- a/mcs/class/corlib/Test/System.Security.Cryptography/Rfc2898DeriveBytesTest.cs +++ b/mcs/class/corlib/Test/System.Security.Cryptography/Rfc2898DeriveBytesTest.cs @@ -7,7 +7,7 @@ // (C) 2003 Motus Technologies Inc. (http://www.motus.com) // -#if NET_1_2 +#if NET_2_0 using NUnit.Framework; |