Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kuhne <jeremy.kuhne@microsoft.com>2016-09-20 08:12:00 +0300
committerGitHub <noreply@github.com>2016-09-20 08:12:00 +0300
commite4ea1fd3467ef93bfd98160452b6e52d6cb0ac85 (patch)
tree2a1bf1fe554a3260ea505f554b8626aa4ba3c6d5 /dir.props
parenteed90edcfa01cd54d4bdd834ed5178f676c97f00 (diff)
parent4e7e4211b4df6ecba41f05972440d9f44426ced0 (diff)
Merge pull request #11689 from JeremyKuhne/CreateRelativePath
Add Path.GetRelativePath
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.props b/dir.props
index 5e2c449767..3c78af7725 100644
--- a/dir.props
+++ b/dir.props
@@ -463,7 +463,7 @@
<!-- Default Test platform to deploy the netstandard compiled tests to -->
<PropertyGroup>
- <TestTFM Condition="'$(TestTFM)'=='' AND '$(TargetGroup)'=='netstandard1.7'">netcoreapp1.1</TestTFM>
+ <TestTFM Condition="'$(TestTFM)'=='' and ('$(TargetGroup)'=='netstandard1.7' or '$(TargetGroup)'=='netcoreapp1.1')">netcoreapp1.1</TestTFM>
<TestTFM Condition="'$(TestTFM)'==''">netcoreapp1.0</TestTFM>
<!-- we default FilterToTestTFM to netcoreapp1.1 if it is not explicity defined -->
<FilterToTestTFM Condition="'$(FilterToTestTFM)'==''">netcoreapp1.1</FilterToTestTFM>