From: Johan Lorensson Date: Mon, 24 Oct 2016 09:53:15 +0000 (+0200) Subject: Merge pull request #3442 from lateralusX/jlorenss/win-atexit-commands X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=59ddb222e093ce41efe12432a8f0a4ea0785c219;hp=bdbea3589f23bbd25e0325a6c1c7cb544e3bddc7;p=mono.git Merge pull request #3442 from lateralusX/jlorenss/win-atexit-commands Add support on Windows to install atexit handler(s) early in bootprocess. --- diff --git a/configure.ac b/configure.ac index c644a7c4202..aed6989394d 100644 --- a/configure.ac +++ b/configure.ac @@ -3930,7 +3930,10 @@ dnl ************** AC_ARG_ENABLE(btls, [ --disable-btls Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED) AC_ARG_WITH(btls_android_ndk, [ --with-btls-android-ndk Android NDK for BoringTls]) +AC_ARG_ENABLE(dynamic-btls, [ --enable-dynamic-btls Place the BTLS provider into a separate shared library/archive.], enable_dynamic_btls=$enableval, enable_dynamic_btls=no) + AM_CONDITIONAL(BTLS, test x$enable_btls = xyes) +AM_CONDITIONAL(DYNAMIC_BTLS, test x$enable_dynamic_btls = xyes) btls_android=no if test "x$enable_btls" = "xyes"; then @@ -3999,6 +4002,10 @@ if test "x$enable_btls" = "xyes"; then AC_SUBST(BTLS_CMAKE_ARGS) AC_DEFINE(HAVE_BTLS, 1, [BoringTls is supported]) + + if test "x$enable_dynamic_btls" = "xyes"; then + AC_DEFINE(HAVE_DYNAMIC_BTLS, 1, [BTLS in a shared libraty]) + fi else enable_btls=no fi @@ -4407,6 +4414,9 @@ fi echo "AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make fi + if test "x$enable_dynamic_btls" = "xyes"; then + echo "DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make + fi fi ) diff --git a/data/config.in b/data/config.in index b4b7243ecfd..be831514293 100644 --- a/data/config.in +++ b/data/config.in @@ -11,6 +11,7 @@ + diff --git a/external/boringssl b/external/boringssl index 432738a3c93..9ad688f0ae6 160000 --- a/external/boringssl +++ b/external/boringssl @@ -1 +1 @@ -Subproject commit 432738a3c938b4f751307301c6aa07f2027a8864 +Subproject commit 9ad688f0ae679b32e9c0a9b21bb63a4488c28b6b diff --git a/external/cecil b/external/cecil index f38c0f5d99b..3f37ebd52b4 160000 --- a/external/cecil +++ b/external/cecil @@ -1 +1 @@ -Subproject commit f38c0f5d99b6e44fa906d14e1146fa65a3806cd3 +Subproject commit 3f37ebd52b49e1a9ab3bfbc5881b6da01c134c0d diff --git a/mcs/class/Accessibility/Accessibility-net_4_x.csproj b/mcs/class/Accessibility/Accessibility-net_4_x.csproj index 50cdfcf6868..845a5848fef 100644 --- a/mcs/class/Accessibility/Accessibility-net_4_x.csproj +++ b/mcs/class/Accessibility/Accessibility-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj index 2539a5b4b18..08e26fc92cb 100644 --- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj +++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj b/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj index 2c40504aa63..93838aac814 100644 --- a/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj +++ b/mcs/class/Cscompmgd/Cscompmgd-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj index bf2bc3fb533..04b96a98159 100644 --- a/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj +++ b/mcs/class/CustomMarshalers/CustomMarshalers-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj index ef4329f1ed1..fe2088a1e88 100644 --- a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj +++ b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj index 1bca67282f6..2a7617ed842 100644 --- a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj +++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -54,7 +54,9 @@ + + + + false + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + {584A5E46-2958-4CB2-8DF9-188B420D0BB0} + System.Drawing-net_4_x + + + + + + + diff --git a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj index 076b4d9bfa0..1d5958c3158 100644 --- a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj +++ b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj index d0aa63ef3cf..b747686d4c5 100644 --- a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj +++ b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj index 66212877264..6a3f8bfd5ee 100644 --- a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj +++ b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -54,7 +54,11 @@ + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + + + + + diff --git a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj index 53e18fa4825..a09663524d7 100644 --- a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj index 1f6584376e9..199082affd9 100644 --- a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj index 3b0e5112389..c1189dbb2b3 100644 --- a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj index 0a126a61c73..d7bb4038ee2 100644 --- a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -86,6 +86,10 @@ {2762E921-91A8-4C87-91E9-BA628013F753} System-net_4_x + + {359142A1-D80F-401E-AA64-7167C9317649} + System.Core-net_4_x + diff --git a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj index 18aa2ae6185..1b0acb79e5d 100644 --- a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj index 53c26f634d1..9a152577383 100644 --- a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj index 7e2fc1e0a86..1d82a342075 100644 --- a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj +++ b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -55,6 +55,7 @@ + + + false + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + + + + + diff --git a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj index c478e7918cc..dffbbe8c637 100644 --- a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj +++ b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj index 5c8474d8caa..fb72efbf238 100644 --- a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj +++ b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj index 3128965240d..8b835f18954 100644 --- a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj +++ b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj index 2a7daad7c16..3c7f244fbfa 100644 --- a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj +++ b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699,1616,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699,1616,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -54,7 +54,9 @@ + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + {42D59DE7-586F-4ACF-BDD5-E7869E39E3EF} + Mono.Security-net_4_x + + + + + + + diff --git a/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj b/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj index 1f86305857f..4212c2096c6 100644 --- a/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj +++ b/mcs/class/Mono.C5/Mono.C5-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,169,219,414,1030,3001,3005,3006 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,169,219,414,1030,3001,3005,3006 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj index 36c99153b49..1f6bfa31b8e 100644 --- a/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj +++ b/mcs/class/Mono.CSharp/Mono.CSharp-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_FEATURE_THREAD_ABORT + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;MONO_FEATURE_THREAD_ABORT prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_FEATURE_THREAD_ABORT + NET_4_0;NET_4_5;NET_4_6;MONO;MONO_FEATURE_THREAD_ABORT prompt 4 diff --git a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj b/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj index 51868debb9f..46fd8e762a4 100644 --- a/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj +++ b/mcs/class/Mono.Cairo/Mono.Cairo-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj index c4aee220b49..bdedbfe2d8d 100644 --- a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj +++ b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_x.csproj @@ -33,7 +33,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CECIL + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;CECIL prompt 4 @@ -41,7 +41,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CECIL + NET_4_0;NET_4_5;NET_4_6;MONO;CECIL prompt 4 @@ -53,13 +53,9 @@ - - - - - - - + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + + + + + diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj index 3089b404bdf..62e55d55d22 100644 --- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj +++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,414 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,414 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -93,13 +93,13 @@ + - - + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + + + + + diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj index 5601f7c47a1..2b3eb08330b 100644 --- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj +++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj index d5192c051b0..85b88dc5e00 100644 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj index f5de8b68d7f..41d0ca69a6e 100644 --- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj +++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,168,169,219,414 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NO_DYNAMIC_CODEGEN;NET_3_0 + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NO_DYNAMIC_CODEGEN;NET_3_0 prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,168,169,219,414 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NO_DYNAMIC_CODEGEN;NET_3_0 + NET_4_0;NET_4_5;NET_4_6;MONO;NO_DYNAMIC_CODEGEN;NET_3_0 prompt 4 @@ -206,6 +206,7 @@ + @@ -254,10 +255,6 @@ {5769B536-7E8E-4C2A-8671-6B256D0F620B} System.ServiceModel.Internals-net_4_x - - {8B8C3ED9-96F9-49B3-B355-9FD3D29DD3AD} - SMDiagnostics-net_4_x - {EC439BB8-FFED-4A32-A05D-2FA3A70CAD64} System.Data-net_4_x @@ -266,6 +263,10 @@ {D5CDC09C-F19A-4811-A6C8-70F51CBFB644} System.Configuration-net_4_x + + {8B8C3ED9-96F9-49B3-B355-9FD3D29DD3AD} + SMDiagnostics-net_4_x + diff --git a/mcs/class/System.Security/System.Security-net_4_x.csproj b/mcs/class/System.Security/System.Security-net_4_x.csproj index c272c83959d..bbe95fc7dad 100644 --- a/mcs/class/System.Security/System.Security-net_4_x.csproj +++ b/mcs/class/System.Security/System.Security-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,618,414 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;SECURITY_DEP prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,618,414 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SECURITY_DEP + NET_4_0;NET_4_5;NET_4_6;MONO;SECURITY_DEP prompt 4 diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj index e959175b733..872a55bc055 100644 --- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj +++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj index 3f021276d44..e6c52711f48 100644 --- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj +++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0 + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_3_0 prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0 + NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_3_0 prompt 4 diff --git a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj index 39e5a6128f2..80a51f65d3d 100644 --- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj +++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_FEATURE_MULTIPLE_APPDOMAINS + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;MONO_FEATURE_MULTIPLE_APPDOMAINS prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_FEATURE_MULTIPLE_APPDOMAINS + NET_4_0;NET_4_5;NET_4_6;MONO;MONO_FEATURE_MULTIPLE_APPDOMAINS prompt 4 diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj index 35714061b5b..e77846e4b0f 100644 --- a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj +++ b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0 + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_3_0 prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0 + NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_3_0 prompt 4 diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj index 6724c378631..6eb906063d5 100644 --- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj +++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0 + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_3_0 prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;NET_3_0 + NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_3_0 prompt 4 diff --git a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs index 4f5776d2736..f4779a1e600 100644 --- a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs @@ -82,4 +82,13 @@ using System.Runtime.InteropServices; #endif +#if !MOBILE + +[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.BinarySecretKeyIdentifierClause))] +[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.KeyNameIdentifierClause))] +[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.SecurityContextKeyIdentifierClause))] +[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.X509CertificateValidationMode))] +[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.Tokens.BinarySecretSecurityToken))] +[assembly: TypeForwardedTo (typeof (System.ServiceModel.Security.Tokens.WrappedKeySecurityToken))] +#endif diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj index e986534126d..b54ee17594c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj +++ b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,414,169,67,3005,436,219,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;TRACE;NET_3_0;HAS_ACTIVATION + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;TRACE;NET_3_0;HAS_ACTIVATION prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,414,169,67,3005,436,219,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;TRACE;NET_3_0;HAS_ACTIVATION + NET_4_0;NET_4_5;NET_4_6;MONO;TRACE;NET_3_0;HAS_ACTIVATION prompt 4 @@ -827,14 +827,12 @@ - - @@ -868,10 +866,8 @@ - - @@ -884,7 +880,6 @@ - @@ -894,7 +889,6 @@ - @@ -1002,6 +996,7 @@ + @@ -1102,6 +1097,10 @@ {D845AD9D-3CCB-49CB-9543-028678E94938} System.Runtime.Serialization-net_4_x + + {FA718FA9-32C2-4BAC-BAAB-DB3A7A326D4C} + System.IdentityModel-net_4_x + {D5CDC09C-F19A-4811-A6C8-70F51CBFB644} System.Configuration-net_4_x @@ -1114,10 +1113,6 @@ {3ED36717-A9D1-4289-8949-9B7F39766DEB} System.Security-net_4_x - - {FA718FA9-32C2-4BAC-BAAB-DB3A7A326D4C} - System.IdentityModel-net_4_x - {BBA32980-B28C-476D-AEB0-892F1B1DFB5E} System.IdentityModel.Selectors-net_4_x diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj index 4608b887c5e..9b138be6a04 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj +++ b/mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,414,169,67,3005,436,219,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;TRACE;NET_3_0 + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;TRACE;NET_3_0 prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,414,169,67,3005,436,219,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;TRACE;NET_3_0 + NET_4_0;NET_4_5;NET_4_6;MONO;TRACE;NET_3_0 prompt 4 @@ -827,14 +827,12 @@ - - @@ -868,10 +866,8 @@ - - @@ -884,7 +880,6 @@ - @@ -894,7 +889,6 @@ - @@ -1002,6 +996,7 @@ + @@ -1102,6 +1097,10 @@ {D845AD9D-3CCB-49CB-9543-028678E94938} System.Runtime.Serialization-net_4_x + + {FA718FA9-32C2-4BAC-BAAB-DB3A7A326D4C} + System.IdentityModel-net_4_x + {D5CDC09C-F19A-4811-A6C8-70F51CBFB644} System.Configuration-net_4_x @@ -1114,10 +1113,6 @@ {3ED36717-A9D1-4289-8949-9B7F39766DEB} System.Security-net_4_x - - {FA718FA9-32C2-4BAC-BAAB-DB3A7A326D4C} - System.IdentityModel-net_4_x - {BBA32980-B28C-476D-AEB0-892F1B1DFB5E} System.IdentityModel.Selectors-net_4_x diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpChannelListener.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpChannelListener.cs index 9fc6f5d9217..598ce394029 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpChannelListener.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels.NetTcp/TcpChannelListener.cs @@ -201,13 +201,13 @@ namespace System.ServiceModel.Channels.NetTcp if (accept_handles.Count > 0) accept_handles [0].Set (); } - } catch { + } catch (ObjectDisposedException) { /* If an accept fails, just ignore it. Maybe the remote peer disconnected already */ } finally { if (State == CommunicationState.Opened) { try { listener.BeginAcceptTcpClient (TcpListenerAcceptedClient, listener); - } catch { + } catch (ObjectDisposedException) { /* If this fails, we must have disposed the listener */ } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/BinarySecretSecurityToken.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/BinarySecretSecurityToken.cs deleted file mode 100644 index 464c936cc2e..00000000000 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/BinarySecretSecurityToken.cs +++ /dev/null @@ -1,119 +0,0 @@ -// -// BinarySecretSecurityToken.cs -// -// Author: -// Atsushi Enomoto -// -// Copyright (C) 2006 Novell, Inc. http://www.novell.com -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using System; -using System.Collections.ObjectModel; -using System.Xml; -using System.IdentityModel.Policy; -using System.IdentityModel.Tokens; - -namespace System.ServiceModel.Security.Tokens -{ - public class BinarySecretSecurityToken : SecurityToken - { - ReadOnlyCollection keys; - - string id; - byte [] key; - bool allow_crypto; - DateTime valid_from = DateTime.Now.ToUniversalTime (); - - BinarySecretSecurityToken (string id, bool allowCrypto) - { - this.id = id; - allow_crypto = allowCrypto; - } - - public BinarySecretSecurityToken (byte [] key) - : this ("uuid:" + Guid.NewGuid ().ToString (), key) - { - } - - public BinarySecretSecurityToken (string id, byte [] key) - : this (id, key, false) - { - } - - protected BinarySecretSecurityToken (string id, byte [] key, bool allowCrypto) - : this (id, allowCrypto) - { - if (key == null) - throw new ArgumentNullException ("key"); - this.key = key; - - SecurityKey [] arr = new SecurityKey [] {new InMemorySymmetricSecurityKey (key)}; - keys = new ReadOnlyCollection (arr); - } - - public BinarySecretSecurityToken (int keySizeInBits) - : this ("uuid:" + Guid.NewGuid ().ToString (), keySizeInBits) - { - } - - public BinarySecretSecurityToken (string id, int keySizeInBits) - : this (id, keySizeInBits, false) - { - } - - protected BinarySecretSecurityToken (string id, int keySizeInBits, bool allowCrypto) - : this (id, allowCrypto) - { - if (keySizeInBits < 0) - throw new ArgumentOutOfRangeException ("keySizeInBits"); - - this.key = new byte [keySizeInBits >> 3 + (keySizeInBits % 8 == 0 ? 0 : 1)]; - - SecurityKey [] arr = new SecurityKey [] {new InMemorySymmetricSecurityKey (key)}; - keys = new ReadOnlyCollection (arr); - } - - public override DateTime ValidFrom { - get { return valid_from; } - } - - public override DateTime ValidTo { - get { return DateTime.MaxValue.AddDays (-1); } - } - - public override string Id { - get { return id; } - } - - public int KeySize { - get { return key.Length; } - } - - public override ReadOnlyCollection SecurityKeys { - get { return keys; } - } - - public byte [] GetKeyBytes () - { - return (byte []) key.Clone (); - } - } -} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/InternalEncryptedKeyIdentifierClause.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/InternalEncryptedKeyIdentifierClause.cs deleted file mode 100644 index 95e43342561..00000000000 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/InternalEncryptedKeyIdentifierClause.cs +++ /dev/null @@ -1,51 +0,0 @@ -// -// InternalEncryptedKeyIdentifierClause.cs -// -// Author: -// Atsushi Enomoto -// -// Copyright (C) 2007 Novell, Inc. http://www.novell.com -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using System; -using System.Collections.ObjectModel; -using System.Security.Cryptography.Xml; -using System.Xml; -using System.IdentityModel.Tokens; - -namespace System.ServiceModel.Security.Tokens -{ - internal class InternalEncryptedKeyIdentifierClause : BinaryKeyIdentifierClause - { - public InternalEncryptedKeyIdentifierClause (byte [] hash) - : base (null, hash, false) - { - } - - public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) - { - InternalEncryptedKeyIdentifierClause kic = keyIdentifierClause as InternalEncryptedKeyIdentifierClause; - if (kic == null) - return false; - return Matches (kic.GetRawBuffer ()); - } - } -} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/WrappedKeySecurityToken.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/WrappedKeySecurityToken.cs deleted file mode 100644 index d3c47f24328..00000000000 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/WrappedKeySecurityToken.cs +++ /dev/null @@ -1,176 +0,0 @@ -// -// WrappedKeySecurityToken.cs -// -// Author: -// Atsushi Enomoto -// -// Copyright (C) 2006 Novell, Inc. http://www.novell.com -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using System; -using System.Collections.ObjectModel; -using System.Security.Cryptography; -using System.Security.Cryptography.Xml; -using System.Xml; -using System.IdentityModel.Policy; -using System.IdentityModel.Tokens; - -namespace System.ServiceModel.Security.Tokens -{ - public class WrappedKeySecurityToken : SecurityToken - { - string id; - byte [] raw_key; - byte [] wrapped_key; - string wrap_alg; - SecurityToken wrap_token; - SecurityKeyIdentifier wrap_token_ref; - DateTime valid_from = DateTime.Now.ToUniversalTime (); - ReadOnlyCollection keys; - ReferenceList reference_list; - byte [] keyhash; - - public WrappedKeySecurityToken ( - string id, - byte [] keyToWrap, - string wrappingAlgorithm, - SecurityToken wrappingToken, - SecurityKeyIdentifier wrappingTokenReference) - { - if (id == null) - throw new ArgumentNullException ("id"); - if (keyToWrap == null) - throw new ArgumentNullException ("keyToWrap"); - if (wrappingAlgorithm == null) - throw new ArgumentNullException ("wrappingAlgorithm"); - if (wrappingToken == null) - throw new ArgumentNullException ("wrappingToken"); - - raw_key = keyToWrap; - this.id = id; - wrap_alg = wrappingAlgorithm; - wrap_token = wrappingToken; - wrap_token_ref = wrappingTokenReference; - Collection l = new Collection (); - foreach (SecurityKey sk in wrappingToken.SecurityKeys) { - if (sk.IsSupportedAlgorithm (wrappingAlgorithm)) { - wrapped_key = sk.EncryptKey (wrappingAlgorithm, keyToWrap); - l.Add (new InMemorySymmetricSecurityKey (keyToWrap)); - break; - } - } - keys = new ReadOnlyCollection (l); - if (wrapped_key == null) - throw new ArgumentException (String.Format ("None of the security keys in the argument token supports specified wrapping algorithm '{0}'", wrappingAlgorithm)); - } - - internal byte [] RawKey { - get { return raw_key; } - } - - // It is kind of compromised solution to output - // ReferenceList inside e:EncryptedKey and might disappear - // when non-wrapped key is represented by another token type. - internal ReferenceList ReferenceList { - get { return reference_list; } - set { reference_list = value; } - } - - public override DateTime ValidFrom { - get { return valid_from; } - } - - public override DateTime ValidTo { - get { return DateTime.MaxValue.AddDays (-1); } - } - - public override string Id { - get { return id; } - } - - public override ReadOnlyCollection SecurityKeys { - get { return keys; } - } - - public string WrappingAlgorithm { - get { return wrap_alg; } - } - - public SecurityToken WrappingToken { - get { return wrap_token; } - } - - public SecurityKeyIdentifier WrappingTokenReference { - get { return wrap_token_ref; } - } - - public byte [] GetWrappedKey () - { - return (byte []) wrapped_key.Clone (); - } - - internal void SetWrappedKey (byte [] value) - { - wrapped_key = (byte []) value.Clone (); - } - - [MonoTODO] - public override bool CanCreateKeyIdentifierClause () - { - /* - foreach (SecurityKeyIdentifierClause k in WrappingTokenReference) { - Type t = k.GetType (); - if (t == typeof (T) || t.IsSubclassOf (typeof (T))) - return true; - } - */ - return false; - } - - [MonoTODO] - public override T CreateKeyIdentifierClause () - { - /* - foreach (SecurityKeyIdentifierClause k in WrappingTokenReference) { - Type t = k.GetType (); - if (t == typeof (T) || t.IsSubclassOf (typeof (T))) - return (T) k; - } - */ - throw new NotSupportedException (String.Format ("WrappedKeySecurityToken cannot create '{0}'", typeof (T))); - } - - public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause keyIdentifierClause) - { - LocalIdKeyIdentifierClause lkic = keyIdentifierClause as LocalIdKeyIdentifierClause; - if (lkic != null && lkic.LocalId == Id) - return true; - - InternalEncryptedKeyIdentifierClause khic = keyIdentifierClause as InternalEncryptedKeyIdentifierClause; - if (keyhash == null) - keyhash = SHA1.Create ().ComputeHash (wrapped_key); - if (khic != null && khic.Matches (keyhash)) - return true; - - return false; - } - } -} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/BinarySecretKeyIdentifierClause.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/BinarySecretKeyIdentifierClause.cs deleted file mode 100644 index 497d5c7fbad..00000000000 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/BinarySecretKeyIdentifierClause.cs +++ /dev/null @@ -1,87 +0,0 @@ -// -// BinarySecretKeyIdentifierClause.cs -// -// Author: -// Atsushi Enomoto -// -// Copyright (C) 2006 Novell, Inc. http://www.novell.com -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using System; -using System.Collections.Generic; -using System.Xml; -using System.IdentityModel.Policy; -using System.IdentityModel.Tokens; - -namespace System.ServiceModel.Security -{ - public class BinarySecretKeyIdentifierClause : BinaryKeyIdentifierClause - { - public BinarySecretKeyIdentifierClause (byte [] key) - : this (key, true) - { - } - - [MonoTODO ("ClauseType")] - public BinarySecretKeyIdentifierClause (byte [] key, bool cloneBuffer) - : base ("", key, cloneBuffer) - { - } - - [MonoTODO ("ClauseType")] - public BinarySecretKeyIdentifierClause (byte [] key, bool cloneBuffer, byte [] derivationNonce, int derivationLength) - : base ("", key, cloneBuffer, derivationNonce, derivationLength) - { - } - - public override bool CanCreateKey { - get { return true; } - } - - public byte [] GetKeyBytes () - { - return GetBuffer (); - } - - public override SecurityKey CreateKey () - { - return new InMemorySymmetricSecurityKey (GetRawBuffer (), true); - } - - public override bool Matches (SecurityKeyIdentifierClause clause) - { - if (clause == null) - throw new ArgumentNullException ("clause"); - BinarySecretKeyIdentifierClause other = - clause as BinarySecretKeyIdentifierClause; - if (other == null) - return false; - byte [] b1 = GetRawBuffer (); - byte [] b2 = other.GetRawBuffer (); - if (b1.Length != b2.Length) - return false; - for (int i = 0; i < b1.Length; i++) - if (b1 [i] != b2 [i]) - return false; - return true; - } - } -} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/KeyNameIdentifierClause.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/KeyNameIdentifierClause.cs deleted file mode 100644 index ad7a84a9ce1..00000000000 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/KeyNameIdentifierClause.cs +++ /dev/null @@ -1,69 +0,0 @@ -// -// KeyNameIdentifierClause.cs -// -// Author: -// Atsushi Enomoto -// -// Copyright (C) 2006 Novell, Inc. http://www.novell.com -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using System; -using System.Collections.Generic; -using System.Xml; -using System.IdentityModel.Policy; -using System.IdentityModel.Tokens; - -namespace System.ServiceModel.Security -{ - public class KeyNameIdentifierClause : SecurityKeyIdentifierClause - { - public KeyNameIdentifierClause (string keyName) - : base (null) - { - key_name = keyName; - } - - string key_name; - - public string KeyName { - get { return key_name; } - } - - public override bool Matches (SecurityKeyIdentifierClause clause) - { - if (clause == null) - throw new ArgumentNullException ("clause"); - KeyNameIdentifierClause knic = - clause as KeyNameIdentifierClause; - return knic != null && Matches (knic.KeyName); - } - - public bool Matches (string keyName) - { - return key_name == keyName; - } - - public override string ToString () - { - return String.Concat ("KeyNameIdentifierClause(KeyName = '", KeyName, "')"); - } - } -} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/SecurityContextKeyIdentifierClause.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/SecurityContextKeyIdentifierClause.cs deleted file mode 100644 index 2ac33bae679..00000000000 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/SecurityContextKeyIdentifierClause.cs +++ /dev/null @@ -1,84 +0,0 @@ -// -// SecurityContextKeyIdentifierClause.cs -// -// Author: -// Atsushi Enomoto -// -// Copyright (C) 2006 Novell, Inc. http://www.novell.com -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -using System.IdentityModel.Selectors; -using System.IdentityModel.Tokens; -using System.Xml; - -namespace System.ServiceModel.Security -{ - public class SecurityContextKeyIdentifierClause : SecurityKeyIdentifierClause - { - public SecurityContextKeyIdentifierClause (UniqueId contextId) - : this (contextId, new UniqueId ()) - { - } - - public SecurityContextKeyIdentifierClause (UniqueId contextId, UniqueId generation) - : this (contextId, generation, null, 0) - { - } - - public SecurityContextKeyIdentifierClause (UniqueId contextId, UniqueId generation, byte [] derivationNonce, int derivationLength) - : base (null, derivationNonce, derivationLength) - { - this.context = contextId; - this.generation = generation; - } - - UniqueId context, generation; - - public UniqueId ContextId { - get { return context; } - } - - public UniqueId Generation { - get { return generation; } - } - - public override bool Matches ( - SecurityKeyIdentifierClause keyIdentifierClause) - { - SecurityContextKeyIdentifierClause other = - keyIdentifierClause as SecurityContextKeyIdentifierClause; - return other != null && Matches (other.context, other.generation); - } - - public bool Matches (UniqueId contextId, UniqueId generation) - { - return context == contextId && - this.generation == generation; - } - - [MonoTODO] - public override string ToString () - { - return base.ToString (); - } - } -} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources index 8e54cb5c622..3f62fe4b035 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources +++ b/mcs/class/System.ServiceModel/System.ServiceModel.dll.sources @@ -726,7 +726,6 @@ System.ServiceModel.PeerResolvers/ServiceSettingsResponseInfo.cs System.ServiceModel.PeerResolvers/UnregisterInfo.cs System.ServiceModel.PeerResolvers/UpdateInfo.cs System.ServiceModel.Security.Tokens/AuthenticatorCommunicationObject.cs -System.ServiceModel.Security.Tokens/BinarySecretSecurityToken.cs System.ServiceModel.Security.Tokens/ClaimTypeRequirement.cs System.ServiceModel.Security.Tokens/CommunicationSecurityTokenAuthenticator.cs System.ServiceModel.Security.Tokens/CommunicationSecurityTokenProvider.cs @@ -734,7 +733,6 @@ System.ServiceModel.Security.Tokens/DerivedKeySecurityToken.cs System.ServiceModel.Security.Tokens/IIssuanceSecurityTokenAuthenticator.cs System.ServiceModel.Security.Tokens/ISecurityContextSecurityTokenCache.cs System.ServiceModel.Security.Tokens/InitiatorServiceModelSecurityTokenRequirement.cs -System.ServiceModel.Security.Tokens/InternalEncryptedKeyIdentifierClause.cs System.ServiceModel.Security.Tokens/IssuedSecurityTokenHandler.cs System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs System.ServiceModel.Security.Tokens/IssuedSecurityTokenProvider.cs @@ -767,10 +765,8 @@ System.ServiceModel.Security.Tokens/SupportingTokenParameters.cs System.ServiceModel.Security.Tokens/TlsClientSession.cs System.ServiceModel.Security.Tokens/TlsServerSession.cs System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs -System.ServiceModel.Security.Tokens/WrappedKeySecurityToken.cs System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs System.ServiceModel.Security/BasicSecurityProfileVersion.cs -System.ServiceModel.Security/BinarySecretKeyIdentifierClause.cs System.ServiceModel.Security/ChannelProtectionRequirements.cs System.ServiceModel.Security/DataProtectionSecurityStateEncoder.cs System.ServiceModel.Security/ExpiredSecurityTokenException.cs @@ -783,7 +779,6 @@ System.ServiceModel.Security/InfocardInteractiveChannelInitializer.cs System.ServiceModel.Security/IssuedTokenClientCredential.cs System.ServiceModel.Security/IssuedTokenServiceCredential.cs System.ServiceModel.Security/KeyEntropyMode.cs -System.ServiceModel.Security/KeyNameIdentifierClause.cs System.ServiceModel.Security/MessagePartSpecification.cs System.ServiceModel.Security/MessageProtectionOrder.cs System.ServiceModel.Security/MessageSecurityException.cs @@ -793,7 +788,6 @@ System.ServiceModel.Security/SecureConversationServiceCredential.cs System.ServiceModel.Security/SecureConversationVersion.cs System.ServiceModel.Security/SecurityAccessDeniedException.cs System.ServiceModel.Security/SecurityAlgorithmSuite.cs -System.ServiceModel.Security/SecurityContextKeyIdentifierClause.cs System.ServiceModel.Security/SecurityCredentialsManager.cs System.ServiceModel.Security/SecurityMessageProperty.cs System.ServiceModel.Security/SecurityNegotiationException.cs diff --git a/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources index f5b081aeda6..ea92e69528e 100644 --- a/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources +++ b/mcs/class/System.ServiceModel/xammac_net_4_5_System.ServiceModel.dll.sources @@ -41,7 +41,6 @@ System.ServiceModel.Security/MessagePartSpecification.cs System.ServiceModel.Security/PeerCredential.cs System.ServiceModel.Security/ScopedMessagePartSpecification.cs System.ServiceModel.Security/SecurityAlgorithmSuite.cs -System.ServiceModel.Security/SecurityContextKeyIdentifierClause.cs System.ServiceModel.Security/SecurityMessageProperty.cs System.ServiceModel.Security/SecurityStateEncoder.cs System.ServiceModel.Security/SecurityTokenAttachmentMode.cs diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj index ade3d433339..5f8af6c9b30 100644 --- a/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj +++ b/mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj index a793bf739fc..977b8467691 100644 --- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj +++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONCURRENT_COLLECTIONS + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;CONCURRENT_COLLECTIONS prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONCURRENT_COLLECTIONS + NET_4_0;NET_4_5;NET_4_6;MONO;CONCURRENT_COLLECTIONS prompt 4 diff --git a/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj b/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj index 0040fd6840b..7fc1e4031e6 100644 --- a/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj +++ b/mcs/class/System.Transactions/System.Transactions-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj index b7bfc3e76b5..3a4f38fddcd 100644 --- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj +++ b/mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj index 461643c497b..9eff14306ed 100644 --- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj +++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SYSTEM_WEB_APPLICATIONSERVICES + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;SYSTEM_WEB_APPLICATIONSERVICES prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;SYSTEM_WEB_APPLICATIONSERVICES + NET_4_0;NET_4_5;NET_4_6;MONO;SYSTEM_WEB_APPLICATIONSERVICES prompt 4 diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj index 84781bfe0b9..9cc4aaa72a4 100644 --- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj +++ b/mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj index a812da16665..d0077c92923 100644 --- a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj +++ b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5 + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5 prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5 + NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5 prompt 4 diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj index d008409de93..7a209dc6184 100644 --- a/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj +++ b/mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;SYSTEM_WEB_EXTENSIONS + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;SYSTEM_WEB_EXTENSIONS prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_3_5;SYSTEM_WEB_EXTENSIONS + NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;SYSTEM_WEB_EXTENSIONS prompt 4 diff --git a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj index 70ba4af74c2..22fbfe51f01 100644 --- a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj +++ b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETMVC prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETMVC prompt 4 diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj index 0d1b62859ab..eafaa10d634 100644 --- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj +++ b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETMVC prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETMVC prompt 4 diff --git a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj index bb5c8db8c3f..4e373d375e7 100644 --- a/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj +++ b/mcs/class/System.Web.Http/System.Web.Http-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETMVC prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETMVC + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETMVC prompt 4 diff --git a/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj b/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj index bc1337a2a49..2fd69b6fb98 100644 --- a/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj +++ b/mcs/class/System.Web.Mobile/System.Web.Mobile-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj index 3b76937bb62..3a19781b61d 100644 --- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj +++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO + NET_4_0;NET_4_5;NET_4_6;MONO;MONO prompt 4 diff --git a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj index 7b693416b89..db96ee83d51 100644 --- a/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj +++ b/mcs/class/System.Web.Razor/System.Web.Razor-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 diff --git a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj index be101eaa2a8..c8ee4200e76 100644 --- a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj +++ b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj b/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj index 4f47b14286d..0e4835c786f 100644 --- a/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj +++ b/mcs/class/System.Web.Routing/System.Web.Routing-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj b/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj index 0dfc8236d4b..26fa6cc83db 100644 --- a/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj +++ b/mcs/class/System.Web.Services/System.Web.Services-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,168,169,219,414,612,649 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_BROKEN_CONFIGURATION_DLL + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;MONO_BROKEN_CONFIGURATION_DLL prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,168,169,219,414,612,649 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;MONO_BROKEN_CONFIGURATION_DLL + NET_4_0;NET_4_5;NET_4_6;MONO;MONO_BROKEN_CONFIGURATION_DLL prompt 4 diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj index 6fd9784625d..da48eae1e67 100644 --- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj +++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj index 9e427e5ed1a..eb59c16adb7 100644 --- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj +++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj index 28ca085172c..4cd3951bc0a 100644 --- a/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj +++ b/mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASPNETWEBPAGES + NET_4_0;NET_4_5;NET_4_6;MONO;ASPNETWEBPAGES prompt 4 diff --git a/mcs/class/System.Web/System.Web-net_4_x.csproj b/mcs/class/System.Web/System.Web-net_4_x.csproj index 0b1699b80a4..0daea634104 100644 --- a/mcs/class/System.Web/System.Web-net_4_x.csproj +++ b/mcs/class/System.Web/System.Web-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,612,618,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,612,618,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP + NET_4_0;NET_4_5;NET_4_6;MONO;INSIDE_SYSTEM_WEB;WEBSERVICES_DEP prompt 4 @@ -492,6 +492,7 @@ + @@ -539,6 +540,7 @@ + diff --git a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj index 9d2976f9148..8a5e692384c 100644 --- a/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj +++ b/mcs/class/System.Web/System.Web-plainweb-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,612,618,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;INSIDE_SYSTEM_WEB prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,612,618,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;INSIDE_SYSTEM_WEB + NET_4_0;NET_4_5;NET_4_6;MONO;INSIDE_SYSTEM_WEB prompt 4 @@ -492,6 +492,7 @@ + @@ -539,6 +540,7 @@ + diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj index 9064929de01..ef0b5e703eb 100644 --- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj +++ b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj index c1e931e0a9b..2485b043708 100644 --- a/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj +++ b/mcs/class/System.Windows.Forms/System.Windows.Forms-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,618,612,809 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,618,612,809 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -50,6 +50,7 @@ + diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs index 1087563b16a..a6b37d7c2a8 100644 --- a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs +++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs @@ -5411,9 +5411,12 @@ namespace System.Windows.Forms bool selection_changed = false; if (is_main_collection && owner != null) { - int display_index = item.DisplayIndex; - if (item.Focused && display_index + 1 == Count) // Last item - owner.SetFocusedItem (display_index == 0 ? -1 : display_index - 1); + ListViewItem focused_item = owner.FocusedItem; + if (focused_item != null) { + int focused_item_index = focused_item.DisplayIndex; + if (focused_item_index + 1 >= Count) // Last item + owner.SetFocusedItem (Count - 2); + } selection_changed = owner.SelectedIndices.Contains (index); owner.item_control.CancelEdit (item); @@ -5479,7 +5482,7 @@ namespace System.Windows.Forms value.SetGroup (group); } - + value.DisplayIndex = -1; list.Add (value); // force an update of the selected info if the new item is selected. diff --git a/mcs/class/System.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs b/mcs/class/System.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs index 46adeaaccb4..a71067dc5f4 100644 --- a/mcs/class/System.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs +++ b/mcs/class/System.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs @@ -1958,5 +1958,56 @@ namespace MonoTests.System.Windows.Forms return base.IsInputChar (charCode); } } + + [Test] // Should not throw IndexOutOfBoundsException + public void ReaddingItem () + { + Form form = new Form (); + form.ShowInTaskbar = false; + ListView lvw1 = new ListView (); + ListView lvw2 = new ListView (); + lvw1.View = View.Details; + lvw2.View = View.Details; + lvw1.Columns.Add (new ColumnHeader ("1")); + lvw2.Columns.Add (new ColumnHeader ("2")); + form.Controls.Add (lvw1); + form.Controls.Add (lvw2); + form.Show (); + + for (int i = 0; i < 50; i++) + lvw1.Items.Add ("A"); + lvw2.Items.Add ("B1"); + + ListViewItem item = lvw1.Items [lvw1.Items.Count - 1]; + item.Selected = true; + item.Remove (); + lvw2.Items.Add (item); + item.Selected = true; + + Assert.AreEqual (lvw1.Items.Count, 49, "#1"); + Assert.AreEqual (lvw2.Items.Count, 2, "#2"); + Assert.AreEqual (lvw2.Items [1].Selected, true, "#3"); + + form.Dispose (); + } + + [Test] // Should not throw ArgumentOutOfRangeException + public void DeleteNotFocusedItem () + { + Form form = new Form (); + form.ShowInTaskbar = false; + ListView lvw = new ListView (); + form.Controls.Add (lvw); + form.Show (); + + for (int i = 0; i < 3; i++) + lvw.Items.Add ("A"); + + lvw.Items [lvw.Items.Count - 1].Focused = true; + lvw.Items [0].Remove (); + lvw.Items [0].Remove (); + + form.Dispose (); + } } } diff --git a/mcs/class/System.Windows/System.Windows-net_4_x.csproj b/mcs/class/System.Windows/System.Windows-net_4_x.csproj index 59ba68253f7..dc8cff9041e 100644 --- a/mcs/class/System.Windows/System.Windows-net_4_x.csproj +++ b/mcs/class/System.Windows/System.Windows-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj b/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj index c4285270bae..1192e64e366 100644 --- a/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj +++ b/mcs/class/System.Workflow.Activities/System.Workflow.Activities-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj index 32d268ac86e..af61a000c5e 100644 --- a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj +++ b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj index ecceeff1d25..07b190c018b 100644 --- a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj +++ b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime-net_4_x.csproj @@ -34,7 +34,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -42,7 +42,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj b/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj index 7eacb3ddd76..060d3f8ded0 100644 --- a/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj +++ b/mcs/class/System.XML/System.Xml-bare-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,219,414,649,1717 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASYNC + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASYNC prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,219,414,649,1717 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASYNC + NET_4_0;NET_4_5;NET_4_6;MONO;ASYNC prompt 4 diff --git a/mcs/class/System.XML/System.Xml-net_4_x.csproj b/mcs/class/System.XML/System.Xml-net_4_x.csproj index 753fdd5bbb8..8d3b9a7c82e 100644 --- a/mcs/class/System.XML/System.Xml-net_4_x.csproj +++ b/mcs/class/System.XML/System.Xml-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,219,414,649,1717 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASYNC;CONFIGURATION_DEP + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;ASYNC;CONFIGURATION_DEP prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,219,414,649,1717 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;ASYNC;CONFIGURATION_DEP + NET_4_0;NET_4_5;NET_4_6;MONO;ASYNC;CONFIGURATION_DEP prompt 4 diff --git a/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj b/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj index a5d11aeffb1..b2743f40fa7 100644 --- a/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj +++ b/mcs/class/System.Xaml/System.Xaml-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj index e3988ed811f..be665cdd36e 100644 --- a/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj +++ b/mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_SERIALIZATION + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_SERIALIZATION prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_SERIALIZATION + NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_SERIALIZATION prompt 4 diff --git a/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj b/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj index 5168c310d86..7c265e46d04 100644 --- a/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj +++ b/mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index fdfb7c293a4..29eace8a1ff 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -42,6 +42,10 @@ endif LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%) +ifdef DYNAMIC_BTLS +LIB_MCS_FLAGS += -d:DYNAMIC_BTLS +endif + ifndef NO_THREAD_ABORT REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_ABORT TEST_MCS_FLAGS += -d:MONO_FEATURE_THREAD_ABORT diff --git a/mcs/class/System/Mono.Btls/MonoBtlsBio.cs b/mcs/class/System/Mono.Btls/MonoBtlsBio.cs index 1fbe47117d1..ca62c8e4a29 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsBio.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsBio.cs @@ -70,25 +70,25 @@ namespace Mono.Btls return MonoBtlsBioMono.CreateStream (stream, false); } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_bio_read (IntPtr bio, IntPtr data, int len); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_bio_write (IntPtr bio, IntPtr data, int len); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_bio_flush (IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_bio_indent (IntPtr bio, uint indent, uint max_indent); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_bio_hexdump (IntPtr bio, IntPtr data, int len, uint indent); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_bio_print_errors (IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_bio_free (IntPtr handle); public int Read (byte[] buffer, int offset, int size) @@ -192,10 +192,10 @@ namespace Mono.Btls class MonoBtlsBioMemory : MonoBtlsBio { - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_bio_mem_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_bio_mem_get_data (IntPtr handle, out IntPtr data); public MonoBtlsBioMemory () @@ -278,10 +278,10 @@ namespace Mono.Btls delegate int BioWriteFunc (IntPtr bio, IntPtr data, int dataLength); delegate long BioControlFunc (IntPtr bio, ControlCommand command, long arg); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_bio_mono_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_bio_mono_initialize (IntPtr handle, IntPtr instance, IntPtr readFunc, IntPtr writeFunc, IntPtr controlFunc); long Control (ControlCommand command, long arg) diff --git a/mcs/class/System/Mono.Btls/MonoBtlsError.cs b/mcs/class/System/Mono.Btls/MonoBtlsError.cs index 2645a926bc3..bbfee5ef897 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsError.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsError.cs @@ -23,7 +23,7 @@ // LIABILITY, WHETHER IN AN ACTION 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 SECURITY_DEP +#if SECURITY_DEP using System; using System.IO; using System.Text; @@ -38,16 +38,16 @@ namespace Mono.Btls { static class MonoBtlsError { - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (MonoBtlsObject.BTLS_DYLIB)] extern static int mono_btls_error_peek_error (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (MonoBtlsObject.BTLS_DYLIB)] extern static int mono_btls_error_get_error (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (MonoBtlsObject.BTLS_DYLIB)] extern static void mono_btls_error_clear_error (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (MonoBtlsObject.BTLS_DYLIB)] extern static void mono_btls_error_get_error_string_n (int error, IntPtr buf, int len); public static int PeekError () @@ -80,4 +80,4 @@ namespace Mono.Btls } } } -// #endif +#endif diff --git a/mcs/class/System/Mono.Btls/MonoBtlsKey.cs b/mcs/class/System/Mono.Btls/MonoBtlsKey.cs index 81280b54ece..04ccb467a95 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsKey.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsKey.cs @@ -48,19 +48,19 @@ namespace Mono.Btls } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_key_free (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_key_up_ref (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_key_get_bytes (IntPtr handle, out IntPtr data, out int size, int include_private_bits); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_key_get_bits (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_key_is_rsa (IntPtr handle); new internal BoringKeyHandle Handle { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsObject.cs b/mcs/class/System/Mono.Btls/MonoBtlsObject.cs index 8f3054318fe..9731e1deb44 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsObject.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsObject.cs @@ -33,6 +33,12 @@ namespace Mono.Btls { abstract class MonoBtlsObject : IDisposable { +#if DYNAMIC_BTLS + internal const string BTLS_DYLIB = "libmono-btls-shared"; +#else + internal const string BTLS_DYLIB = "__Internal"; +#endif + internal MonoBtlsObject (MonoBtlsHandle handle) { this.handle = handle; @@ -100,7 +106,7 @@ namespace Mono.Btls CheckError (ret == 1, callerName); } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_free (IntPtr data); protected void FreeDataPtr (IntPtr data) diff --git a/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs b/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs index a7d42a190b4..2f97cb87474 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsPkcs12.cs @@ -52,28 +52,28 @@ namespace Mono.Btls get { return (BoringPkcs12Handle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_pkcs12_free (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_pkcs12_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_pkcs12_get_count (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_pkcs12_get_cert (IntPtr Handle, int index); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_pkcs12_add_cert (IntPtr chain, IntPtr x509); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern unsafe static int mono_btls_pkcs12_import (IntPtr chain, void* data, int len, IntPtr password); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_pkcs12_has_private_key (IntPtr pkcs12); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_pkcs12_get_private_key (IntPtr pkcs12); internal MonoBtlsPkcs12 () diff --git a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs index 147f53e1a41..5e1e3b1507a 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsProvider.cs @@ -119,7 +119,7 @@ namespace Mono.Btls else param = MonoBtlsX509VerifyParam.GetSslServer (); - if (string.IsNullOrEmpty (targetHost)) + if (targetHost == null) return param; try { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs b/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs index b24ed079ab1..d04a15a1a66 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsSsl.cs @@ -55,73 +55,73 @@ namespace Mono.Btls } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_destroy (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_ssl_new (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_use_certificate (IntPtr handle, IntPtr x509); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_use_private_key (IntPtr handle, IntPtr key); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_add_chain_certificate (IntPtr handle, IntPtr x509); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_accept (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_connect (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_handshake (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_close (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_set_bio (IntPtr handle, IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_read (IntPtr handle, IntPtr data, int len); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_write (IntPtr handle, IntPtr data, int len); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_get_error (IntPtr handle, int ret_code); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_get_version (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_set_min_version (IntPtr handle, int version); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_set_max_version (IntPtr handle, int version); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_get_cipher (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_get_ciphers (IntPtr handle, out IntPtr data); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_ssl_get_peer_certificate (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_set_cipher_list (IntPtr handle, IntPtr str); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_print_errors_cb (IntPtr func, IntPtr ctx); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_set_verify_param (IntPtr handle, IntPtr param); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_set_server_name (IntPtr handle, IntPtr name); static BoringSslHandle Create_internal (MonoBtlsSslCtx ctx) diff --git a/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs b/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs index 517b158b8e0..7fac0f33821 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsSslCtx.cs @@ -54,40 +54,40 @@ namespace Mono.Btls get { return (BoringSslCtxHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_ssl_ctx_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_ctx_free (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_ssl_ctx_up_ref (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_ctx_initialize (IntPtr handle, IntPtr instance); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_ctx_set_debug_bio (IntPtr handle, IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_ctx_set_cert_verify_callback (IntPtr handle, IntPtr func, int cert_required); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_ctx_set_cert_select_callback (IntPtr handle, IntPtr func); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_ctx_set_min_version (IntPtr handle, int version); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_ssl_ctx_set_max_version (IntPtr handle, int version); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_ctx_is_cipher_supported (IntPtr handle, short value); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_ctx_set_ciphers (IntPtr handle, int count, IntPtr data, int allow_unsupported); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_ssl_ctx_set_verify_param (IntPtr handle, IntPtr param); delegate int NativeVerifyFunc (IntPtr instance, int preverify_ok, IntPtr ctx); diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509.cs index 31ec4581052..b35c0c14225 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509.cs @@ -67,79 +67,79 @@ namespace Mono.Btls { } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_up_ref (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_from_data (IntPtr data, int len, MonoBtlsX509Format format); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_get_subject_name (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_get_issuer_name (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_subject_name_string (IntPtr handle, IntPtr buffer, int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_issuer_name_string (IntPtr handle, IntPtr buffer, int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_raw_data (IntPtr handle, IntPtr bio, MonoBtlsX509Format format); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_cmp (IntPtr a, IntPtr b); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_hash (IntPtr handle, out IntPtr data); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_get_not_before (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_get_not_after (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_public_key (IntPtr handle, IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_serial_number (IntPtr handle, IntPtr data, int size, int mono_style); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_version (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_signature_algorithm (IntPtr handle, IntPtr buffer, int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_public_key_asn1 (IntPtr handle, IntPtr oid, int oid_size, out IntPtr data, out int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_public_key_parameters (IntPtr handle, IntPtr oid, int oid_size, out IntPtr data, out int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_get_pubkey (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_get_subject_key_identifier (IntPtr handle, out IntPtr data, out int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_print (IntPtr handle, IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_free (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_dup (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_add_trust_object (IntPtr handle, MonoBtlsX509Purpose purpose); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_add_reject_object (IntPtr handle, MonoBtlsX509Purpose purpose); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_add_explicit_trust (IntPtr handle, MonoBtlsX509TrustKind kind); internal MonoBtlsX509 Copy () diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs index 6926ae7e65b..853e3bb60c5 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Chain.cs @@ -52,22 +52,22 @@ namespace Mono.Btls get { return (BoringX509ChainHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_chain_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_chain_get_count (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_chain_get_cert (IntPtr Handle, int index); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_chain_add_cert (IntPtr chain, IntPtr x509); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_chain_up_ref (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_chain_free (IntPtr handle); public MonoBtlsX509Chain () diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs index 9d1868337d6..004a29abc1f 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Crl.cs @@ -67,37 +67,37 @@ namespace Mono.Btls { } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_crl_ref (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_crl_from_data (IntPtr data, int len, MonoBtlsX509Format format); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_crl_get_by_cert (IntPtr handle, IntPtr x509); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] unsafe extern static IntPtr mono_btls_x509_crl_get_by_serial (IntPtr handle, void *serial, int len); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_crl_get_revoked_count (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_crl_get_revoked (IntPtr handle, int index); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_crl_get_last_update (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_crl_get_next_update (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_crl_get_version (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_crl_get_issuer (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_crl_free (IntPtr handle); public static MonoBtlsX509Crl LoadFromData (byte[] buffer, MonoBtlsX509Format format) diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs index 3e8fb299768..fc24dc79d0c 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Lookup.cs @@ -52,38 +52,38 @@ namespace Mono.Btls get { return (BoringX509LookupHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_lookup_new (IntPtr store, MonoBtlsX509LookupType type); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_lookup_load_file (IntPtr handle, IntPtr file, MonoBtlsX509FileType type); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_lookup_add_dir (IntPtr handle, IntPtr dir, MonoBtlsX509FileType type); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_lookup_add_mono (IntPtr handle, IntPtr monoLookup); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_lookup_method_mono_init ( IntPtr handle, IntPtr instance, IntPtr by_subject_func); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_lookup_init (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_lookup_shutdown (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_lookup_by_subject (IntPtr handle, IntPtr name); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_lookup_by_fingerprint (IntPtr handle, IntPtr bytes, int len); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_lookup_free (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_lookup_peek_lookup (IntPtr handle); MonoBtlsX509LookupType type; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs index 30b2ee3876e..73d16a3bb5d 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509LookupMono.cs @@ -51,14 +51,14 @@ namespace Mono.Btls get { return (BoringX509LookupMonoHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_lookup_mono_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_lookup_mono_init ( IntPtr handle, IntPtr instance, IntPtr by_subject_func); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_lookup_mono_free (IntPtr handle); delegate int BySubjectFunc (IntPtr instance, IntPtr name, out IntPtr x509_ptr); diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs index 80a322caaf3..88e1bb427d7 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Name.cs @@ -52,40 +52,40 @@ namespace Mono.Btls } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_print_bio (IntPtr handle, IntPtr bio); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_print_string (IntPtr handle, IntPtr buffer, int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_get_raw_data (IntPtr handle, out IntPtr buffer, int use_canon_enc); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_name_hash (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_name_hash_old (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_get_entry_count (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static MonoBtlsX509NameEntryType mono_btls_x509_name_get_entry_type (IntPtr name, int index); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_get_entry_oid (IntPtr name, int index, IntPtr buffer, int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_get_entry_oid_data (IntPtr name, int index, out IntPtr data); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_get_entry_value (IntPtr name, int index, out int tag, out IntPtr str); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern unsafe static IntPtr mono_btls_x509_name_from_data (void* data, int len, int use_canon_enc); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_name_free (IntPtr handle); new internal BoringX509NameHandle Handle { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs index cccc005f8d9..ab3a7bba62c 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509NameList.cs @@ -52,19 +52,19 @@ namespace Mono.Btls } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_name_list_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_list_get_count (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_name_list_add (IntPtr handle, IntPtr name); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_name_list_get_item (IntPtr handle, int index); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_name_list_free (IntPtr handle); new internal BoringX509NameListHandle Handle { diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs index 4f5d79b67b4..583a6d01517 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Revoked.cs @@ -67,19 +67,19 @@ namespace Mono.Btls { } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_revoked_get_serial_number (IntPtr handle, IntPtr data, int size); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static long mono_btls_x509_revoked_get_revocation_date (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_revoked_get_reason (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_revoked_get_sequence (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_revoked_free (IntPtr handle); public byte[] GetSerialNumber () diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs index 2e03715ce34..76db62bb9f8 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509Store.cs @@ -53,28 +53,28 @@ namespace Mono.Btls get { return (BoringX509StoreHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_from_ctx (IntPtr ctx); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_from_ssl_ctx (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_load_locations (IntPtr handle, IntPtr file, IntPtr path); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_set_default_paths (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_add_cert (IntPtr handle, IntPtr x509); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_get_count (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_store_free (IntPtr handle); Dictionary lookupHash; diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs index 41df1298f9c..f197a66bc3d 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509StoreCtx.cs @@ -66,49 +66,49 @@ namespace Mono.Btls get { return (BoringX509StoreCtxHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_from_ptr (IntPtr ctx); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static MonoBtlsX509Error mono_btls_x509_store_ctx_get_error (IntPtr handle, out IntPtr error_string); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_ctx_get_error_depth (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_get_chain (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_ctx_init (IntPtr handle, IntPtr store, IntPtr chain); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_ctx_set_param (IntPtr handle, IntPtr param); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_store_ctx_verify_cert (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_get_by_subject (IntPtr handle, IntPtr name); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_get_current_cert (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_get_current_issuer (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_get_verify_param (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_get_untrusted (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_store_ctx_up_ref (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_store_ctx_free (IntPtr handle); internal MonoBtlsX509StoreCtx () diff --git a/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs b/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs index 5c012389fdc..d95610a92da 100644 --- a/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs +++ b/mcs/class/System/Mono.Btls/MonoBtlsX509VerifyParam.cs @@ -51,55 +51,55 @@ namespace Mono.Btls get { return (BoringX509VerifyParamHandle)base.Handle; } } - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_verify_param_new (); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_verify_param_copy (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_verify_param_lookup (IntPtr name); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_can_modify (IntPtr param); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_name (IntPtr handle, IntPtr name); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_host (IntPtr handle, IntPtr name, int namelen); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_add_host (IntPtr handle, IntPtr name, int namelen); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static ulong mono_btls_x509_verify_param_get_flags (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_flags (IntPtr handle, ulong flags); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static MonoBtlsX509VerifyFlags mono_btls_x509_verify_param_get_mono_flags (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_mono_flags (IntPtr handle, MonoBtlsX509VerifyFlags flags); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_purpose (IntPtr handle, MonoBtlsX509Purpose purpose); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_get_depth (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_depth (IntPtr handle, int depth); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static int mono_btls_x509_verify_param_set_time (IntPtr handle, long time); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static IntPtr mono_btls_x509_verify_param_get_peername (IntPtr handle); - [MethodImpl (MethodImplOptions.InternalCall)] + [DllImport (BTLS_DYLIB)] extern static void mono_btls_x509_verify_param_free (IntPtr handle); internal MonoBtlsX509VerifyParam () diff --git a/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs b/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs index b1921208fc8..929e88e2295 100644 --- a/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs +++ b/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs @@ -335,14 +335,15 @@ namespace Mono.Net.Security result = provider.ValidateCertificate (this, host, server, certs, wantsChain, ref chain, ref xerrors, ref status11); errors = (SslPolicyErrors)xerrors; + if (status11 == 0 && errors != 0) { + // TRUST_E_FAIL + status11 = unchecked ((int)0x800B010B); + } + if (policy != null && (!(policy is DefaultCertificatePolicy) || certValidationCallback == null)) { ServicePoint sp = null; if (request != null) sp = request.ServicePointNoLock; - if (status11 == 0 && errors != 0) { - // TRUST_E_FAIL - status11 = unchecked ((int)0x800B010B); - } // pre 2.0 callback result = policy.CheckValidationResult (sp, leaf, request, status11); diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj index 62a424bb669..7c67e68835c 100644 --- a/mcs/class/System/System-bare-net_4_x.csproj +++ b/mcs/class/System/System-bare-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS + NET_4_0;NET_4_5;NET_4_6;MONO;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS prompt 4 @@ -504,6 +504,7 @@ + @@ -610,7 +611,6 @@ - @@ -623,6 +623,7 @@ + @@ -633,6 +634,7 @@ + @@ -641,7 +643,10 @@ + + + @@ -693,19 +698,23 @@ + + + + @@ -720,6 +729,7 @@ + @@ -740,6 +750,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -763,12 +811,15 @@ + - + + + @@ -784,6 +835,7 @@ + @@ -865,7 +917,6 @@ - @@ -914,11 +965,9 @@ - - @@ -1057,15 +1106,10 @@ - - - - - @@ -1105,6 +1149,7 @@ + @@ -1160,7 +1205,6 @@ - @@ -1181,6 +1225,7 @@ + @@ -1223,6 +1268,7 @@ + diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj index bd89dd5b286..62daa34d9ee 100644 --- a/mcs/class/System/System-net_4_x.csproj +++ b/mcs/class/System/System-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;CONFIGURATION_DEP + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;CONFIGURATION_DEP prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;CONFIGURATION_DEP + NET_4_0;NET_4_5;NET_4_6;MONO;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS;CONFIGURATION_DEP prompt 4 @@ -504,6 +504,7 @@ + @@ -610,7 +611,6 @@ - @@ -623,6 +623,7 @@ + @@ -633,6 +634,7 @@ + @@ -641,7 +643,10 @@ + + + @@ -693,19 +698,23 @@ + + + + @@ -720,6 +729,7 @@ + @@ -740,6 +750,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -763,12 +811,15 @@ + - + + + @@ -784,6 +835,7 @@ + @@ -865,7 +917,6 @@ - @@ -914,11 +965,9 @@ - - @@ -1057,15 +1106,10 @@ - - - - - @@ -1105,6 +1149,7 @@ + @@ -1160,7 +1205,6 @@ - @@ -1181,6 +1225,7 @@ + @@ -1223,6 +1268,7 @@ + diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj index 29567cd320b..cd6f0607362 100644 --- a/mcs/class/System/System-secxml-net_4_x.csproj +++ b/mcs/class/System/System-secxml-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,618 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,618 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS + NET_4_0;NET_4_5;NET_4_6;MONO;CONFIGURATION_2_0;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;SECURITY_DEP;XML_DEP;MONO_SECURITY_ALIAS prompt 4 @@ -504,6 +504,7 @@ + @@ -610,7 +611,6 @@ - @@ -623,6 +623,7 @@ + @@ -633,6 +634,7 @@ + @@ -641,7 +643,10 @@ + + + @@ -693,19 +698,23 @@ + + + + @@ -720,6 +729,7 @@ + @@ -740,6 +750,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -763,12 +811,15 @@ + - + + + @@ -776,9 +827,6 @@ - - - @@ -787,7 +835,7 @@ - + @@ -796,10 +844,6 @@ - - - - @@ -873,7 +917,6 @@ - @@ -922,11 +965,9 @@ - - @@ -1065,15 +1106,10 @@ - - - - - @@ -1113,6 +1149,7 @@ + @@ -1168,7 +1205,6 @@ - @@ -1189,6 +1225,7 @@ + @@ -1231,6 +1268,7 @@ + diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs index d1bf2e763b0..56d0e4d61f9 100644 --- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs +++ b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs @@ -631,6 +631,19 @@ namespace System.Net.NetworkInformation { string iface_operstate_path; string iface_flags_path; +#if MONODROID + [DllImport ("__Internal")] + protected static extern int _monodroid_get_android_api_level (); + + [DllImport ("__Internal")] + protected static extern bool _monodroid_get_network_interface_up_state (string ifname, ref bool is_up); + + [DllImport ("__Internal")] + protected static extern bool _monodroid_get_network_interface_supports_multicast (string ifname, ref bool supports_multicast); + + bool android_use_java_api; +#endif + internal string IfacePath { get { return iface_path; } } @@ -641,6 +654,9 @@ namespace System.Net.NetworkInformation { iface_path = "/sys/class/net/" + name + "/"; iface_operstate_path = iface_path + "operstate"; iface_flags_path = iface_path + "flags"; +#if MONODROID + android_use_java_api = _monodroid_get_android_api_level () >= 24; +#endif } public override IPInterfaceProperties GetIPProperties () @@ -659,6 +675,23 @@ namespace System.Net.NetworkInformation { public override OperationalStatus OperationalStatus { get { +#if MONODROID + if (android_use_java_api) { + // Starting from API 24 (Android 7 "Nougat") Android restricts access to many + // files in the /sys filesystem (see https://code.google.com/p/android/issues/detail?id=205565 + // for more information) and therefore we are forced to call into Java API in + // order to get the information. Alas, what we can obtain in this way is quite + // limited. In the case of OperationalStatus we can only determine whether the + // interface is up or down. There is a way to get more detailed information but + // it requires an instance of the Android Context class which is not available + // to us here. + bool is_up = false; + if (_monodroid_get_network_interface_up_state (Name, ref is_up)) + return is_up ? OperationalStatus.Up : OperationalStatus.Down; + else + return OperationalStatus.Unknown; + } +#endif if (!Directory.Exists (iface_path)) return OperationalStatus.Unknown; @@ -695,6 +728,17 @@ namespace System.Net.NetworkInformation { public override bool SupportsMulticast { get { +#if MONODROID + if (android_use_java_api) { + // Starting from API 24 (Android 7 "Nougat") Android restricts access to many + // files in the /sys filesystem (see https://code.google.com/p/android/issues/detail?id=205565 + // for more information) and therefore we are forced to call into Java API in + // order to get the information. + bool supports_multicast = false; + _monodroid_get_network_interface_supports_multicast (Name, ref supports_multicast); + return supports_multicast; + } +#endif if (!Directory.Exists (iface_path)) return false; diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs index 9857fc27ed0..ceb1958c6c8 100644 --- a/mcs/class/System/System.Net.Sockets/Socket.cs +++ b/mcs/class/System/System.Net.Sockets/Socket.cs @@ -844,51 +844,6 @@ namespace System.Net.Sockets Connect (Dns.GetHostAddresses (host), port); } - public void Connect (IPAddress[] addresses, int port) - { - ThrowIfDisposedAndClosed (); - - if (addresses == null) - throw new ArgumentNullException ("addresses"); - if (this.AddressFamily != AddressFamily.InterNetwork && this.AddressFamily != AddressFamily.InterNetworkV6) - throw new NotSupportedException ("This method is only valid for addresses in the InterNetwork or InterNetworkV6 families"); - if (is_listening) - throw new InvalidOperationException (); - - // FIXME: do non-blocking sockets Poll here? - int error = 0; - foreach (IPAddress address in addresses) { - IPEndPoint iep = new IPEndPoint (address, port); - - iep = RemapIPEndPoint (iep); - - Connect_internal (m_Handle, iep.Serialize (), out error, is_blocking); - if (error == 0) { - is_connected = true; - is_bound = true; - seed_endpoint = iep; - return; - } - if (error != (int)SocketError.InProgress && error != (int)SocketError.WouldBlock) - continue; - - if (!is_blocking) { - Poll (-1, SelectMode.SelectWrite); - error = (int)GetSocketOption (SocketOptionLevel.Socket, SocketOptionName.Error); - if (error == 0) { - is_connected = true; - is_bound = true; - seed_endpoint = iep; - return; - } - } - } - - if (error != 0) - throw new SocketException (error); - } - - public void Connect (EndPoint remoteEP) { ThrowIfDisposedAndClosed (); @@ -967,12 +922,6 @@ namespace System.Net.Sockets return true; } - public static bool ConnectAsync (SocketType socketType, ProtocolType protocolType, SocketAsyncEventArgs e) - { - var sock = new Socket (e.RemoteEndPoint.AddressFamily, socketType, protocolType); - return sock.ConnectAsync (e); - } - public static void CancelConnectAsync (SocketAsyncEventArgs e) { if (e == null) diff --git a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs index e057021f9a7..419035efe15 100644 --- a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs +++ b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs @@ -61,13 +61,13 @@ namespace System.Net.Sockets private set; } - IList > _bufferList; + internal IList> m_BufferList; public IList> BufferList { - get { return _bufferList; } + get { return m_BufferList; } set { if (Buffer != null && value != null) throw new ArgumentException ("Buffer and BufferList properties cannot both be non-null."); - _bufferList = value; + m_BufferList = value; } } @@ -234,5 +234,43 @@ namespace System.Net.Sockets Buffer = buffer; } + + internal void StartOperationCommon (Socket socket) + { + current_socket = socket; + } + + internal void StartOperationWrapperConnect (MultipleConnectAsync args) + { + SetLastOperation (SocketAsyncOperation.Connect); + + //m_MultipleConnect = args; + } + + internal void FinishConnectByNameSyncFailure (Exception exception, int bytesTransferred, SocketFlags flags) + { + throw new NotImplementedException (); + } + + internal void FinishOperationAsyncFailure (Exception exception, int bytesTransferred, SocketFlags flags) + { + throw new NotImplementedException (); + } + + internal void FinishWrapperConnectSuccess (Socket connectSocket, int bytesTransferred, SocketFlags flags) + { + SetResults(SocketError.Success, bytesTransferred, flags); + current_socket = connectSocket; + + Complete (); + OnCompleted (this); + } + + internal void SetResults (SocketError socketError, int bytesTransferred, SocketFlags flags) + { + SocketError = socketError; + BytesTransferred = bytesTransferred; + SocketFlags = flags; + } } } diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs index b26263a75a5..6f5cf7042b0 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs @@ -146,7 +146,7 @@ namespace System.Security.Cryptography.X509Certificates { certArray = FromIntPtrs (secCerts); - if (!string.IsNullOrEmpty (hostName)) + if (hostName != null) host = CFStringCreateWithCharacters (IntPtr.Zero, hostName, (IntPtr) hostName.Length); sslsecpolicy = SecPolicyCreateSSL (true, host); diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources index a2128834812..ffb1bec695a 100644 --- a/mcs/class/System/System.dll.sources +++ b/mcs/class/System/System.dll.sources @@ -1048,6 +1048,7 @@ ReferenceSources/Win32Exception.cs ../referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs +../referencesource/System/net/System/Net/Sockets/_MultipleConnectAsync.cs ../referencesource/System/net/System/Net/Sockets/AddressFamily.cs ../referencesource/System/net/System/Net/Sockets/IOControlCode.cs ../referencesource/System/net/System/Net/Sockets/IPPacketInformation.cs diff --git a/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs b/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs index a9e849fc1e7..5db3aadbc87 100644 --- a/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs +++ b/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs @@ -173,7 +173,7 @@ namespace MonoTests.System.Net.Sockets client.Connect (ipAddresses, 1234); Assert.Fail ("ConnectMultiAny #1"); } catch (SocketException ex) { - Assert.AreEqual (10061, ex.ErrorCode, "ConnectMultiAny #2"); + Assert.AreEqual (10049, ex.ErrorCode, "ConnectMultiAny #2"); } catch { Assert.Fail ("ConnectMultiAny #3"); } diff --git a/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs b/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs index 25e8854ed6a..15b48e5fe2b 100644 --- a/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs +++ b/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs @@ -219,5 +219,27 @@ namespace MonoTests.System.Net.Sockets listen.Start (65536); listen.Stop (); } + + [Test] +#if FEATURE_NO_BSD_SOCKETS + [ExpectedException (typeof (PlatformNotSupportedException))] +#endif + public void EndAcceptTcpClient () + { + var port = NetworkHelpers.FindFreePort (); + + var listenerSocket = new TcpListener (IPAddress.Any, port); + listenerSocket.Start (); + listenerSocket.BeginAcceptTcpClient (new AsyncCallback (l => { + listenerSocket.EndAcceptTcpClient (l); + }), null); + + + using (var outClient = new TcpClient ("localhost", port)) { + using (var stream = outClient.GetStream ()) { + stream.WriteByte (3); + } + } + } } } diff --git a/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs b/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs index b6808979e4a..c252d21b189 100644 --- a/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs +++ b/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs @@ -94,7 +94,7 @@ public class ServicePointManagerTest ServicePointManager.MaxServicePoints = 0; ServicePoint sp = ServicePointManager.FindServicePoint (googleUri, new WebProxy (apacheUri)); Assert.AreEqual (apacheUri, sp.Address, "#1"); -#if MOBILE && !MONODROID +#if MOBILE Assert.AreEqual (10, sp.ConnectionLimit, "#2"); #else Assert.AreEqual (2, sp.ConnectionLimit, "#2"); diff --git a/mcs/class/System/mobile_System.dll.sources b/mcs/class/System/mobile_System.dll.sources index 5224c4de657..1a1b0f52916 100644 --- a/mcs/class/System/mobile_System.dll.sources +++ b/mcs/class/System/mobile_System.dll.sources @@ -781,6 +781,7 @@ ReferenceSources/Win32Exception.cs ../referencesource/System/net/System/Net/Configuration/DefaultProxySection.cs +../referencesource/System/net/System/Net/Sockets/_MultipleConnectAsync.cs ../referencesource/System/net/System/Net/Sockets/AddressFamily.cs ../referencesource/System/net/System/Net/Sockets/IOControlCode.cs ../referencesource/System/net/System/Net/Sockets/IPPacketInformation.cs diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj index cff36539f3b..4b3ee173ef9 100644 --- a/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj +++ b/mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj index ed37cbc38ad..7eea4a2bc95 100644 --- a/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj +++ b/mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj b/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj index 5ac7164723c..6b9b6e376a6 100644 --- a/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj +++ b/mcs/class/WindowsBase/WindowsBase-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -236,6 +236,7 @@ + diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs b/mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs index a55f093678f..8574472acb1 100644 --- a/mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs +++ b/mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs @@ -1,10 +1,12 @@ -// +// // ConditionalWeakTable.cs // // Author: // Rodrigo Kumpera (rkumpera@novell.com) +// Tautvydas Žilys // // Copyright (C) 2010 Novell, Inc (http://www.novell.com) +// Copyright (C) 2016 Unity Technologies (https://unity3d.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -223,25 +225,94 @@ namespace System.Runtime.CompilerServices return res; } - + + //-------------------------------------------------------------------------------------------- + // Find a key that equals (value equality) with the given key - don't use in perf critical path + // Note that it calls out to Object.Equals which may calls the override version of Equals + // and that may take locks and leads to deadlock + // Currently it is only used by WinRT event code and you should only use this function + // if you know for sure that either you won't run into dead locks or you need to live with the + // possiblity + //-------------------------------------------------------------------------------------------- + [System.Security.SecuritySafeCritical] + [FriendAccessAllowed] + internal TKey FindEquivalentKeyUnsafe(TKey key, out TValue value) + { + lock (_lock) + { + for (int i = 0; i < data.Length; ++i) + { + var item = data[i]; + if (Object.Equals(item.key, key)) + { + value = (TValue)item.value; + return (TKey)item.key; + } + } + } + + value = default(TValue); + return null; + } + + //-------------------------------------------------------------------------------------------- + // Clear all the key/value pairs + //-------------------------------------------------------------------------------------------- + [System.Security.SecuritySafeCritical] + internal void Clear() + { + lock (_lock) + { + for (int i = 0; i < data.Length; i++) + { + data[i].key = GC.EPHEMERON_TOMBSTONE; + data[i].value = null; + } + + size = 0; + } + } + // extracted from ../../../../external/referencesource/mscorlib/system/runtime/compilerservices/ internal ICollection Keys { [System.Security.SecuritySafeCritical] get { + var tombstone = GC.EPHEMERON_TOMBSTONE; List list = new List(data.Length); lock (_lock) { for (int i = 0; i < data.Length; ++i) { TKey key = (TKey) data [i].key; - if (key != null) + if (key != null && key != tombstone) list.Add (key); } } return list; } } + + internal ICollection Values + { + [System.Security.SecuritySafeCritical] + get + { + var tombstone = GC.EPHEMERON_TOMBSTONE; + List list = new List(data.Length); + lock (_lock) + { + for (int i = 0; i < data.Length; ++i) + { + var item = data[i]; + if (item.key != null && item.key != tombstone) + list.Add((TValue)item.value); + } + } + + return list; + } + } } } diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs deleted file mode 100644 index 44c76628f5d..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -// DefaultInterfaceAttribute.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [AttributeUsageAttribute(AttributeTargets.Class|AttributeTargets.Interface, AllowMultiple = false, Inherited = false)] - public sealed class DefaultInterfaceAttribute : Attribute - { - public Type DefaultInterface { - get; - private set; - } - - public DefaultInterfaceAttribute (Type defaultInterface) - { - DefaultInterface = defaultInterface; - } - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/EventRegistrationToken.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/EventRegistrationToken.cs deleted file mode 100644 index e3479ebd83c..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/EventRegistrationToken.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// EventRegistrationToken.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - public struct EventRegistrationToken - { -#pragma warning disable 0649 - long value; -#pragma warning restore 0649 - - public static bool operator == (EventRegistrationToken left, EventRegistrationToken right) - { - return left.value == right.value; - } - - public static bool operator != (EventRegistrationToken left, EventRegistrationToken right) - { - return left.value != right.value; - } - - public override bool Equals (object obj) - { - return ((EventRegistrationToken)obj).value == value; - } - - public override int GetHashCode () - { - return unchecked ((int)value); - } - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/EventRegistrationTokenTable.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/EventRegistrationTokenTable.cs deleted file mode 100644 index 0f096810acb..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/EventRegistrationTokenTable.cs +++ /dev/null @@ -1,66 +0,0 @@ -// -// EventRegistrationTokenTable.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [MonoTODO] - public sealed class EventRegistrationTokenTable - where T : class - { - public EventRegistrationTokenTable () - { - throw new NotImplementedException (); - } - - public T InvocationList { - get { throw new NotImplementedException (); } - set { throw new NotImplementedException (); } - } - - public EventRegistrationToken AddEventHandler (T handler) - { - throw new NotImplementedException (); - } - - public static EventRegistrationTokenTable GetOrCreateEventRegistrationTokenTable(ref EventRegistrationTokenTable refEventTable) - { - throw new NotImplementedException (); - } - - public void RemoveEventHandler (T handler) - { - throw new NotImplementedException (); - } - - public void RemoveEventHandler (EventRegistrationToken token) - { - throw new NotImplementedException (); - } - } -} - diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/IActivationFactory.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/IActivationFactory.cs deleted file mode 100644 index 7c516aaa6d0..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/IActivationFactory.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// IActivationFactory.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [Guid("00000035-0000-0000-C000-000000000046")] - public interface IActivationFactory - { - object ActivateInstance (); - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/InterfaceImplementedInVersionAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/InterfaceImplementedInVersionAttribute.cs deleted file mode 100644 index c489221907a..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/InterfaceImplementedInVersionAttribute.cs +++ /dev/null @@ -1,69 +0,0 @@ -// -// InterfaceImplementedInVersionAttribute.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [AttributeUsageAttribute(AttributeTargets.Class|AttributeTargets.Interface, AllowMultiple = true, Inherited = false)] - public sealed class InterfaceImplementedInVersionAttribute : Attribute - { - public InterfaceImplementedInVersionAttribute (Type interfaceType, byte majorVersion, byte minorVersion, - byte buildVersion, byte revisionVersion) - { - InterfaceType = interfaceType; - MajorVersion = majorVersion; - MinorVersion = minorVersion; - BuildVersion = buildVersion; - RevisionVersion = revisionVersion; - } - - public byte BuildVersion { - get; - private set; - } - - public Type InterfaceType { - get; - private set; - } - - public byte MajorVersion { - get; - private set; - } - - public byte MinorVersion { - get; - private set; - } - - public byte RevisionVersion { - get; - private set; - } - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/ReadOnlyArrayAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/ReadOnlyArrayAttribute.cs deleted file mode 100644 index 9aa41a0407c..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/ReadOnlyArrayAttribute.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -// ReadOnlyArrayAttribute.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [AttributeUsageAttribute(AttributeTargets.Parameter, Inherited = false, AllowMultiple = false)] - public sealed class ReadOnlyArrayAttribute : Attribute - { - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/ReturnValueNameAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/ReturnValueNameAttribute.cs deleted file mode 100644 index 8fd01731579..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/ReturnValueNameAttribute.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -// ReturnValueNameAttribute.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [AttributeUsageAttribute(AttributeTargets.Delegate|AttributeTargets.ReturnValue, AllowMultiple = false, Inherited = false)] - public sealed class ReturnValueNameAttribute : Attribute - { - public ReturnValueNameAttribute (string name) - { - Name = name; - } - - public string Name { - get; - private set; - } - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/UnsafeNativeMethods.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/UnsafeNativeMethods.cs new file mode 100644 index 00000000000..a7101cf4f6f --- /dev/null +++ b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/UnsafeNativeMethods.cs @@ -0,0 +1,51 @@ +// +// UnsafeNativeMethods.cs +// +// Author: +// Tautvydas Žilys +// +// Copyright (c) 2016 Unity Technologies (https://www.unity3d.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +using System.Runtime.CompilerServices; + +namespace System.Runtime.InteropServices.WindowsRuntime +{ + internal unsafe static class UnsafeNativeMethods + { + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern int WindowsCreateString(string sourceString, int length, IntPtr* hstring); + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern int WindowsDeleteString(IntPtr hstring); + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern char* WindowsGetStringRawBuffer(IntPtr hstring, uint* length); + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern bool RoOriginateLanguageException(int error, string message, IntPtr languageException); + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern void RoReportUnhandledError(IRestrictedErrorInfo error); + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + public static extern IRestrictedErrorInfo GetRestrictedErrorInfo(); + } +} \ No newline at end of file diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMarshal.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMarshal.cs deleted file mode 100644 index eb324b5c64e..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMarshal.cs +++ /dev/null @@ -1,75 +0,0 @@ -// -// WindowsRuntimeMarshal.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [MonoTODO] - public static class WindowsRuntimeMarshal - { - public static void AddEventHandler ( Func addMethod, Action removeMethod, T handler) - { - throw new NotImplementedException (); - } - - public static void FreeHString (IntPtr ptr) - { - throw new NotImplementedException (); - } - - public static IActivationFactory GetActivationFactory (Type type) - { - throw new NotImplementedException (); - } - - public static string PtrToStringHString (IntPtr ptr) - { - throw new NotImplementedException (); - } - - public static void RemoveAllEventHandlers(Action removeMethod) - { - throw new NotImplementedException (); - } - - public static void RemoveEventHandler (Action removeMethod, T handler) - { - throw new NotImplementedException (); - } - - public static IntPtr StringToHString (string s) - { - throw new NotImplementedException (); - } - - internal static bool ReportUnhandledError (Exception e) - { - return false; - } - } -} - diff --git a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/WriteOnlyArrayAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/WriteOnlyArrayAttribute.cs deleted file mode 100644 index bfb3c0674d2..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices.WindowsRuntime/WriteOnlyArrayAttribute.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -// WriteOnlyArrayAttribute.cs -// -// Author: -// Martin Baulig -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. -using System; -using System.Runtime.CompilerServices; - -namespace System.Runtime.InteropServices.WindowsRuntime -{ - [AttributeUsageAttribute(AttributeTargets.Parameter, Inherited = false, AllowMultiple = false)] - public sealed class WriteOnlyArrayAttribute : Attribute - { - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs index 2def9ddba50..30ff8b74bce 100644 --- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs +++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs @@ -38,6 +38,7 @@ using System.Security; using System.Reflection; using System.Threading; using System.Runtime.InteropServices.ComTypes; +using System.Text; using System.Runtime.ConstrainedExecution; #if !FULL_AOT_RUNTIME @@ -76,6 +77,9 @@ namespace System.Runtime.InteropServices [MethodImplAttribute(MethodImplOptions.InternalCall)] public extern static IntPtr AllocCoTaskMem (int cb); + + [MethodImplAttribute(MethodImplOptions.InternalCall)] + internal extern static IntPtr AllocCoTaskMemSize (UIntPtr sizet); [MethodImplAttribute(MethodImplOptions.InternalCall)] [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)] @@ -278,6 +282,12 @@ namespace System.Runtime.InteropServices FreeCoTaskMem (s); } + public static void ZeroFreeCoTaskMemUTF8 (IntPtr s) + { + ClearAnsi (s); + FreeCoTaskMem (s); + } + public static void ZeroFreeGlobalAllocAnsi (IntPtr s) { ClearAnsi (s); @@ -751,6 +761,16 @@ namespace System.Runtime.InteropServices [MethodImplAttribute(MethodImplOptions.InternalCall)] public extern static string PtrToStringAnsi (IntPtr ptr, int len); + public static string PtrToStringUTF8 (IntPtr ptr) + { + return PtrToStringAnsi (ptr); + } + + public static string PtrToStringUTF8 (IntPtr ptr, int byteLen) + { + return PtrToStringAnsi (ptr, byteLen); + } + public static string PtrToStringAuto (IntPtr ptr) { return SystemDefaultCharSize == 2 @@ -1053,23 +1073,9 @@ namespace System.Runtime.InteropServices [MethodImplAttribute(MethodImplOptions.InternalCall)] public extern static IntPtr StringToBSTR (string s); - // - // I believe this is wrong, because in Mono and in P/Invoke - // we treat "Ansi" conversions as UTF-8 conversions, while - // this one does not do this - // public static IntPtr StringToCoTaskMemAnsi (string s) { - int length = s.Length + 1; - IntPtr ctm = AllocCoTaskMem (length); - - byte[] asBytes = new byte[length]; - for (int i = 0; i < s.Length; i++) - asBytes[i] = (byte)s[i]; - asBytes[s.Length] = 0; - - copy_to_unmanaged (asBytes, 0, ctm, length); - return ctm; + return StringToAllocatedMemoryUTF8 (s); } public static IntPtr StringToCoTaskMemAuto (string s) @@ -1094,6 +1100,29 @@ namespace System.Runtime.InteropServices [MethodImplAttribute(MethodImplOptions.InternalCall)] public extern static IntPtr StringToHGlobalAnsi (string s); + unsafe public static IntPtr StringToAllocatedMemoryUTF8(String s) + { + const int MAX_UTF8_CHAR_SIZE = 3; + if (s == null) + return IntPtr.Zero; + + int nb = (s.Length + 1) * MAX_UTF8_CHAR_SIZE; + + // Overflow checking + if (nb < s.Length) + throw new ArgumentOutOfRangeException("s"); + + IntPtr pMem = AllocCoTaskMemSize(new UIntPtr((uint)nb +1)); + + if (pMem == IntPtr.Zero) + throw new OutOfMemoryException(); + + byte* pbMem = (byte*)pMem; + int nbWritten = s.GetBytesFromEncoding(pbMem, nb, Encoding.UTF8); + pbMem[nbWritten] = 0; + return pMem; + } + public static IntPtr StringToHGlobalAuto (string s) { return SystemDefaultCharSize == 2 @@ -1722,5 +1751,31 @@ namespace System.Runtime.InteropServices internal static void SetLastWin32Error (int error) { } + + // Copied from referencesource/mscorlib/system/runtime/interopservices/marshal.cs + //==================================================================== + // return the raw IUnknown* for a COM Object not related to current + // context + // Does not call AddRef + //==================================================================== + [MethodImplAttribute(MethodImplOptions.InternalCall)] + internal static extern IntPtr /* IUnknown* */ GetRawIUnknownForComObjectNoAddRef(Object o); + + // Copied from referencesource/mscorlib/system/runtime/interopservices/marshal.cs + //==================================================================== + // Converts the CLR exception to an HRESULT. This function also sets + // up an IErrorInfo for the exception. + // This function is only used in WinRT and converts ObjectDisposedException + // to RO_E_CLOSED + //==================================================================== + [MethodImplAttribute(MethodImplOptions.InternalCall)] + internal static extern int GetHRForException_WinRT(Exception e); + + // Copied from referencesource/mscorlib/system/runtime/interopservices/marshal.cs + //======================================================================== + // Create activation factory and wraps it with a unique RCW + //======================================================================== + [MethodImplAttribute(MethodImplOptions.InternalCall)] + internal static extern object GetNativeActivationFactory(Type type); } } diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs index 19d17929c54..13e99d04b9a 100644 --- a/mcs/class/corlib/System/Environment.cs +++ b/mcs/class/corlib/System/Environment.cs @@ -1040,6 +1040,15 @@ namespace System { // Do not include a trailing newline for backwards compatibility return st.ToString( System.Diagnostics.StackTrace.TraceFormat.Normal ); } + + // Copied from referencesource Environment + internal static bool IsWinRTSupported + { + get + { + return true; + } + } } } diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs index 7f5e1ee5000..8e67c976f1e 100644 --- a/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs +++ b/mcs/class/corlib/Test/System.Reflection.Emit/ModuleBuilderTest.cs @@ -805,7 +805,7 @@ namespace MonoTests.System.Reflection.Emit public void GetType () { AssemblyBuilder ab = genAssembly (); - ModuleBuilder module = ab.DefineDynamicModule ("foo.dll", "foo.dll", true); + ModuleBuilder module = ab.DefineDynamicModule ("foo.dll", "foo.dll"); TypeBuilder tb = module.DefineType ("t1", TypeAttributes.Public); Assert.AreEqual ("t1[]", module.GetType ("t1[]").FullName); diff --git a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs index d4ca72dc0a9..18f58415a1b 100644 --- a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs +++ b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs @@ -155,6 +155,54 @@ namespace MonoTests.System.Runtime.InteropServices } } + readonly String[] TestStrings = new String[] { + "", //Empty String + "Test String", + "A", //Single character string + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself. " + + "This is a very long string as it repeats itself.", + "This \n is \n a \n multiline \n string", + "This \0 is \0 a \0 string \0 with \0 nulls", + "\0string", + "string\0", + "\0\0\0\0\0\0\0\0" + }; + + [Test] + public unsafe void PtrToStringUTF8_Test () + { + int i = 0; + foreach (String srcString in TestStrings) + { + i++; + // we assume string null terminated + if (srcString.Contains("\0")) + continue; + + IntPtr ptrString = Marshal.StringToAllocatedMemoryUTF8(srcString); + string retString = Marshal.PtrToStringUTF8(ptrString); + + Assert.AreEqual (srcString, retString, "#" + i); + if (srcString.Length > 0) + { + string retString2 = Marshal.PtrToStringUTF8(ptrString, srcString.Length - 1); + Assert.AreEqual (srcString.Substring(0, srcString.Length - 1), retString2, "#s" + i); + } + Marshal.FreeHGlobal(ptrString); + } + } + [Test] public unsafe void UnsafeAddrOfPinnedArrayElement () { diff --git a/mcs/class/corlib/corlib-net_4_x.csproj b/mcs/class/corlib/corlib-net_4_x.csproj index 80bce2dd720..1e89d68be88 100644 --- a/mcs/class/corlib/corlib-net_4_x.csproj +++ b/mcs/class/corlib/corlib-net_4_x.csproj @@ -28,7 +28,7 @@ full 612,618,1635,1699 false - TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS + TRACE;INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS prompt 4 @@ -36,7 +36,7 @@ pdbonly 612,618,1635,1699 true - INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS + INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS prompt 4 @@ -48,6 +48,10 @@ + + + + @@ -218,6 +222,7 @@ + @@ -235,6 +240,8 @@ + + @@ -399,6 +406,9 @@ + + + @@ -442,10 +452,12 @@ + + @@ -539,6 +551,12 @@ + + + + + + @@ -585,7 +603,6 @@ - @@ -642,6 +659,7 @@ + @@ -665,6 +683,7 @@ + @@ -693,6 +712,7 @@ + @@ -704,12 +724,14 @@ + + @@ -756,6 +778,7 @@ + @@ -779,12 +802,7 @@ - - - - - - + @@ -817,11 +835,17 @@ + + + + + + @@ -837,6 +861,7 @@ + @@ -845,7 +870,6 @@ - @@ -872,7 +896,13 @@ + + + + + + @@ -919,30 +949,40 @@ + + + + + + + + + + @@ -951,18 +991,24 @@ + + + + + + @@ -981,7 +1027,6 @@ - @@ -991,26 +1036,15 @@ - - - - - - - - - - - + - @@ -1045,6 +1079,9 @@ + + + @@ -1104,6 +1141,7 @@ + @@ -1362,9 +1400,9 @@ + - @@ -1513,7 +1551,6 @@ - @@ -1529,7 +1566,6 @@ - @@ -1572,9 +1608,6 @@ - - - diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index e2dfdbb5b8f..23e581b9552 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -423,18 +423,10 @@ System.Runtime.InteropServices/CustomQueryInterfaceMode.cs System.Runtime.InteropServices/ComAwareEventInfo.cs System.Runtime.InteropServices/ComEventsHelper.cs -System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs System.Runtime.InteropServices.WindowsRuntime/DesignerNamespaceResolveEventArgs.cs -System.Runtime.InteropServices.WindowsRuntime/EventRegistrationToken.cs -System.Runtime.InteropServices.WindowsRuntime/EventRegistrationTokenTable.cs -System.Runtime.InteropServices.WindowsRuntime/IActivationFactory.cs -System.Runtime.InteropServices.WindowsRuntime/InterfaceImplementedInVersionAttribute.cs System.Runtime.InteropServices.WindowsRuntime/NamespaceResolveEventArgs.cs -System.Runtime.InteropServices.WindowsRuntime/ReadOnlyArrayAttribute.cs -System.Runtime.InteropServices.WindowsRuntime/ReturnValueNameAttribute.cs -System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMarshal.cs +System.Runtime.InteropServices.WindowsRuntime/UnsafeNativeMethods.cs System.Runtime.InteropServices.WindowsRuntime/WindowsRuntimeMetadata.cs -System.Runtime.InteropServices.WindowsRuntime/WriteOnlyArrayAttribute.cs System.Runtime.Remoting/ActivatedClientTypeEntry.cs System.Runtime.Remoting/ActivatedServiceTypeEntry.cs System.Runtime.Remoting/CustomErrorsModes.cs @@ -1346,6 +1338,13 @@ ReferenceSources/Type.cs ../referencesource/mscorlib/system/runtime/interopservices/expando/iexpando.cs +../referencesource/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs +../referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs +../referencesource/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs +../referencesource/mscorlib/system/runtime/interopservices/windowsruntime/iactivationfactory.cs +../referencesource/mscorlib/system/runtime/interopservices/windowsruntime/irestrictederrorinfo.cs +../referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs + ../referencesource/mscorlib//system/runtime/reliability/criticalfinalizerobject.cs ../referencesource/mscorlib//system/runtime/reliability/prepreparemethodattribute.cs ../referencesource/mscorlib//system/runtime/reliability/reliabilitycontractattribute.cs diff --git a/mcs/class/legacy/Mono.Cecil/Mono.Cecil-net_4_x.csproj b/mcs/class/legacy/Mono.Cecil/Mono.Cecil-net_4_x.csproj new file mode 100644 index 00000000000..a22a07e2db0 --- /dev/null +++ b/mcs/class/legacy/Mono.Cecil/Mono.Cecil-net_4_x.csproj @@ -0,0 +1,218 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {6DE38817-EC25-433A-AE58-0D30C5E6C460} + Library + 1699,1699 + ./../../../class/lib/net_4_x/legacy + obj-legacy + false + True + + True + + Properties + + + Mono.Cecil + v4.5 + 512 + + + true + + + ../../mono.snk + + + true + full + 1699,1699 + false + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5 + prompt + 4 + + + pdbonly + 1699,1699 + true + NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5;NET_4_0;NET_4_5;NET_4_6;MONO;NET_3_5 + prompt + 4 + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {359142A1-D80F-401E-AA64-7167C9317649} + System.Core-net_4_x + + + + + + + diff --git a/mcs/class/monodoc/monodoc-net_4_x.csproj b/mcs/class/monodoc/monodoc-net_4_x.csproj index 114d68896c5..8fd26ed2f5b 100644 --- a/mcs/class/monodoc/monodoc-net_4_x.csproj +++ b/mcs/class/monodoc/monodoc-net_4_x.csproj @@ -28,7 +28,7 @@ full 618,612,672,809,1699,169,164,162,168,219,618,612 false - TRACE;LEGACY_MODE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;LEGACY_MODE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 618,612,672,809,1699,169,164,162,168,219,618,612 true - LEGACY_MODE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + LEGACY_MODE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs b/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs index 26248db1547..16169a1b7a5 100644 --- a/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs +++ b/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs @@ -1106,6 +1106,7 @@ namespace System.Net.Sockets { Connect(addresses,port); if(s_LoggingEnabled)Logging.Exit(Logging.Sockets, this, "Connect", null); } +#endif // !MONO public void Connect(IPAddress[] addresses, int port){ if(s_LoggingEnabled)Logging.Enter(Logging.Sockets, this, "Connect", addresses); @@ -1154,7 +1155,7 @@ namespace System.Net.Sockets { if(s_LoggingEnabled)Logging.Exit(Logging.Sockets, this, "Connect", null); } - +#if !MONO /// /// /// Forces a socket connection to close. @@ -7840,6 +7841,7 @@ namespace System.Net.Sockets { return retval; } +#endif // MONO public static bool ConnectAsync(SocketType socketType, ProtocolType protocolType, SocketAsyncEventArgs e) { bool retval; @@ -7882,6 +7884,7 @@ namespace System.Net.Sockets { return retval; } +#if !MONO public static void CancelConnectAsync(SocketAsyncEventArgs e) { if (e == null) { diff --git a/mcs/class/referencesource/System/net/System/Net/Sockets/TCPListener.cs b/mcs/class/referencesource/System/net/System/Net/Sockets/TCPListener.cs index cf5ae7d3e83..43a0479d2d4 100644 --- a/mcs/class/referencesource/System/net/System/Net/Sockets/TCPListener.cs +++ b/mcs/class/referencesource/System/net/System/Net/Sockets/TCPListener.cs @@ -285,8 +285,13 @@ namespace System.Net.Sockets { throw new ArgumentNullException("asyncResult"); } +#if MONO + var sar = asyncResult as SocketAsyncResult; + Socket asyncSocket = sar == null ? null : sar.socket; +#else LazyAsyncResult lazyResult = asyncResult as LazyAsyncResult; Socket asyncSocket = lazyResult == null ? null : lazyResult.AsyncObject as Socket; +#endif if (asyncSocket == null) { throw new ArgumentException(SR.GetString(SR.net_io_invalidasyncresult), "asyncResult"); @@ -318,8 +323,13 @@ namespace System.Net.Sockets { throw new ArgumentNullException("asyncResult"); } +#if MONO + var sar = asyncResult as SocketAsyncResult; + Socket asyncSocket = sar == null ? null : sar.socket; +#else LazyAsyncResult lazyResult = asyncResult as LazyAsyncResult; Socket asyncSocket = lazyResult == null ? null : lazyResult.AsyncObject as Socket; +#endif if (asyncSocket == null) { throw new ArgumentException(SR.GetString(SR.net_io_invalidasyncresult), "asyncResult"); diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs index 17068f63bc9..83a6c0b161d 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs @@ -522,6 +522,9 @@ namespace System.Runtime.InteropServices{ [System.Runtime.InteropServices.ComVisible(false)] HString = 0x2f, // Windows Runtime HSTRING + + [System.Runtime.InteropServices.ComVisible(false)] + LPUTF8Str = 0x30, // UTF8 string } #if !MONO diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs index aacf09fdbb1..79d8a97c4db 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs @@ -1278,11 +1278,13 @@ namespace System.Runtime.InteropServices.WindowsRuntime if (type == null) throw new ArgumentNullException("type"); +#if FEATURE_COMINTEROP || MONO_COM if (type.IsWindowsRuntimeObject && type.IsImport) { return (IActivationFactory)Marshal.GetNativeActivationFactory(type); } else +#endif { #if FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION return GetManagedActivationFactory(type); diff --git a/mcs/class/referencesource/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs b/mcs/class/referencesource/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs index a1b0a778698..1cab13c87b3 100644 --- a/mcs/class/referencesource/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs +++ b/mcs/class/referencesource/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs @@ -528,7 +528,8 @@ namespace System.Security.Cryptography { Contract.Assert(!String.IsNullOrEmpty(hashAlgorithm.Name)); #if MONO - throw new NotImplementedException (); + var hash = HashAlgorithm.Create (hashAlgorithm.Name); + return hash.ComputeHash (data, offset, count); #else using (SafeHashHandle hashHandle = Utils.CreateHash(Utils.StaticProvHandle, GetAlgorithmId(hashAlgorithm))) { Utils.HashData(hashHandle, data, offset, count); @@ -544,7 +545,8 @@ namespace System.Security.Cryptography { Contract.Assert(!String.IsNullOrEmpty(hashAlgorithm.Name)); #if MONO - throw new NotImplementedException (); + var hash = HashAlgorithm.Create (hashAlgorithm.Name); + return hash.ComputeHash (data); #else using (SafeHashHandle hashHandle = Utils.CreateHash(Utils.StaticProvHandle, GetAlgorithmId(hashAlgorithm))) { // Read the data 4KB at a time, providing similar read characteristics to a standard HashAlgorithm diff --git a/mcs/class/referencesource/mscorlib/system/string.cs b/mcs/class/referencesource/mscorlib/system/string.cs index 3f96ac1c00e..e8fe32e54d1 100644 --- a/mcs/class/referencesource/mscorlib/system/string.cs +++ b/mcs/class/referencesource/mscorlib/system/string.cs @@ -1392,6 +1392,16 @@ namespace System { return s; } + + unsafe internal int GetBytesFromEncoding(byte* pbNativeBuffer, int cbNativeBuffer,Encoding encoding) + { + // encoding == Encoding.UTF8 + fixed (char* pwzChar = &this.m_firstChar) + { + return encoding.GetBytes(pwzChar, m_stringLength, pbNativeBuffer, cbNativeBuffer); + } + } + #if !MONO [System.Security.SecuritySafeCritical] // auto-generated unsafe internal int ConvertToAnsi(byte *pbNativeBuffer, int cbNativeBuffer, bool fBestFit, bool fThrowOnUnmappableChar) diff --git a/mcs/errors/cs0031-9.cs b/mcs/errors/cs0031-9.cs new file mode 100644 index 00000000000..ec2b3b960bd --- /dev/null +++ b/mcs/errors/cs0031-9.cs @@ -0,0 +1,7 @@ +// CS0031: Constant value `1.42' cannot be converted to a `int' +// Line: 6 + +class X +{ + const int val = 1.42f; +} \ No newline at end of file diff --git a/mcs/ilasm/ilasm-net_4_x.csproj b/mcs/ilasm/ilasm-net_4_x.csproj index cf8834c52c7..428219143c5 100644 --- a/mcs/ilasm/ilasm-net_4_x.csproj +++ b/mcs/ilasm/ilasm-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs index acec3be3588..c16a0aa1c97 100644 --- a/mcs/mcs/constant.cs +++ b/mcs/mcs/constant.cs @@ -478,7 +478,7 @@ namespace Mono.CSharp { catch { ec.Report.Error (31, loc, "Constant value `{0}' cannot be converted to a `{1}'", - GetValue ().ToString (), target.GetSignatureForError ()); + GetValueAsLiteral (), target.GetSignatureForError ()); } } @@ -1697,7 +1697,7 @@ namespace Mono.CSharp { public override string GetValueAsLiteral () { - return Value.ToString (); + return Value.ToString (CultureInfo.InvariantCulture); } public override long GetValueAsLong () @@ -1820,7 +1820,7 @@ namespace Mono.CSharp { public override string GetValueAsLiteral () { - return Value.ToString (); + return Value.ToString (CultureInfo.InvariantCulture); } public override long GetValueAsLong () @@ -2021,7 +2021,7 @@ namespace Mono.CSharp { public override string GetValueAsLiteral () { - return Value.ToString () + "M"; + return Value.ToString (CultureInfo.InvariantCulture) + "M"; } public override long GetValueAsLong () diff --git a/mcs/mcs/mcs-net_4_x.csproj b/mcs/mcs/mcs-net_4_x.csproj index 46bedb48612..ea9b5ddf768 100644 --- a/mcs/mcs/mcs-net_4_x.csproj +++ b/mcs/mcs/mcs-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj b/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj index 23eed1ddb29..69bdc23a5cb 100644 --- a/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj +++ b/mcs/nunit24/ClientUtilities/util/nunit.util-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console-net_4_x.csproj b/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console-net_4_x.csproj index 83cb5607a2e..d5bfd0df4c1 100644 --- a/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console-net_4_x.csproj +++ b/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner-net_4_x.csproj b/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner-net_4_x.csproj index ed6ee53d384..cf81560c25e 100644 --- a/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner-net_4_x.csproj +++ b/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/nunit24/NUnitCore/core/nunit.core-net_4_x.csproj b/mcs/nunit24/NUnitCore/core/nunit.core-net_4_x.csproj index e6b70afdcba..32ce8c4aaca 100644 --- a/mcs/nunit24/NUnitCore/core/nunit.core-net_4_x.csproj +++ b/mcs/nunit24/NUnitCore/core/nunit.core-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces-net_4_x.csproj b/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces-net_4_x.csproj index 93d549db2a0..94909552477 100644 --- a/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces-net_4_x.csproj +++ b/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions-net_4_x.csproj b/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions-net_4_x.csproj index c7352101e5e..1b1ac55efa3 100644 --- a/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions-net_4_x.csproj +++ b/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;StronglyNamedAssembly + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;StronglyNamedAssembly prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;StronglyNamedAssembly + NET_4_0;NET_4_5;NET_4_6;MONO;StronglyNamedAssembly prompt 4 diff --git a/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions-net_4_x.csproj b/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions-net_4_x.csproj index dc02b28ebcb..bd69477f36e 100644 --- a/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions-net_4_x.csproj +++ b/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;StronglyNamedAssembly + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;StronglyNamedAssembly prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;StronglyNamedAssembly + NET_4_0;NET_4_5;NET_4_6;MONO;StronglyNamedAssembly prompt 4 diff --git a/mcs/nunit24/NUnitFramework/framework/NUnit.Framework-net_4_x.csproj b/mcs/nunit24/NUnitFramework/framework/NUnit.Framework-net_4_x.csproj index fae60ac6a97..9f5de981862 100644 --- a/mcs/nunit24/NUnitFramework/framework/NUnit.Framework-net_4_x.csproj +++ b/mcs/nunit24/NUnitFramework/framework/NUnit.Framework-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;StronglyNamedAssembly + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;StronglyNamedAssembly prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;StronglyNamedAssembly + NET_4_0;NET_4_5;NET_4_6;MONO;StronglyNamedAssembly prompt 4 diff --git a/mcs/nunit24/NUnitMocks/mocks/nunit.mocks-net_4_x.csproj b/mcs/nunit24/NUnitMocks/mocks/nunit.mocks-net_4_x.csproj index a032cb9bf23..eaab4d6360b 100644 --- a/mcs/nunit24/NUnitMocks/mocks/nunit.mocks-net_4_x.csproj +++ b/mcs/nunit24/NUnitMocks/mocks/nunit.mocks-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/al/al-net_4_x.csproj b/mcs/tools/al/al-net_4_x.csproj index 2657ba32963..367ec7d557e 100644 --- a/mcs/tools/al/al-net_4_x.csproj +++ b/mcs/tools/al/al-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/browsercaps-updater/browsercaps-updater-net_4_x.csproj b/mcs/tools/browsercaps-updater/browsercaps-updater-net_4_x.csproj index 40cc077a60f..718e3460246 100644 --- a/mcs/tools/browsercaps-updater/browsercaps-updater-net_4_x.csproj +++ b/mcs/tools/browsercaps-updater/browsercaps-updater-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/btls/btls-cert-sync-net_4_x.csproj b/mcs/tools/btls/btls-cert-sync-net_4_x.csproj new file mode 100644 index 00000000000..1b50d52ccaf --- /dev/null +++ b/mcs/tools/btls/btls-cert-sync-net_4_x.csproj @@ -0,0 +1,98 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {2323EB4F-0DBA-47C7-B4AA-AD38CCD16BF8} + Exe + 1699 + ./../../class/lib/net_4_x + obj-net_4_x + false + True + + True + + Properties + + + btls-cert-sync + v4.5 + 512 + + + + true + full + 1699 + false + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO + prompt + 4 + + + pdbonly + 1699 + true + NET_4_0;NET_4_5;NET_4_6;MONO + prompt + 4 + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} + corlib-net_4_x + + + {2762E921-91A8-4C87-91E9-BA628013F753} + System-net_4_x + + + {42D59DE7-586F-4ACF-BDD5-E7869E39E3EF} + Mono.Security-net_4_x + + + {BF32D586-8FBB-4A2A-A734-AA17CDAB283F} + Mono.Btls.Interface-net_4_x + + + + + + + diff --git a/mcs/tools/cccheck/cccheck-net_4_x.csproj b/mcs/tools/cccheck/cccheck-net_4_x.csproj index ef7c94e26a1..047a651f16e 100644 --- a/mcs/tools/cccheck/cccheck-net_4_x.csproj +++ b/mcs/tools/cccheck/cccheck-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/ccrewrite/ccrewrite-net_4_x.csproj b/mcs/tools/ccrewrite/ccrewrite-net_4_x.csproj index 69b39b8665a..145193e0993 100644 --- a/mcs/tools/ccrewrite/ccrewrite-net_4_x.csproj +++ b/mcs/tools/ccrewrite/ccrewrite-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/cil-stringreplacer/cil-stringreplacer-net_4_x.csproj b/mcs/tools/cil-stringreplacer/cil-stringreplacer-net_4_x.csproj index fcac8236676..2aba4c7303f 100644 --- a/mcs/tools/cil-stringreplacer/cil-stringreplacer-net_4_x.csproj +++ b/mcs/tools/cil-stringreplacer/cil-stringreplacer-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -80,8 +80,8 @@ {2762E921-91A8-4C87-91E9-BA628013F753} System-net_4_x - - {2C0D558F-0B38-4691-967E-A910A1B995C1} + + {6DE38817-EC25-433A-AE58-0D30C5E6C460} Mono.Cecil-net_4_x diff --git a/mcs/tools/cil-strip/mono-cil-strip-net_4_x.csproj b/mcs/tools/cil-strip/mono-cil-strip-net_4_x.csproj index 7a24a4cd46a..cd477b6ce7f 100644 --- a/mcs/tools/cil-strip/mono-cil-strip-net_4_x.csproj +++ b/mcs/tools/cil-strip/mono-cil-strip-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/commoncryptogenerator/commoncryptogenerator-net_4_x.csproj b/mcs/tools/commoncryptogenerator/commoncryptogenerator-net_4_x.csproj index f33343cf5e6..3aab24e89b1 100644 --- a/mcs/tools/commoncryptogenerator/commoncryptogenerator-net_4_x.csproj +++ b/mcs/tools/commoncryptogenerator/commoncryptogenerator-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/compiler-tester/compiler-tester-net_4_x.csproj b/mcs/tools/compiler-tester/compiler-tester-net_4_x.csproj index 22ebee6b91d..5fa2fece9d2 100644 --- a/mcs/tools/compiler-tester/compiler-tester-net_4_x.csproj +++ b/mcs/tools/compiler-tester/compiler-tester-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/corcompare/mono-api-info-net_4_x.csproj b/mcs/tools/corcompare/mono-api-info-net_4_x.csproj index 5fcf051eccf..26a6f176a73 100644 --- a/mcs/tools/corcompare/mono-api-info-net_4_x.csproj +++ b/mcs/tools/corcompare/mono-api-info-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -79,8 +79,8 @@ {2CA6026B-2DC8-4C4C-A12C-1E8234049DB7} corlib-net_4_x - - {2C0D558F-0B38-4691-967E-A910A1B995C1} + + {6DE38817-EC25-433A-AE58-0D30C5E6C460} Mono.Cecil-net_4_x diff --git a/mcs/tools/csharp/csharp-net_4_x.csproj b/mcs/tools/csharp/csharp-net_4_x.csproj index 1da92c6446f..deee27c5f76 100644 --- a/mcs/tools/csharp/csharp-net_4_x.csproj +++ b/mcs/tools/csharp/csharp-net_4_x.csproj @@ -28,7 +28,7 @@ full 3021,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 3021,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/culevel/culevel-net_4_x.csproj b/mcs/tools/culevel/culevel-net_4_x.csproj index c28f23987fc..0f6d7fc49cc 100644 --- a/mcs/tools/culevel/culevel-net_4_x.csproj +++ b/mcs/tools/culevel/culevel-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/disco/disco-net_4_x.csproj b/mcs/tools/disco/disco-net_4_x.csproj index 28c7350a7c9..65a0dc9cd56 100644 --- a/mcs/tools/disco/disco-net_4_x.csproj +++ b/mcs/tools/disco/disco-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/dtd2rng/dtd2rng-net_4_x.csproj b/mcs/tools/dtd2rng/dtd2rng-net_4_x.csproj index 4d15a18b0e9..3a717b1ba36 100644 --- a/mcs/tools/dtd2rng/dtd2rng-net_4_x.csproj +++ b/mcs/tools/dtd2rng/dtd2rng-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/dtd2xsd/dtd2xsd-net_4_x.csproj b/mcs/tools/dtd2xsd/dtd2xsd-net_4_x.csproj index 01da80aef2a..b30fdc956a8 100644 --- a/mcs/tools/dtd2xsd/dtd2xsd-net_4_x.csproj +++ b/mcs/tools/dtd2xsd/dtd2xsd-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 diff --git a/mcs/tools/gacutil/gacutil-net_4_x.csproj b/mcs/tools/gacutil/gacutil-net_4_x.csproj index fb1472e31a3..a9772c9dabe 100644 --- a/mcs/tools/gacutil/gacutil-net_4_x.csproj +++ b/mcs/tools/gacutil/gacutil-net_4_x.csproj @@ -28,7 +28,7 @@ full 1699,1699 false - TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + TRACE;NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -36,7 +36,7 @@ pdbonly 1699,1699 true - NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE + NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO prompt 4 @@ -48,6 +48,13 @@ + + + + + + +