Common MDS | Cleanup Manual Tests

build.proj

@@ -91,8 +91,8 @@
     <ManualTests Include="**/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
     <ManualTests Include="**/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
     <ManualTests Include="**/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
-    <ManualTests Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" />
-    <ManualTestsProj Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj" />
+    <ManualTests Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
+    <ManualTestsProj Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
   </ItemGroup>
 
   <!-- Top Level Build targets -->
@@ -301,7 +301,7 @@
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
     </PropertyGroup>
     <Message Text=">>> Running unit tests for Windows via command: $(TestCommand)"/>
     <Exec ConsoleToMsBuild="true" Command="$(TestCommand)"/>
   </Target>
 
   <!-- Run all unit tests applicable to Unix. -->
@@ -401,7 +401,7 @@
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
     </PropertyGroup>
     <Message Text=">>> Running Manual test for Windows via command: $(TestCommand)" />
     <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" />
   </Target>
 
   <!-- Run all Manual tests applicable to Unix. -->

src/Microsoft.Data.SqlClient.sln

@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Address", "Microsoft.Data.S
 		{407890AC-9876-4FEF-A6F1-F36A876BAADE} = {407890AC-9876-4FEF-A6F1-F36A876BAADE}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.ManualTesting.Tests", "Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.SqlClient.ManualTests", "Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{37431336-5307-4184-9356-C4B7E47DC714} = {37431336-5307-4184-9356-C4B7E47DC714}
 	EndProjectSection

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -1049,9 +1049,10 @@
       <Link>Resources\ILLink.Substitutions.xml</Link>
     </EmbeddedResource>
 
+    <!-- Used by SqlMetaDataFactory to construct its DataSet -->
     <EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
       <Link>Resources\Microsoft.Data.SqlCLient.SqlMetaData.xml</Link>
-      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName> <!-- @TODO: How necessary is this? -->
+      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
     </EmbeddedResource>
 
     <!-- Base strings in English -->

src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj

@@ -81,9 +81,15 @@
     <!-- the app context switch in their csproj. This file only applies to netcore on windows.    -->
     <!-- This file does not support pre-processor directives, so it must be conditionally         -->
     <!-- included into the build.                                                                 -->
-    <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
+    <EmbeddedResource Include="Resources\ILLink.Substitutions.xml"
                       Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'" />
 
+    <!-- Used by SqlMetaDataFactory to construct its DataSet -->
+    <EmbeddedResource Include="Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
+      <Link>Resources\Microsoft.Data.SqlCLient.SqlMetaData.xml</Link>
+      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
+    </EmbeddedResource>
+
     <!-- Base strings in English -->
     <EmbeddedResource Update="Resources\Strings.resx">
       <LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>

src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj

@@ -7,25 +7,31 @@
   </PropertyGroup>
 
   <!-- Links to internal project files ================================= -->
-  <!-- @TODO: These should be removed -->
   <ItemGroup>
+    <!-- @TODO: These should be removed -->
+    <!-- These files are links to internal classes in the MDS project that a collection of     -->
+    <!-- tests directly test. Since InternalsVisibleTo doesn't work with ManualTests (not sure -->
+    <!-- why, to be honest), the only way to test them within this project is to directly      -->
+    <!-- compile them as part of this project. This is not ideal in the slightest, and they    -->
+    <!-- should ideally be UnitTests if they need to access internals. But detangling these    -->
+    <!-- tests is far beyond the scope of the common project, so it is left as a TODO for now. -->
     <Compile Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/MultipartIdentifier.cs" />
     <Compile Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Packet.cs" />
     <Compile Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.Multiplexer.cs" />
   </ItemGroup>
 
   <!-- Embedded resources and content files  =========================== -->
   <ItemGroup>
-    <!-- This file sets some configuration setting that only apply to netfx. It cannot #if -->
-    <!-- included into the project, so it must be included via a condition attribute.      --> 
+    <!-- This file sets some configuration setting that only apply to netfx. It cannot be #if -->
+    <!-- included into the project, so it must be included via a condition attribute.         -->
     <None Update="app.config" Condition="'$(TargetFramework)' == 'net462'">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
 
-    <ContentWithTargetPath Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
+    <Content Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>xunit.runner.json</TargetPath>
-    </ContentWithTargetPath>
+    </Content>
   </ItemGroup>
 
   <!-- References ====================================================== -->

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/CspProviderExt.cs

@@ -5,25 +5,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using Xunit;
 using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
 using Microsoft.Data.SqlClient.Tests.Common.Fixtures;
 using Microsoft.Win32;
-
-#if NET
-using System.Runtime.Versioning;
-#endif
+using Xunit;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted
 {
     /// <summary>
     /// Always Encrypted public CspProvider Manual tests.
-    /// TODO: These tests are marked as Windows only for now but should be run for all platforms once the Master Key is accessible to this app from Azure Key Vault.
     /// </summary>
-#if !NETFRAMEWORK
-    [SupportedOSPlatform("windows")]
-#endif
+    // TODO: These tests are marked as Windows only for now but should be run for all platforms once the Master Key is accessible to this app from Azure Key Vault.
     [PlatformSpecific(TestPlatforms.Windows)]
     public class CspProviderExt
     {

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.cs → src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/DateOnlyReadTests.netcore.cs

@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+// This file must be conditionally included because it will not compile on netfx
+#if NET
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -91,3 +94,5 @@ public IEnumerator<object[]> GetEnumerator()
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/TestFixtures/Setup/CspProviderColumnMasterKey.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Security.Cryptography.X509Certificates;
 
 namespace Microsoft.Data.SqlClient.ManualTesting.Tests.AlwaysEncrypted.Setup
@@ -14,18 +13,19 @@ public class CspProviderColumnMasterKey : ColumnMasterKey
         public string Thumbprint { get; }
         public override string KeyPath { get; }
 
-        public CspProviderColumnMasterKey(string name, string certificateThumbprint) : base(name)
+        public CspProviderColumnMasterKey(string name, string certificateThumbprint)
+            : base(name)
         {
             KeyStoreProviderName = @"MSSQL_CERTIFICATE_STORE";
             Thumbprint = certificateThumbprint;
             KeyPath = string.Concat(CertificateStoreLocation.ToString(), "/", CertificateStoreName.ToString(), "/", Thumbprint);
         }
 
-        public CspProviderColumnMasterKey(string name, string providerName, string cspKeyPath) : base(name)
+        public CspProviderColumnMasterKey(string name, string providerName, string cspKeyPath)
+            : base(name)
         {
             KeyStoreProviderName = providerName;
             KeyPath = cspKeyPath;
         }
-
     }
 }

src/Microsoft.Data.SqlClient/tests/ManualTests/DDBasics/DDDataTypesTest/DDDataTypesTest.cs

@@ -39,7 +39,7 @@ public static void XmlTest()
                     SqlCommand cmd2 = new SqlCommand(insertParamStr, conn);
 
                     cmd2.Parameters.Add("@x", SqlDbType.Xml);
-                    XmlReader xr = XmlReader.Create("data.xml");
+                    XmlReader xr = XmlReader.Create("DDDataTypesTest_Data.xml");
                     cmd2.Parameters[0].Value = new SqlXml(xr);
                     cmd2.ExecuteNonQuery();