Fix issues with SqlCommandSet not working with Byte Array parameters

src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommandSet.cs

@@ -150,7 +150,7 @@ internal void Append(SqlCommand command)
                         int offset = p.Offset;
                         int size = p.Size;
                         int countOfBytes = byteValues.Length - offset;
-                        if ((0 != size) && (size < countOfBytes))
+                        if ((size > 0) && (size < countOfBytes))
                         {
                             countOfBytes = size;
                         }

src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/CommandCancelTest/CommandCancelTest.cs → src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlCommandTest/SqlCommandCancelTest.cs

@@ -8,7 +8,7 @@
 
 namespace System.Data.SqlClient.ManualTesting.Tests
 {
-    public static class CommandCancelTest
+    public static class SqlCommandCancelTest
     {
         // Shrink the packet size - this should make timeouts more likely
         private static readonly string s_connStr = (new SqlConnectionStringBuilder(DataTestUtility.TcpConnStr) { PacketSize = 512 }).ConnectionString;
@@ -136,7 +136,7 @@ private static void MultiThreadedCancel(string constr, bool async)
 
                 Task.WaitAll(tasks, 15 * 1000);
 
-                CommandCancelTest.VerifyConnection(command);
+                SqlCommandCancelTest.VerifyConnection(command);
             }
         }
 

src/libraries/System.Data.SqlClient/tests/ManualTests/SQL/SqlCommandTest/SqlCommandSetTest.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Data.SqlTypes;
+using System.Reflection;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+
+namespace System.Data.SqlClient.ManualTesting.Tests
+{
+    public class SqlCommandSetTest
+    {
+        private static Assembly sqlclient = Assembly.GetAssembly(typeof(SqlConnection));
+
+        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup))]
+        public void TestByteArrayParameters()
+        {
+            string tableName = DataTestUtility.GetUniqueNameForSqlServer("CMD");
+            string procName = DataTestUtility.GetUniqueNameForSqlServer("CMD");
+            byte[] bArray = new byte[] { 1, 2, 3 };
+
+            using (var connection = new SqlConnection(DataTestUtility.TcpConnStr))
+            {
+                connection.Open();
+                try
+                {
+                    using (var cmd = new SqlCommand(procName, connection))
+                    {
+                        setupByteArrayArtifacts(connection, tableName, procName);
+
+                        // Insert with SqlCommand
+                        cmd.CommandType = System.Data.CommandType.StoredProcedure;
+                        SqlCommandBuilder.DeriveParameters(cmd);
+                        cmd.Parameters["@array"].Value = bArray;
+
+                        cmd.ExecuteNonQuery();
+
+                        //Insert with command Set
+                        var commandSetType = sqlclient.GetType("System.Data.SqlClient.SqlCommandSet");
+                        var cmdSet = Activator.CreateInstance(commandSetType, true);
+                        commandSetType.GetMethod("Append", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).Invoke(cmdSet, new object[] { cmd });
+                        commandSetType.GetProperty("Connection", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).GetSetMethod(true).Invoke(cmdSet, new object[] { connection });
+                        commandSetType.GetMethod("ExecuteNonQuery", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).Invoke(cmdSet, new object[] { });
+
+                        cmd.CommandType = System.Data.CommandType.Text;
+                        cmd.CommandText = $"SELECT * FROM {tableName}";
+                        using (SqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            while (reader.Read())
+                            {
+                                SqlBytes byteArray = reader.GetSqlBytes(0);
+                                Assert.Equal(bArray.Length, byteArray.Length);
+
+                                for (int i = 0; i < bArray.Length; i++)
+                                {
+                                    Assert.Equal(bArray[i], byteArray[i]);
+                                }
+                            }
+
+                        }
+                    }
+                }
+                finally
+                {
+                    dropByteArrayArtifacts(connection, tableName, procName);
+                }
+            }
+        }
+
+        private void dropByteArrayArtifacts(SqlConnection connection, string tableName, string procName)
+        {
+            using (SqlCommand cmd = connection.CreateCommand())
+            {
+                cmd.CommandText = $"DROP TABLE IF EXISTS {tableName}";
+                cmd.ExecuteNonQuery();
+
+                cmd.CommandText = $"DROP PROCEDURE IF EXISTS {procName}";
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        private void setupByteArrayArtifacts(SqlConnection connection, string tableName, string procName)
+        {
+            using (SqlCommand cmd = connection.CreateCommand())
+            {
+                cmd.CommandText = $"CREATE TABLE {tableName} (ByteArrayColumn varbinary(max))";
+                cmd.ExecuteNonQuery();
+
+                cmd.CommandText = $"CREATE PROCEDURE {procName} @array varbinary(max) AS BEGIN SET NOCOUNT ON; " +
+                    $"insert into {tableName}(ByteArrayColumn) values(@array) END";
+                cmd.ExecuteNonQuery();
+            }
+        }
+    }
+}

src/libraries/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj

@@ -44,7 +44,7 @@
     <Compile Include="ProviderAgnostic\MultipleResultsTest\MultipleResultsTest.cs" />
     <Compile Include="ProviderAgnostic\ReaderTest\ReaderTest.cs" />
     <Compile Include="SQL\AsyncTest\AsyncTest.cs" />
-    <Compile Include="SQL\CommandCancelTest\CommandCancelTest.cs" />
+    <Compile Include="SQL\SqlCommandTest\SqlCommandCancelTest.cs" />
     <Compile Include="SQL\ConnectionPoolTest\ConnectionPoolTest.cs" />
     <Compile Include="SQL\ConnectionPoolTest\PoolBlockPeriodTest.netcoreapp.cs" />
     <Compile Include="SQL\ConnectivityTests\ConnectivityTest.cs" />
@@ -61,6 +61,7 @@
     <Compile Include="SQL\MirroringTest\ConnectionOnMirroringTest.cs" />
     <Compile Include="SQL\ParallelTransactionsTest\ParallelTransactionsTest.cs" />
     <Compile Include="SQL\SqlBulkCopyTest\CopyWidenNullInexactNumerics.cs" />
+    <Compile Include="SQL\SqlCommandTest\SqlCommandSetTest.cs" />
     <Compile Include="SQL\SqlCredentialTest\SqlCredentialTest.cs" />
     <Compile Include="SQL\SqlSchemaInfoTest\SqlSchemaInfoTest.cs" />
     <Compile Include="SQL\SqlBulkCopyTest\AdjustPrecScaleForBulkCopy.cs" />