Fix | Fix Assembly signing issue due to InternalsVisibleTo attribute (#…

…773)
dotnet · Oct 23, 2020 · 635f38b · 635f38b
1 parent d65173b
commit 635f38b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -17,8 +17,6 @@
 using System.Transactions;
 using Microsoft.Data.Common;
 
-[assembly: InternalsVisibleTo("FunctionalTests")]
-
 namespace Microsoft.Data.SqlClient
 {
     internal static class AsyncHelper

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlUtil.cs
@@ -17,8 +17,6 @@
 using System.Threading.Tasks;
 using SysTx = System.Transactions;
 
-[assembly: InternalsVisibleTo("FunctionalTests")]
-
 namespace Microsoft.Data.SqlClient
 {
     using Microsoft.Data.Common;

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -42,7 +42,6 @@
     <Compile Include="SqlCredentialTest.cs" />
     <Compile Include="SqlDataRecordTest.cs" />
     <Compile Include="SqlExceptionTest.cs" />
-    <Compile Include="SqlHelperTest.cs" />
     <Compile Include="SqlParameterTest.cs" />
     <Compile Include="SqlClientFactoryTest.cs" />
     <Compile Include="SqlErrorCollectionTest.cs" />
@@ -54,6 +53,7 @@
     <Compile Include="SqlConnectionStringBuilderTest.cs" />
     <Compile Include="SerializeSqlTypesTest.cs" />
     <Compile Include="TestTdsServer.cs" />
+    <Compile Include="SqlHelperTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlHelperTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlHelperTest.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
@@ -13,8 +14,14 @@ public class SqlHelperTest
     {
         private void TimeOutATask()
         {
+            var sqlClientAssembly = Assembly.GetAssembly(typeof(SqlCommand));
+            //We're using reflection to avoid exposing the internals
+            MethodInfo waitForCompletion = sqlClientAssembly.GetType("Microsoft.Data.SqlClient.AsyncHelper")
+                ?.GetMethod("WaitForCompletion", BindingFlags.Static | BindingFlags.NonPublic);
+
+            Assert.False(waitForCompletion == null, "Running a test on SqlUtil.WaitForCompletion but could not find this method");
             TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
-            AsyncHelper.WaitForCompletion(tcs.Task, 1); //Will time out as task uncompleted
+            waitForCompletion.Invoke(null, new object[] { tcs.Task, 1, null, true }); //Will time out as task uncompleted
             tcs.SetException(new TimeoutException("Dummy timeout exception")); //Our task now completes with an error
         }