Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/eng
diff options
context:
space:
mode:
authorAnkit Jain <radical@gmail.com>2021-07-08 02:32:43 +0300
committerGitHub <noreply@github.com>2021-07-08 02:32:43 +0300
commit0ef56df4a7c0753296a736b071946d6bc833fdc2 (patch)
tree862ee9821134d2db121c00063b111cb739fad528 /eng
parent2be4fdc81f7f190ac35646ccc18799deb05da7dd (diff)
[wasm] Update Wasm.Build.Tests to build with net6.0 (#54936)
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Diffstat (limited to 'eng')
-rw-r--r--eng/testing/tests.targets6
1 files changed, 4 insertions, 2 deletions
diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index dd40856e629..1e7ec3b173d 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -1,13 +1,15 @@
<Project>
- <PropertyGroup>
+ <PropertyGroup Condition="'$(RunScriptInputName)' == ''">
<RunScriptInputName Condition="'$(TargetOS)' == 'windows'">RunnerTemplate.cmd</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' != 'windows'">RunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'">AppleRunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'Android'">AndroidRunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'Browser' and '$(OS)' != 'Windows_NT'">WasmRunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'Browser' and '$(OS)' == 'Windows_NT'">WasmRunnerTemplate.cmd</RunScriptInputName>
+ </PropertyGroup>
- <RunScriptInputPath>$(MSBuildThisFileDirectory)$(RunScriptInputName)</RunScriptInputPath>
+ <PropertyGroup>
+ <RunScriptInputPath Condition="'$(RunScriptInputPath)' == ''">$(MSBuildThisFileDirectory)$(RunScriptInputName)</RunScriptInputPath>
<RunScriptOutputName Condition="'$(TargetOS)' != 'windows'">RunTests.sh</RunScriptOutputName>
<RunScriptOutputName Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'Browser' and '$(OS)' == 'Windows_NT')">RunTests.cmd</RunScriptOutputName>