Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
--- a/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
@ -29,6 +29,7 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.

+#if !NO_ODBC
 using System;
 using System.Collections;
 using System.Data;
@ -831,3 +832,5 @@ namespace MonoTests.System.Data.Odbc
 		}
 	}
 }
+
+#endif