DRAFT | Wire Manual Tests to Common MDS #3916
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -78,19 +78,8 @@ | |
| <FunctionalTests Include="**/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" /> | ||
| <FunctionalTestsProj Include="**/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj" /> | ||
|
|
||
| <ManualTests Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" /> | ||
| <ManualTestsProj Include="**/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Top Level Build targets --> | ||
|
|
@@ -99,9 +88,12 @@ | |
| <Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServerLib;BuildNetFx;BuildNetCoreAllOS;BuildNetStandard;GenerateMdsPackage" /> | ||
| <Target Name="BuildSqlServerPackage" DependsOnTargets="BuildSqlServerLibAnyOS;GenerateSqlServerPackage"/> | ||
|
|
||
| <Target Name="BuildTestsNetCore"> | ||
| <Message Text=">>> No op. Will be removed." /> | ||
| </Target> | ||
| <Target Name="BuildTestsNetFx"> | ||
| <Message Text=">>> No op. Will be removed." /> | ||
| </Target> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
Comment on lines
+91
to
+96
There was a problem hiding this comment. BuildTestsNetCore/BuildTestsNetFx were changed to no-op targets. Our pipeline templates invoke these targets and then run tests with --no-build, so this will break CI by skipping compilation of the test projects. Either restore real build behavior for these targets or update the pipeline to build tests as part of dotnet test (and remove --no-build). |
||
|
|
||
| <!-- Other Targets --> | ||
| <Target Name="RestoreSqlServerLib"> | ||
|
|
@@ -112,16 +104,16 @@ | |
| <MSBuild Projects="@(NetCoreDriver)" Targets="restore" Properties="$(ProjectProperties)" /> | ||
| </Target> | ||
|
|
||
| <Target Name="RestoreTestsNetCore"> | ||
| <Message Text=">>> No op. Will be removed." /> | ||
| </Target> | ||
|
|
||
| <Target Name="RestoreNetFx" DependsOnTargets="RestoreSqlServerLib" Condition="'$(IsEnabledWindows)' == 'true'"> | ||
| <MSBuild Projects="@(NetFxDriver)" Targets="restore" Properties="$(ProjectProperties)" /> | ||
| </Target> | ||
|
|
||
| <Target Name="RestoreTestsNetFx" Condition="'$(IsEnabledWindows)' == 'true'"> | ||
| <Message Text=">>> No op. Will be removed." /> | ||
| </Target> | ||
|
|
||
| <Target Name="RestoreTools" Condition="'$(BuildTools)' == 'true'"> | ||
|
|
@@ -169,24 +161,6 @@ | |
| <MSBuild Projects="@(NetStandardDriver)" Properties="$(CI);$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;BuildForLib=True" RemoveProperties="TargetsWindows;TargetsUnix;" /> | ||
| </Target> | ||
|
|
||
| <!-- Tests --> | ||
|
|
||
| <!-- Run all tests applicable to the host OS. --> | ||
|
|
@@ -214,7 +188,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)"/> | ||
|
Check failure on line 191 in build.proj
|
||
| </Target> | ||
|
|
||
| <!-- Run all unit tests applicable to Unix. --> | ||
|
|
@@ -296,13 +270,9 @@ | |
| <PropertyGroup> | ||
| <TestCommand> | ||
| $(DotnetPath)dotnet test "@(ManualTestsProj)" | ||
| -f $(TF) | ||
| -p:Configuration=$(Configuration) | ||
| -p:ReferenceType=$(ReferenceType) | ||
| $(CollectStatement) | ||
| --results-directory $(ResultsDirectory) | ||
| --filter "$(FilterStatement)" | ||
|
|
@@ -311,10 +281,21 @@ | |
| --blame-hang-dump-type full | ||
| --blame-hang-timeout 10m | ||
| </TestCommand> | ||
|
|
||
| <!-- | ||
| Only set TestSet if it was provided. Using -p sets it globaly, and *immutably*. If we were | ||
| to set it to '', it would be permanently set to '', preventing any tests from running. | ||
| --> | ||
| <TestCommand Condition="'$(TestSet)' != ''"> | ||
| $(TestCommand) | ||
| -p:TestSet=$(TestSet) | ||
| </TestCommand> | ||
|
|
||
| <!-- Convert more than one whitespace character into one space --> | ||
| <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand> | ||
| </PropertyGroup> | ||
| <Message Text=">>> Running Manual test for Windows via command: $(TestCommand)" /> | ||
| <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" /> | ||
|
Check failure on line 298 in build.proj
|
||
| </Target> | ||
|
|
||
| <!-- Run all Manual tests applicable to Unix. --> | ||
|
|
@@ -322,13 +303,10 @@ | |
| <PropertyGroup> | ||
| <TestCommand> | ||
| $(DotnetPath)dotnet test "@(ManualTestsProj)" | ||
| -f $(TF) | ||
| -p:Configuration=$(Configuration) | ||
| -p:ReferenceType=$(ReferenceType) | ||
| -p:TestSet=$(TestSet) | ||
| $(CollectStatement) | ||
|
Comment on lines
305
to
310
There was a problem hiding this comment. RunManualTestsUnix always passes -p:TestSet=$(TestSet). If TestSet is not provided, this sets an immutable global property to empty, which prevents the project from applying its default TestSet and can result in zero tests being compiled. Mirror the Windows logic by only appending -p:TestSet when it's non-empty. |
||
| --results-directory $(ResultsDirectory) | ||
| --filter "$(FilterStatement)" | ||
|
|
@@ -337,7 +315,8 @@ | |
| --blame-hang-dump-type full | ||
| --blame-hang-timeout 10m | ||
| </TestCommand> | ||
| <!-- Convert more than one whitespace character into one space --> | ||
| <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand> | ||
| </PropertyGroup> | ||
| <Message Text=">>> Running Manual test for Unix via command: $(TestCommand)" /> | ||
| <Exec ConsoleToMsBuild="true" Command="$(TestCommand)" /> | ||
|
|
@@ -384,31 +363,16 @@ | |
| <MSBuild Projects="@(AKVProvider)" Properties="$(BuildAkvProperties)" RemoveProperties="TargetsWindows;TargetsUnix;" /> | ||
| </Target> | ||
|
|
||
| <Target Name="BuildAKVNetFx" Condition="'$(IsEnabledWindows)' == 'true'"> | ||
| <Message Text=">>> No op. This will be removed" /> | ||
| </Target> | ||
|
|
||
| <Target Name="BuildAKVNetCore"> | ||
| <Message Text=">>> No op. This will be removed" /> | ||
| </Target> | ||
|
|
||
| <Target Name="BuildAKVNetCoreAllOS"> | ||
| <Message Text=">>> No op. This will be removed" /> | ||
| </Target> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,40 +1,45 @@ | ||||||
| <Project Sdk="Microsoft.NET.Sdk"> | ||||||
| <PropertyGroup> | ||||||
| <AssemblyName>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</AssemblyName> | ||||||
| <RootNamespace>Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider</RootNamespace> | ||||||
| <PackageLicenseExpression>MIT</PackageLicenseExpression> | ||||||
| <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||||||
| </PropertyGroup> | ||||||
|
|
||||||
| <!-- Build Output ==================================================== --> | ||||||
| <PropertyGroup> | ||||||
| <!-- @TODO: $(BindFolder) is OS dependent but we're only ever building AnyOS, so ... can we simplify this? --> | ||||||
|
There was a problem hiding this comment. Typo in the comment: "$(BindFolder)" doesn't match the actual property name used elsewhere ("$(BinFolder)").
Suggested change
|
||||||
| <OutputPath>$(BinFolder)$(Configuration).$(Platform)\AzureKeyVaultProvider</OutputPath> | ||||||
| <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform)\AzureKeyVaultProvider</IntermediateOutputPath> | ||||||
| <DocumentationFile>$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName).xml</DocumentationFile> | ||||||
| </PropertyGroup> | ||||||
|
|
||||||
| <!-- Trim/AOT Support ================================================ --> | ||||||
| <PropertyGroup> | ||||||
| <IsTrimmable Condition="'$(TargetFramework)' != 'net462'">true</IsTrimmable> | ||||||
| <IsAotCompatible Condition="'$(TargetFramework)' != 'net462'">true</IsAotCompatible> | ||||||
| </PropertyGroup> | ||||||
|
|
||||||
| <!-- Strong name signing ============================================= --> | ||||||
| <PropertyGroup> | ||||||
| <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile> | ||||||
| </PropertyGroup> | ||||||
| <PropertyGroup Condition="'$(CDP_BUILD_TYPE)'=='Official'"> | ||||||
| <SignAssembly>true</SignAssembly> | ||||||
| <KeyFile>$(SigningKeyPath)</KeyFile> | ||||||
| </PropertyGroup> | ||||||
|
|
||||||
| <!-- References ====================================================== --> | ||||||
| <!-- MDS Reference --> | ||||||
| <ItemGroup> | ||||||
| <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" | ||||||
| Condition="'$(ReferenceType)' != 'Package'" /> | ||||||
| <PackageReference Include="Microsoft.Data.SqlClient" | ||||||
| Condition="'$(ReferenceType)' == 'Package'" /> | ||||||
|
|
||||||
| </ItemGroup> | ||||||
|
|
||||||
| <!-- Other dependencies --> | ||||||
| <ItemGroup> | ||||||
| <PackageReference Include="Azure.Core" /> | ||||||
| <PackageReference Include="Azure.Security.KeyVault.Keys" /> | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -74,9 +74,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 EmbeddedResource path uses "SqlCLient" (capital L) which looks like a typo/inconsistency with "SqlClient" used elsewhere in the project. Consider correcting it to avoid confusion and to keep resource paths consistent.
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> | ||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.