diff options
author | wtgodbe <wigodbe@microsoft.com> | 2017-01-17 14:47:51 -0800 |
---|---|---|
committer | wtgodbe <wigodbe@microsoft.com> | 2017-01-24 12:35:50 -0800 |
commit | eb610f615bc4076ad950c98157e83bc34649064f (patch) | |
tree | 111869be6a4bba0ff85583c7fe2997fd9ddc37f2 /tests/src/dir.props | |
parent | 6a3c584b80dde7752a595344b3dc727918c94183 (diff) | |
download | coreclr-eb610f615bc4076ad950c98157e83bc34649064f.tar.gz coreclr-eb610f615bc4076ad950c98157e83bc34649064f.tar.bz2 coreclr-eb610f615bc4076ad950c98157e83bc34649064f.zip |
Add support for running CoreCLR Tests in Helix
Diffstat (limited to 'tests/src/dir.props')
-rw-r--r-- | tests/src/dir.props | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/src/dir.props b/tests/src/dir.props index e8cdfd4036..2fb2e1942b 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -34,7 +34,6 @@ <PropertyGroup> <TargetsWindows>true</TargetsWindows> <TestNugetRuntimeId>win7-x64</TestNugetRuntimeId> - <DefaultTestTFM>net45</DefaultTestTFM> </PropertyGroup> </When> <When Condition="'$(OSGroup)'=='Linux'"> @@ -67,14 +66,8 @@ <PropertyGroup> <TargetsUnknownUnix Condition="'$(TargetsUnix)' == 'true' AND '$(OSGroup)' != 'FreeBSD' AND '$(OSGroup)' != 'Linux' AND '$(OSGroup)' != 'OSX'">true</TargetsUnknownUnix> - </PropertyGroup> - - <!-- Default Test platform to deploy the netstandard compiled tests to --> - <PropertyGroup> - <!-- we default TestTFM and FilterToTestTFM to netcoreapp1.0 if they are not explicity defined --> - <DefaultTestTFM Condition="'$(DefaultTestTFM)'==''">netcoreapp1.0</DefaultTestTFM> - <TestTFM Condition="'$(TestTFM)'==''">$(DefaultTestTFM)</TestTFM> - <FilterToTestTFM Condition="'$(FilterToTestTFM)'==''">$(DefaultTestTFM)</FilterToTestTFM> + <Language Condition="'$(Language)' == '' and '$(MSBuildProjectExtension)' == '.csproj'">C#</Language> + <Language Condition="'$(Language)' == '' and '$(MSBuildProjectExtension)' == '.ilproj'">IL</Language> </PropertyGroup> <!-- Set default ZapRequire level (used only when CrossGen is enabled) --> |