Common MDS | Cleanup Manual Tests #3932
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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" | ||||||
| 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> | ||||||
|
There was a problem hiding this comment. The
Suggested change
|
||||||
| <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> | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,8 @@ | |
| // 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; | ||
|
|
||
| #if _WINDOWS | ||
|
Contributor
There was a problem hiding this comment. There's no actionable comment here, but: the more I see this, the less I like it. When combined with the four test set combinations and the four target-specific combinations, we're compiling the same project dozens of times. It seems far more natural to only have target-specific combinations, compiled before any test stages start. Is there a pipeline-side reason why we need this, or is this solely because the core library is compiled on a per-OS basis?
Contributor
Author
There was a problem hiding this comment. Yeah, it's not good. But we don't have a solution yet today. This will be post-common project work. This only exists today because of the per-OS compilation of MDS. The tests reference classes that don't exist outside of a windows build.
Contributor
There was a problem hiding this comment. Sounds good. Once the common project and pipelines have settled, #3844 makes a start on making the MDS build OS-independent. After the process started there has completed, hopefully this'll shake out... |
||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Security.Cryptography; | ||
|
|
@@ -75,3 +77,5 @@ protected override void Dispose(bool disposing) | |
| } | ||
| } | ||
| } | ||
|
|
||
| #endif | ||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -39,7 +39,7 @@ public static void XmlTest() | |||||||||||||||||
| SqlCommand cmd2 = new SqlCommand(insertParamStr, conn); | ||||||||||||||||||
|
|
||||||||||||||||||
| cmd2.Parameters.Add("@x", SqlDbType.Xml); | ||||||||||||||||||
| XmlReader xr = XmlReader.Create("DDDataTypesTest_Data.xml"); | ||||||||||||||||||
|
There was a problem hiding this comment. Disposable 'XmlReader' is created but not disposed. |
||||||||||||||||||
| cmd2.Parameters[0].Value = new SqlXml(xr); | ||||||||||||||||||
| cmd2.ExecuteNonQuery(); | ||||||||||||||||||
|
Comment on lines
+42
to
44
There was a problem hiding this comment. Disposable 'XmlReader' is created but not disposed.
Suggested change
|
||||||||||||||||||
|
|
||||||||||||||||||
|
|
||||||||||||||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ManualTests project file was renamed, but some build/CI entry points still reference the old path
src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj(e.g.,eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml:115,137and...netfx-step.yml:117,139). Update those toMicrosoft.Data.SqlClient.ManualTests.csprojto avoid CI failures.