Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3

mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs

@@ -27,5 +27,4 @@ using System.Runtime.InteropServices;
 */
 
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
 

mcs/class/Mono.Data.Tds/Makefile

@@ -4,6 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = Mono.Data.Tds.dll
 LIB_REFS = System System.Xml Mono.Security
+KEYFILE = ../mono.pub
 LIB_MCS_FLAGS =
 
 TEST_MCS_FLAGS =

mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds70.cs

@@ -151,7 +151,7 @@ namespace Mono.Data.Tds.Protocol
 					p.Precision = (p.Precision !=0  ? p.Precision : (byte) Precision);
 										
 				parms.Append (p.Prepare ());
-				if (p.Direction == TdsParameterDirection.Output)
+				if (p.Direction == TdsParameterDirection.Output || p.Direction == TdsParameterDirection.InputOutput)
 					parms.Append (" output");
 			}
 			return parms.ToString ();

mcs/class/Mono.Data.Tds/Test/bug-4786.cs

@@ -45,19 +45,18 @@ namespace MonoTests.Mono.Data.Tds
     public void CheckNullException() 
     {
 
+    TcpListener Listener = null;
+
 	//set up dummy sql listener, if there is a real sql server on this
 	//machine at that port, in theory this part will fail, but that's ok
 	//becuase something will be listening on the port and that's all we
 	//require at this point: a listener on port 1433...
 
 	try{
-		Socket Listener = new Socket(AddressFamily.InterNetwork, 
-                                         SocketType.Stream,
-                                         ProtocolType.Tcp);
 		IPAddress hostIP =Dns.GetHostEntry("localhost").AddressList[0];
-        	IPEndPoint ep = new IPEndPoint(hostIP, 1433);
-		Listener.Bind(ep); 
-        	Listener.Listen(1);
+        IPEndPoint ep = new IPEndPoint(hostIP, 1433);
+        Listener = new TcpListener (ep);
+        Listener.Start ();
 	} catch (Exception){
 		//ignore
 	}
@@ -103,6 +102,7 @@ namespace MonoTests.Mono.Data.Tds
 
 	pool.ReleaseConnection(tds);
 
+	Listener.Stop ();
 	//exit
     }
   }