Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2014-09-26 16:43:36 +0400
committerAlexander Köplinger <alex.koeplinger@outlook.com>2015-01-17 07:45:39 +0300
commit746650d1b93114b60feb155c2ee778a9e16ccb6d (patch)
treef8e1eb791640ba6fd887da5e64cde3a1139b42b0 /mcs/class/SystemWebTestShim
parent7d1cd56c5d97683f6dae35cb9143d8789b71c2de (diff)
[bcl] Remove more NET_2_0 checks from class libs
Diffstat (limited to 'mcs/class/SystemWebTestShim')
-rw-r--r--mcs/class/SystemWebTestShim/SystemWebTestShim/Adapters.cs2
-rw-r--r--mcs/class/SystemWebTestShim/SystemWebTestShim/BuildManager.cs2
-rw-r--r--mcs/class/SystemWebTestShim/SystemWebTestShim/HttpCapabilitiesBase.cs2
-rw-r--r--mcs/class/SystemWebTestShim/SystemWebTestShim/Page.cs2
-rw-r--r--mcs/class/SystemWebTestShim/SystemWebTestShim/UrlUtils.cs2
5 files changed, 1 insertions, 9 deletions
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim/Adapters.cs b/mcs/class/SystemWebTestShim/SystemWebTestShim/Adapters.cs
index 9016b9b8f64..c0af20f5427 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim/Adapters.cs
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim/Adapters.cs
@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using System.Collections;
using System.IO;
@@ -106,4 +105,3 @@ namespace SystemWebTestShim {
}
}
-#endif
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim/BuildManager.cs b/mcs/class/SystemWebTestShim/SystemWebTestShim/BuildManager.cs
index 1a6481c6ba8..8b3cfdb52d7 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim/BuildManager.cs
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim/BuildManager.cs
@@ -32,7 +32,7 @@ namespace SystemWebTestShim {
public class BuildManager {
public static void SuppressDebugModeMessages ()
{
-#if NET_2_0 && !TARGET_DOTNET
+#if !TARGET_DOTNET
global::System.Web.Compilation.BuildManager.suppressDebugModeMessages = true;
#endif
}
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim/HttpCapabilitiesBase.cs b/mcs/class/SystemWebTestShim/SystemWebTestShim/HttpCapabilitiesBase.cs
index d51b2664203..b60b3a57a59 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim/HttpCapabilitiesBase.cs
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim/HttpCapabilitiesBase.cs
@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using Orig = System.Web.Configuration.HttpCapabilitiesBase;
@@ -45,4 +44,3 @@ namespace SystemWebTestShim {
}
}
-#endif
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim/Page.cs b/mcs/class/SystemWebTestShim/SystemWebTestShim/Page.cs
index b8987b3dd59..644d2387656 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim/Page.cs
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim/Page.cs
@@ -33,7 +33,6 @@ using System.Web;
namespace SystemWebTestShim {
public class Page : Orig.Page {
-#if NET_2_0
public new string RawViewState {
#if TARGET_DOTNET
set; private get;
@@ -48,6 +47,5 @@ namespace SystemWebTestShim {
base.SetContext (ctx);
#endif
}
-#endif
}
}
diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim/UrlUtils.cs b/mcs/class/SystemWebTestShim/SystemWebTestShim/UrlUtils.cs
index 2563a016975..1f73ec7ea23 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim/UrlUtils.cs
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim/UrlUtils.cs
@@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
using Orig = System.Web.Util.UrlUtils;
@@ -41,4 +40,3 @@ namespace SystemWebTestShim {
}
}
-#endif \ No newline at end of file