diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
commit | 61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch) | |
tree | cb37caa1784bc738b976273335d6ed04a7cc80b0 /tests/src/dir.targets | |
parent | 5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff) | |
download | coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2 coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip |
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'tests/src/dir.targets')
-rw-r--r-- | tests/src/dir.targets | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 08c77df7cf..4e6c618021 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -50,11 +50,6 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun> </PropertyGroup> - <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> - <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson> - </PropertyGroup> - <!-- If it needs ProjectToRun, turn the project into a ProjectReference so it gets built --> @@ -189,4 +184,13 @@ DestinationFolder="$(OutputPath)" Condition="Exists('$(AssemblyName).reflect.xml')"/> </Target> + + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + + <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"> + <ProjectAssetsFile></ProjectAssetsFile > + </PropertyGroup> + </Project> |