diff --git a/src/Spring/Spring.Web/Web/Support/Result.cs b/src/Spring/Spring.Web/Web/Support/Result.cs index 558755da..39e036b7 100644 --- a/src/Spring/Spring.Web/Web/Support/Result.cs +++ b/src/Spring/Spring.Web/Web/Support/Result.cs @@ -234,15 +234,13 @@ namespace Spring.Web.Support get { return (Mode == ResultMode.Transfer); } } -#if !NET_1_0 - /// - /// Indicates, if should be called with endResponse='true' | 'false'. Only relevant for ResultMode.RedirectXXXX modes. - /// + /// + /// Indicates, if should be called with endResponse='true' | 'false'. Only relevant for ResultMode.RedirectXXXX modes. + /// public bool EndResponse { get { return (Mode == ResultMode.Redirect); } } -#endif #endregion @@ -259,9 +257,7 @@ namespace Spring.Web.Support switch (Mode) { case ResultMode.Redirect: -#if !NET_1_0 case ResultMode.RedirectNoAbort: -#endif DoRedirect( context ); break; case ResultMode.Transfer: @@ -325,11 +321,7 @@ namespace Spring.Web.Support /// protected virtual void DoRedirect( object context ) { -#if !NET_1_0 HttpContext.Current.Response.Redirect( GetRedirectUri( context ), EndResponse ); -#else - HttpContext.Current.Response.Redirect( GetRedirectUri( context ) ); -#endif } /// diff --git a/src/Spring/Spring.Web/Web/Support/ResultMode.cs b/src/Spring/Spring.Web/Web/Support/ResultMode.cs index f4d089d4..59adbc51 100644 --- a/src/Spring/Spring.Web/Web/Support/ResultMode.cs +++ b/src/Spring/Spring.Web/Web/Support/ResultMode.cs @@ -70,7 +70,6 @@ namespace Spring.Web.Support /// TransferNoPreserve = 2, -#if !NET_1_0 /// /// A redirect. /// @@ -82,7 +81,5 @@ namespace Spring.Web.Support /// /// RedirectNoAbort = 3 -#endif - } } diff --git a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs index 96089ca9..c66a6b6a 100644 --- a/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Support/ResultTests.cs @@ -148,7 +148,6 @@ namespace Spring.Web.Support "from the result string passed into the ctor."); } -#if !NET_1_0 [Test] public void WithRedirectNoAbortResultMode() { @@ -163,8 +162,6 @@ namespace Spring.Web.Support "from the result string passed into the ctor."); } -#endif - [Test] [ExpectedException(typeof(ArgumentOutOfRangeException))] public void WithRubbishResultMode()