diff options
| author | David Mason <davmason@microsoft.com> | 2019-05-03 16:52:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 16:52:46 -0700 |
| commit | b8f926288af2f8deef09835d97d66a5f9bfda082 (patch) | |
| tree | 067bc32c06e12e1f3fbf2cf74324efbfa1276fa2 /tests/src/Common | |
| parent | 68fb276abfa8eed66dabc14cfab792f8150ad753 (diff) | |
| download | coreclr-b8f926288af2f8deef09835d97d66a5f9bfda082.tar.gz coreclr-b8f926288af2f8deef09835d97d66a5f9bfda082.tar.bz2 coreclr-b8f926288af2f8deef09835d97d66a5f9bfda082.zip | |
Enable CoreFX test filtering for CoreCLR PRs (#24259)
This change enables CoreFX tests for CoreCLR.
Diffstat (limited to 'tests/src/Common')
| -rw-r--r-- | tests/src/Common/CoreFX/CoreFX.depproj | 53 |
1 files changed, 20 insertions, 33 deletions
diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj index ecf7255254..c5f095db65 100644 --- a/tests/src/Common/CoreFX/CoreFX.depproj +++ b/tests/src/Common/CoreFX/CoreFX.depproj @@ -11,11 +11,6 @@ <IsTestProject>false</IsTestProject> <!-- System.Composition and System.Composition.AttributedModel use different versioning conventions --> <SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions> - <XUnitNetcoreExtensionsVersion>2.2.0-preview1-02902-01</XUnitNetcoreExtensionsVersion> - <!-- Xunit Abstractions is differently versioned then the rest of XUnit --> - <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion> - <XUnitAssertVersion>2.4.1-pre.build.4059</XUnitAssertVersion> - <CoreFXXUnitPackageVersion>2.2.0-beta2-build3300</CoreFXXUnitPackageVersion> <MicrosoftDiagnosticsTracingTraceVentVersion>2.0.19</MicrosoftDiagnosticsTracingTraceVentVersion> <MicrosoftDotnetPlatformAbstractionsVersion>2.1.0</MicrosoftDotnetPlatformAbstractionsVersion> <MicrosoftPrivateCoreFxTestUtilitiesPackageVersion>4.6.0-preview1-26817-04</MicrosoftPrivateCoreFxTestUtilitiesPackageVersion> @@ -30,33 +25,6 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="xunit"> - <Version>$(CoreFXXUnitPackageVersion)</Version> - </PackageReference> - <PackageReference Include="xunit.core"> - <Version>$(CoreFXXUnitPackageVersion)</Version> - </PackageReference> - <PackageReference Include="xunit.assert"> - <Version>$(XUnitAssertVersion)</Version> - </PackageReference> - <PackageReference Include="xunit.abstractions"> - <Version>$(XUnitAbstractionsVersion)</Version> - </PackageReference> - <PackageReference Include="xunit.extensibility.core"> - <Version>$(CoreFXXUnitPackageVersion)</Version> - </PackageReference> - <PackageReference Include="xunit.extensibility.execution"> - <Version>$(CoreFXXUnitPackageVersion)</Version> - </PackageReference> - <PackageReference Include="xunit.runner.utility"> - <Version>$(CoreFXXUnitPackageVersion)</Version> - </PackageReference> - <PackageReference Include="microsoft.xunit.netcore.extensions"> - <Version>$(XUnitNetcoreExtensionsVersion)</Version> - </PackageReference> - <PackageReference Include="CoreFx.Private.TestUtilities"> - <Version>$(MicrosoftPrivateCoreFxTestUtilitiesPackageVersion)</Version> - </PackageReference> <PackageReference Include="System.CodeDom"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> @@ -84,9 +52,22 @@ <PackageReference Include="System.Data.Odbc"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> - <PackageReference Include="System.Data.SqlClient"> + <PackageReference Include="runtime.native.System.Data.SqlClient.sni"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> + </PackageReference> + <PackageReference Include="System.Security.Principal.Windows"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> + <PackageReference Include="System.Text.Encoding.CodePages"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> + </PackageReference> + <PackageReference Include="System.Diagnostics.DiagnosticSource"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> + </PackageReference> + <PackageReference Include="System.Data.SqlClient"> + <!-- The 4.6 packages of System.Data.SqlClient have a version of 4.5 in the dll so they fail to load --> + <Version>4.7.0-preview4.19164.7</Version> + </PackageReference> <PackageReference Include="System.Diagnostics.PerformanceCounter"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> @@ -120,6 +101,9 @@ <PackageReference Include="System.Net.WebSockets.WebSocketProtocol"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> + <PackageReference Include="System.Reflection.MetadataLoadContext"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> + </PackageReference> <PackageReference Include="System.Runtime.Caching"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> @@ -160,6 +144,9 @@ </ItemGroup> <ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'"> <!-- Windows Dependencies --> + <PackageReference Include="Microsoft.Win32.Registry"> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> + </PackageReference> <PackageReference Include="Microsoft.Win32.Registry.AccessControl"> <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> |