Permalink
Browse files

Removal of NET_1_1 defines and some NET_2_0; Both defines are true th…

…ese days in Mono, no versions prior to 2.0 are supported
  • Loading branch information...
1 parent ae0feab commit 086885471f571215c413ad955906f2ec34800048 @migueldeicaza migueldeicaza committed Jun 1, 2012
View
@@ -35,15 +35,6 @@
a MonoTODO, this will be useful in the future for our
automated tools that can assist in developers porting their code.
-* Supporting .NET 1.2, .NET 1.1 and .NET 1.0 builds
-
- 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,
- ONLY_1_1
-
* Tagging buggy code
If there is a bug in your implementation tag the problem by using
@@ -62,14 +62,8 @@
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile("../msfinal.pub")]
-#if NET_2_0
- [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
- [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
- [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
- [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
- [assembly: ComVisible (true)]
-#elif NET_1_1
- [assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
- [assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: ComVisible (true)]
@@ -31,7 +31,6 @@
namespace System.EnterpriseServices {
-#if NET_1_1
[ComVisible(false)]
public sealed class ServiceDomain {
#region Constructors
@@ -58,5 +57,4 @@ public static TransactionStatus Leave ()
#endregion
}
-#endif
}
@@ -61,14 +61,8 @@
[assembly: AssemblyKeyFile ("../msfinal.pub")]
#endif
-#if NET_2_0
- [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
- [assembly: ComVisible (true)]
- [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
- [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
- [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1
- [assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
- [assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: ComVisible (true)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
@@ -256,9 +256,7 @@ internal class BindingInfo
public BindingInfo (WebServiceBindingAttribute at, string name, string ns)
{
if (at != null) {
-#if NET_1_1
Name = at.Name;
-#endif
Namespace = at.Namespace;
Location = at.Location;
WebServiceBindingAttribute = at;
@@ -72,16 +72,7 @@
[assembly: AllowPartiallyTrustedCallers]
#endif
-#if NET_2_0
- [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
- [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-// [assembly: InternalsVisibleTo ("System.Data.SqlXml, PublicKey=00000000000000000400000000000000")]
- [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
- [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1
- [assembly: AssemblyTrademark ("")]
- [assembly: AssemblyConfiguration ("")]
-#elif NET_1_0
- [assembly: AssemblyTrademark ("")]
- [assembly: AssemblyConfiguration ("")]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
@@ -172,7 +172,7 @@ public int ReceiveBufferSize
get { return HttpVersion.Version11.Equals (protocolVersion); }
}
-#if NET_1_1
+
public bool Expect100Continue {
get { return SendContinue; }
set { SendContinue = value; }
@@ -182,7 +182,6 @@ public int ReceiveBufferSize
get { return useNagle; }
set { useNagle = value; }
}
-#endif
internal bool SendContinue {
get { return sendContinue &&
@@ -23,9 +23,7 @@
// behind its back (P/Invoke puts for example).
// System.Console needs to get the DELETE character, and report accordingly.
//
-#if NET_2_0 || NET_1_1
#define IN_MCS_BUILD
-#endif
// Only compile this code in the 2.0 profile, but not in the Moonlight one
#if (IN_MCS_BUILD && NET_2_0 && !SMCS_SOURCE) || !IN_MCS_BUILD
@@ -259,11 +259,7 @@ public void Run (string[] args)
} else {
typename = param.Substring (0, comma);
string asmName = param.Substring (comma + 1);
-#if NET_1_1
Assembly asm = Assembly.LoadFile (asmName);
-#else
- Assembly asm = Assembly.LoadFrom (asmName);
-#endif
if (asm == null)
Error (generatorAssemblyNotFound, asmName);
generatorType = asm.GetType (typename);

0 comments on commit 0868854

Please sign in to comment.