diff options
| author | Karthik Rajasekaran <karajas@microsoft.com> | 2016-10-14 02:55:50 +0300 |
|---|---|---|
| committer | Karthik Rajasekaran <karajas@microsoft.com> | 2016-10-18 21:39:58 +0300 |
| commit | c224331718ea65ac0d0ceab8f06bfb95fd56d555 (patch) | |
| tree | ce76fee4c1ea6e11f10ce736f6789e6c51f86ae1 /dir.targets | |
| parent | 169e1ee82c8b497d852ffe0e0868679e1c10f3fe (diff) | |
Rearrange order of property groups
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/dir.targets b/dir.targets index c4fe484279..d5df4a4392 100644 --- a/dir.targets +++ b/dir.targets @@ -28,6 +28,24 @@ </ProjectReference> </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> + + <!-- 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> + </PropertyGroup> <Import Project="$(ToolsDir)/Build.Common.targets" Condition="Exists('$(ToolsDir)/Build.Common.targets')" /> @@ -57,19 +75,6 @@ <DestinationDir>test-runtime/</DestinationDir> </SupplementalTestData> </ItemGroup> - - <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> - <UsesCommonTestProjectJson Condition="'$(IsTestProject)' == 'true' and '$(ProjectJson)'=='' ">true</UsesCommonTestProjectJson> - <SkipGenerateTestProjectJson Condition="'$(UsesCommonTestProjectJson)'==''">false</SkipGenerateTestProjectJson> - <ProjectJson Condition="'$(IsTestProject)' == 'true' and '$(ProjectJson)'=='' ">$(CommonTestProjectJson)</ProjectJson> - <ProjectLockJson Condition="'$(IsTestProject)' == 'true' and '$(ProjectLockJson)'=='' ">$(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> - </PropertyGroup> <ItemGroup Condition="'$(NuGetTargetMoniker)'=='.NETStandard,Version=v1.7'"> <!-- Temporarily suppress the message until we get a nuget version that knows about the mapping between netstandard1.7 and uap10.1 --> |