diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
| commit | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (patch) | |
| tree | e5435159cd1bf0519276363a6fe1663d1721bed3 /tests/src/dir.props | |
| parent | 4b4aad7217d3292650e77eec2cf4c198ea9c3b4b (diff) | |
| download | coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.gz coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.bz2 coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.zip | |
Imported Upstream version 1.0.0.9127upstream/1.0.0.9127
Diffstat (limited to 'tests/src/dir.props')
| -rw-r--r-- | tests/src/dir.props | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/src/dir.props b/tests/src/dir.props index 3b2754c221..e8cdfd4036 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -10,7 +10,6 @@ <!-- Disable some C# warnings for the tests. --> <NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008</NoWarn> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <CLRTestKind>BuildAndRun</CLRTestKind> <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning> <!-- Set the project.json directory for generated TestWrappers. --> <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory> @@ -35,6 +34,7 @@ <PropertyGroup> <TargetsWindows>true</TargetsWindows> <TestNugetRuntimeId>win7-x64</TestNugetRuntimeId> + <DefaultTestTFM>net45</DefaultTestTFM> </PropertyGroup> </When> <When Condition="'$(OSGroup)'=='Linux'"> @@ -69,6 +69,14 @@ <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> + </PropertyGroup> + <!-- Set default ZapRequire level (used only when CrossGen is enabled) --> <PropertyGroup> <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire> @@ -77,5 +85,8 @@ <PropertyGroup> <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson> <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson> + + <!-- Specify the target framework of the common test dependency project.json. --> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> </PropertyGroup> </Project> |