-
Notifications
You must be signed in to change notification settings - Fork 332
Common Project | Unit Tests #3870
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
1a1cf8c
Unit test project is building with reference to common project now. H…
benrr101 7ecc07d
Directly expose exceptions in connection failover tests
benrr101 ce7dc3c
Fix resource issues in common project, fix SNI issues in unit test pr…
benrr101 e3d0f76
Reference new TestCommon project from UnitTests
benrr101 6662140
patch to make unit test builds work
benrr101 6caf937
Remove unit test project from restore targets
benrr101 fb206f6
TF -> -f
benrr101 2c83f0b
Whoops
benrr101 6de0ab7
Merge branch 'main' into dev/russellben/common/unit-tests
benrr101 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
41 changes: 41 additions & 0 deletions
41
src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj
|
cheenamalhotra marked this conversation as resolved.
|
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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <AssemblyName>Microsoft.Data.SqlClient.TestCommon</AssemblyName> | ||
| <RootNamespace>Microsoft.Data.SqlClient.TestCommon</RootNamespace> | ||
|
benrr101 marked this conversation as resolved.
|
||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
benrr101 marked this conversation as resolved.
|
||
|
|
||
| <!-- Embedded resources and content files =========================== --> | ||
| <ItemGroup> | ||
| <ContentWithTargetPath Include="..\tools\Microsoft.Data.SqlClient.TestUtilities\xunit.runner.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <TargetPath>xunit.runner.json</TargetPath> | ||
| </ContentWithTargetPath> | ||
| </ItemGroup> | ||
|
|
||
| <!-- References ====================================================== --> | ||
| <!-- Test target reference --> | ||
| <ItemGroup> | ||
| <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- References for netfx --> | ||
| <ItemGroup Condition="'$(TargetFramework)' == 'net462'"> | ||
| <PackageReference Include="Azure.Identity" /> | ||
| <PackageReference Include="Azure.Security.KeyVault.Keys" /> | ||
| <PackageReference Include="Microsoft.DotNet.XUnitExtensions" /> | ||
| <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" | ||
| IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" | ||
| PrivateAssets="all" /> | ||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" /> | ||
| <PackageReference Include="xunit" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- References for netcore --> | ||
| <ItemGroup Condition="'$(TargetFramework)' != 'net462'"> | ||
| <PackageReference Include="Azure.Identity" /> | ||
| <PackageReference Include="Azure.Security.KeyVault.Keys" /> | ||
| <PackageReference Include="Microsoft.DotNet.XUnitExtensions" /> | ||
| <PackageReference Include="xunit" /> | ||
| </ItemGroup> | ||
|
cheenamalhotra marked this conversation as resolved.
|
||
| </Project> | ||
|
paulmedynski marked this conversation as resolved.
|
||
120 changes: 65 additions & 55 deletions
120
src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj
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,71 +1,81 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <!-- @TODO: Use full assembly name here --> | ||
| <AssemblyName>UnitTests</AssemblyName> | ||
|
paulmedynski marked this conversation as resolved.
benrr101 marked this conversation as resolved.
|
||
| <TargetGroup Condition="$(TargetFramework.StartsWith('net4'))">netfx</TargetGroup> | ||
| <TargetGroup Condition="$(TargetGroup) == ''">netcoreapp</TargetGroup> | ||
| <RuntimeIdentifier Condition="'$(TargetGroup)'=='netfx'">win</RuntimeIdentifier> | ||
| <IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform).$(AssemblyName)</IntermediateOutputPath> | ||
| <OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath> | ||
| <RootNamespace /> | ||
| <IsTestProject>true</IsTestProject> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
| <!-- Common references --> | ||
|
|
||
| <!-- Embedded resources and content files =========================== --> | ||
| <ItemGroup> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" /> | ||
| <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Condition="$(TargetGroup) == 'netfx'"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="xunit" /> | ||
| <PackageReference Include="xunit.runner.visualstudio"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="xunit.runner.console"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <EmbeddedResource Update="Resources.resx"> | ||
| <LogicalName>Microsoft.Data.SqlClient.UnitTests.Resources.resources</LogicalName> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| <Compile Update="Resources.Designer.cs"> | ||
| <DesignTime>True</DesignTime> | ||
| <AutoGen>True</AutoGen> | ||
| <DependentUpon>Resources.resx</DependentUpon> | ||
| </Compile> | ||
| <ContentWithTargetPath Include="$(TestsPath)tools/Microsoft.Data.SqlClient.TestUtilities/xunit.runner.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <TargetPath>xunit.runner.json</TargetPath> | ||
| </ContentWithTargetPath> | ||
| </ItemGroup> | ||
|
|
||
| <!-- References ====================================================== --> | ||
| <!-- Test target reference --> | ||
| <ItemGroup> | ||
| <ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- References for netframework --> | ||
| <ItemGroup Condition="'$(TargetFramework)' == 'net462'"> | ||
| <Reference Include="System.Transactions" /> | ||
|
|
||
| <PackageReference Include="Microsoft.Data.SqlClient.SNI" /> | ||
|
cheenamalhotra marked this conversation as resolved.
|
||
| <PackageReference Include="Microsoft.DotNet.XUnitExtensions" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" /> | ||
| <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" | ||
| IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" | ||
| PrivateAssets="all" /> | ||
| <PackageReference Include="Microsoft.SqlServer.Server" /> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" /> | ||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" /> | ||
| <PackageReference Include="xunit" /> | ||
| <PackageReference Include="xunit.runner.console" | ||
| IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" | ||
| PrivateAssets="all" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" | ||
| IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" | ||
| PrivateAssets="all" /> | ||
|
|
||
| <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" /> | ||
| <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" /> | ||
| <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" /> | ||
| <ProjectReference Include="$(TestsPath)Common\Common.csproj" /> | ||
| </ItemGroup> | ||
| <!-- .NET Framework references --> | ||
| <ItemGroup Condition="$(TargetGroup) == 'netfx'"> | ||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" /> | ||
| <ProjectReference Include="$(NetFxSource)src\Microsoft.Data.SqlClient.csproj" /> | ||
| <Reference Include="System.Transactions" /> | ||
| <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" /> | ||
|
benrr101 marked this conversation as resolved.
|
||
| </ItemGroup> | ||
| <!-- .NET references --> | ||
| <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp'"> | ||
| <ProjectReference Include="$(NetCoreSource)src\Microsoft.Data.SqlClient.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ContentWithTargetPath Condition="'$(TargetGroup)'=='netfx'" Include="$(BinFolder)$(Configuration).AnyCPU\Microsoft.Data.SqlClient\netfx\$(TargetFramework)\*SNI*.dll"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <TargetPath>%(Filename)%(Extension)</TargetPath> | ||
| </ContentWithTargetPath> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ContentWithTargetPath Include="..\tools\Microsoft.Data.SqlClient.TestUtilities\xunit.runner.json"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| <TargetPath>xunit.runner.json</TargetPath> | ||
| </ContentWithTargetPath> | ||
| </ItemGroup> | ||
| <!-- Resources --> | ||
| <ItemGroup> | ||
| <Compile Update="Resources.Designer.cs"> | ||
| <DesignTime>True</DesignTime> | ||
| <AutoGen>True</AutoGen> | ||
| <DependentUpon>Resources.resx</DependentUpon> | ||
| </Compile> | ||
|
|
||
| <EmbeddedResource Update="Resources.resx"> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| <!-- References for netcore --> | ||
| <ItemGroup Condition="'$(TargetFramework)' != 'net462'"> | ||
| <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" /> | ||
|
cheenamalhotra marked this conversation as resolved.
|
||
| <PackageReference Include="Microsoft.DotNet.XUnitExtensions" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" /> | ||
| <PackageReference Include="Microsoft.SqlServer.Server" /> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" /> | ||
| <PackageReference Include="xunit" /> | ||
|
cheenamalhotra marked this conversation as resolved.
|
||
| <PackageReference Include="xunit.runner.console" | ||
| IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" | ||
| PrivateAssets="all" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" | ||
| IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" | ||
| PrivateAssets="all" /> | ||
|
|
||
| <ProjectReference Include="$(TestsPath)tools\TDS\TDS.Servers\TDS.Servers.csproj" /> | ||
| <ProjectReference Include="$(TestsPath)tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj" /> | ||
| <ProjectReference Include="$(TestsPath)tools\TDS\TDS\TDS.csproj" /> | ||
| <ProjectReference Include="$(TestsPath)Common\Microsoft.Data.SqlClient.TestCommon.csproj" /> | ||
|
cheenamalhotra marked this conversation as resolved.
|
||
| </ItemGroup> | ||
|
paulmedynski marked this conversation as resolved.
|
||
| </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
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.