diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-04-12 12:47:28 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-04-12 14:43:40 -0700 |
| commit | 42f1781463e973a7e764675715191b4f137d4e05 (patch) | |
| tree | 37c94fc53bcdf318b6d35d1682c3f68db614fc48 /tests/helixprep.proj | |
| parent | bdcb95e2f0ff0f48795fa0f98818ac1363d471f2 (diff) | |
| download | coreclr-42f1781463e973a7e764675715191b4f137d4e05.tar.gz coreclr-42f1781463e973a7e764675715191b4f137d4e05.tar.bz2 coreclr-42f1781463e973a7e764675715191b4f137d4e05.zip | |
Enable building Core_Root for any RID against packages
Diffstat (limited to 'tests/helixprep.proj')
| -rw-r--r-- | tests/helixprep.proj | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/helixprep.proj b/tests/helixprep.proj index 91aa4861d7..c6267b99a9 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -7,10 +7,8 @@ <PropertyGroup> <DiscoveryDirectory>$(TestWorkingDir)</DiscoveryDirectory> - <CoreRootDir Condition="'$(RuntimeID)' == '' ">$(CORE_ROOT)</CoreRootDir> - <CoreRootDir Condition="'$(RuntimeID)' != '' ">$(CORE_OVERLAY)</CoreRootDir> - <CoreRootName Condition="'$(RuntimeID)' == '' ">Core_Root_Windows_NT-$(__BuildArch)</CoreRootName> - <CoreRootName Condition="'$(RuntimeID)' != '' ">Core_Root_$(RuntimeID)</CoreRootName> + <CoreRootDir>$(CORE_ROOT)</CoreRootDir> + <CoreRootName>Core_Root_$(RuntimeID)</CoreRootName> </PropertyGroup> <ItemGroup> @@ -73,7 +71,7 @@ <!-- Generate wrapper .cmd file for an Xunit wrapper --> <Target Name="GenerateWrapperCmd" - Condition="'$(RuntimeID)' == '' "> + Condition="'$(TargetsWindows)' == 'true' "> <PropertyGroup> <WrapperCmdContents> @@ -104,7 +102,7 @@ EXIT /B %ERRORLEVEL% </Target> <Target Name="GenerateWrapperSh" - Condition="'$(RuntimeID)' != '' "> + Condition="'$(TargetsWindows)' != 'true' "> <!-- Need to force in Unix line endings for Shell script --> <PropertyGroup> |