|
39 | 39 | PALTestsDir=$(_PALTestsDir)
|
40 | 40 | </_PropertiesToPass>
|
41 | 41 |
|
42 |
| - |
| 42 | + |
43 | 43 | <_PropertiesToPass Condition="'$(TargetOS)' == 'Browser' Or '$(TargetOS)' == 'Android'">
|
44 | 44 | $(_PropertiesToPass);
|
45 | 45 | IncludeDotNetCli=$(IncludeDotNetCli);
|
46 | 46 | DotNetCliRuntime=$(DotNetCliRuntime);
|
47 | 47 | DotNetCliPackageType=$(DotNetCliPackageType);
|
48 | 48 | DotNetCliVersion=$(DotNetCliVersion)
|
49 | 49 | </_PropertiesToPass>
|
50 |
| - </PropertyGroup> |
| 50 | + </PropertyGroup> |
51 | 51 | <Message Text="DotNetCliVersion: $(DotNetCliVersion)" Importance="High" />
|
52 | 52 | <Message Text="DotNetCliPackageType: $(DotNetCliPackageType)" Importance="High" />
|
53 | 53 | <Message Text="HelixRuntimeRid: $(HelixRuntimeRid)" Importance="High" />
|
|
95 | 95 | <IncludeDotNetCli>true</IncludeDotNetCli>
|
96 | 96 | <DotNetCliPackageType>runtime</DotNetCliPackageType>
|
97 | 97 | <DotNetCliVersion>$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
|
98 |
| - <DotNetCliRuntime>$(HelixRuntimeRid)</DotNetCliRuntime> |
| 98 | + <DotNetCliRuntime>$(HelixRuntimeRid)</DotNetCliRuntime> |
99 | 99 | </PropertyGroup>
|
100 | 100 |
|
101 | 101 | <PropertyGroup Condition="'$(TargetOS)' == 'Browser' Or '$(TargetOS)' == 'Android'">
|
|
168 | 168 | <!-- Remove the managed pdbs from our payloads.
|
169 | 169 | This is for performance reasons to reduce our helix payload size -->
|
170 | 170 | <ReducedPayloadFiles Include="@(_PayloadFiles)" Condition=" '%(Extension)' != '.pdb' " />
|
171 |
| - |
| 171 | + |
172 | 172 | <ReducedPayloadFilesFinal Include="@(ReducedPayloadFiles)" Condition=" '%(Extension)' != '.sh' and '$(TestWrapperTargetsWindows)' == 'true' "/>
|
173 | 173 | <ReducedPayloadFilesFinal Include="@(ReducedPayloadFiles)" Condition=" '%(Extension)' != '.cmd' and '$(TestWrapperTargetsWindows)' != 'true' "/>
|
174 | 174 | </ItemGroup>
|
|
202 | 202 | </Target>
|
203 | 203 |
|
204 | 204 | <Target Name="PreparePALTestArchive">
|
205 |
| - <Exec Condition="'$(PALTestsDir)' != '' and '$(TestWrapperTargetsWindows)' != 'true'" |
| 205 | + <Exec Condition="'$(PALTestsDir)' != '' and '$(TestWrapperTargetsWindows)' != 'true'" |
206 | 206 | WorkingDirectory="$(PALTestsDir)"
|
207 | 207 | Command="tar -czvf $(PayloadsRootDirectory)paltests.tar.gz `ls -A`"/>
|
208 | 208 | </Target>
|
|
234 | 234 | <RunCrossGen2 Condition=" '$(RunCrossGen2)' != 'true' ">false</RunCrossGen2>
|
235 | 235 | <LongRunningGCTests Condition=" '$(LongRunningGCTests)' != 'true' ">false</LongRunningGCTests>
|
236 | 236 | <GcSimulatorTests Condition=" '$(GcSimulatorTests)' != 'true' ">false</GcSimulatorTests>
|
237 |
| - <TestRunNamePrefix Condition="'$(RuntimeFlavorDisplayName)' != ''">$(RuntimeFlavorDisplayName) </TestRunNamePrefix> |
| 237 | + <TestRunNamePrefix Condition="'$(RuntimeFlavorDisplayName)' != ''">$(RuntimeFlavorDisplayName) </TestRunNamePrefix> |
238 | 238 | <TestRunNamePrefix Condition=" '$(RunCrossGen)' == 'true' ">R2R </TestRunNamePrefix>
|
239 | 239 | <TestRunNamePrefix Condition=" '$(RunCrossGen2)' == 'true' ">R2R-CG2 </TestRunNamePrefix>
|
240 | 240 | <TestRunNamePrefix Condition=" '$(Scenario)' == 'normal' ">$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @ </TestRunNamePrefix>
|
|
251 | 251 | <!-- WARNING: HelixPreCommand ItemGroup is intentionally minimal and should be kept that way. -->
|
252 | 252 |
|
253 | 253 | <ItemGroup Condition=" '$(TestWrapperTargetsWindows)' == 'true' ">
|
| 254 | + <HelixPreCommand Include="taskkill.exe /f /im corerun.exe"/> |
254 | 255 | <HelixPreCommand Include="set CORE_ROOT=%HELIX_CORRELATION_PAYLOAD%" />
|
255 | 256 | <!-- Set _NT_SYMBOL_PATH so VM _ASSERTE() asserts can find the symbol files when doing stack walks -->
|
256 | 257 | <HelixPreCommand Include="set _NT_SYMBOL_PATH=%HELIX_CORRELATION_PAYLOAD%\PDB" />
|
|
268 | 269 | <HelixPreCommand Include="type %__TestEnv%" />
|
269 | 270 | </ItemGroup>
|
270 | 271 |
|
| 272 | + <ItemGroup Condition=" '$(TestWrapperTargetsWindows)' == 'true' "> |
| 273 | + <HelixPostCommand Include="taskkill.exe /f /im corerun.exe"/> |
| 274 | + </ItemGroup> |
| 275 | + |
271 | 276 | <ItemGroup Condition=" '$(TestWrapperTargetsWindows)' != 'true' ">
|
272 | 277 | <HelixPreCommand Include="export CORE_ROOT=$HELIX_CORRELATION_PAYLOAD" />
|
273 | 278 | <HelixPreCommand Include="export RunCrossGen2=1" Condition=" '$(RunCrossGen)' == 'true' " />
|
|
286 | 291 |
|
287 | 292 | <PropertyGroup>
|
288 | 293 | <HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
|
| 294 | + <HelixPostCommands>@(HelixPostCommand)</HelixPostCommands> |
289 | 295 | </PropertyGroup>
|
290 | 296 |
|
291 | 297 | <PropertyGroup Condition=" '$(TestWrapperTargetsWindows)' == 'true' ">
|
|
0 commit comments