diff options
| author | Karthik Rajasekaran <karajas@microsoft.com> | 2016-10-14 22:45:09 +0300 |
|---|---|---|
| committer | Karthik Rajasekaran <karajas@microsoft.com> | 2016-10-18 21:39:59 +0300 |
| commit | f71125ef8b5d0c64a4f4ecaacdc2cfa95a1f7550 (patch) | |
| tree | 1d843ed9c225cdc4d956d3e8c706fcf1d2d15a10 /dir.targets | |
| parent | c224331718ea65ac0d0ceab8f06bfb95fd56d555 (diff) | |
Fix ordering on dir.target PropertyGroup
Move CommonTestProjectJson Properties to build.proj
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/dir.targets b/dir.targets index d5df4a4392..96f2443678 100644 --- a/dir.targets +++ b/dir.targets @@ -29,19 +29,12 @@ </ItemGroup> </Target> - <PropertyGroup> - <CommonTestProjectJson>$(MSBuildThisFileDirectory)src/Common/test-runtime/project.json</CommonTestProjectJson> - <CommonTestProjectLockJson>$(MSBuildThisFileDirectory)src/Common/test-runtime/project.lock.json</CommonTestProjectLockJson> - <CommonOutputTestProjectJson>$(GeneratedProjectJsonDir)/project.json</CommonOutputTestProjectJson> - <SkipGenerateTestProjectJson Condition="$([System.IO.File]::Exists('$(MSBuildProjectDirectory)/project.json'))" >false</SkipGenerateTestProjectJson> - </PropertyGroup> - <PropertyGroup Condition="'$(IsTestProject)' == 'true'"> - <ProjectJson Condition="'$(ProjectJson)'=='' and $([System.IO.File]::Exists('$(MSBuildProjectDirectory)/project.json'))">$(MSBuildProjectDirectory)/project.json</ProjectJson> - <ProjectJson Condition="'$(ProjectJson)'=='' ">$(CommonTestProjectJson)</ProjectJson> - <!-- <ProjectLockJson Condition="'$(ProjectLockJson)'=='' and Exists('$(MSBuildProjectDirectory)/project.json')">$(MSBuildProjectDirectory)/project.lock.json</ProjectLockJson> --> - <ProjectLockJson Condition="'$(ProjectLockJson)'=='' ">$(CommonTestProjectLockJson)</ProjectLockJson> - + <ProjectJson Condition="'$(ProjectJson)'=='' and Exists('$(MSBuildProjectDirectory)/project.json')">$(MSBuildProjectDirectory)/project.json</ProjectJson> + <!-- If project specific project.json exists then don't skip generating test project.json files --> + <SkipGenerateTestProjectJson Condition="'$(ProjectJson)'==''" >true</SkipGenerateTestProjectJson> + <ProjectJson Condition="'$(ProjectJson)'==''">$(CommonTestProjectJson)</ProjectJson> + <ProjectLockJson Condition="'$(ProjectJson)'=='$(CommonTestProjectJson)'">$(CommonTestProjectLockJson)</ProjectLockJson> <!-- Duplicating this path from packageresolve.targets in buildtools till a proper hook is established for the derived properties below --> <RestorePackages Condition="'$(RestorePackages)'!='false' and Exists('$(ProjectJson)') and '$(DesignTimeBuild)' != 'true'">true</RestorePackages> <PrereleaseResolveNuGetPackages Condition="'$(PrereleaseResolveNuGetPackages)'!='false' and Exists('$(ProjectJson)')">true</PrereleaseResolveNuGetPackages> |