mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.Web/Test/System.Web.Util/TransactionsCas.cs
View File

@ -60,11 +60,6 @@ namespace MonoCasTests.System.Web.Util {
try {
Transactions.InvokeTransacted (new TransactedCallback (Callback), TransactionOption.Required);
}
#if ONLY_1_1
catch (TypeInitializationException) {
// under 1.x, this _can_ trigger initialization of HttpRuntime
}
#endif
catch (PlatformNotSupportedException) {
// Mono and Windows prior to NT
}
@ -79,11 +74,6 @@ namespace MonoCasTests.System.Web.Util {
bool aborted = false;
Transactions.InvokeTransacted (new TransactedCallback (Callback), TransactionOption.Required, ref aborted);
}
#if ONLY_1_1
catch (TypeInitializationException) {
// under 1.x, this _can_ trigger initialization of HttpRuntime
}
#endif
catch (PlatformNotSupportedException) {
// Mono and Windows prior to NT
}

2
mcs/class/System.Web/Test/System.Web.Util/UrlUtilsTest.cs
View File

@ -25,7 +25,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
using System.Web;
@ -67,4 +66,3 @@ namespace MonoTests.System.Web.Util
}
}
}
#endif