From ca4976ac53cf480fc69fd6fb5a5049d9ec4bbcc3 Mon Sep 17 00:00:00 2001
From: yowl <scott.waye@hubse.com>
Date: Tue, 15 Dec 2020 18:52:38 -0500
Subject: [PATCH 1/4] make testing wasm on windows  by using MSBuild
 IsOSPlatform not TargetOS

---
 eng/testing/tests.targets | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index 90d5981318c922..4eafb49b0e24f9 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -1,22 +1,22 @@
 <Project>
   <PropertyGroup>
-    <RunScriptInputName Condition="'$(TargetOS)' == 'windows'">RunnerTemplate.cmd</RunScriptInputName>
-    <RunScriptInputName Condition="'$(TargetOS)' != 'windows'">RunnerTemplate.sh</RunScriptInputName>
+    <RunScriptInputName Condition="$([MSBuild]::IsOSPlatform('windows'))">RunnerTemplate.cmd</RunScriptInputName>
+    <RunScriptInputName Condition="!$([MSBuild]::IsOSPlatform('windows'))">RunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">AppleRunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Android'">AndroidRunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Browser'">WasmRunnerTemplate.sh</RunScriptInputName>
 
     <RunScriptInputPath>$(MSBuildThisFileDirectory)$(RunScriptInputName)</RunScriptInputPath>
 
-    <RunScriptOutputName Condition="'$(TargetOS)' == 'windows'">RunTests.cmd</RunScriptOutputName>
-    <RunScriptOutputName Condition="'$(TargetOS)' != 'windows'">RunTests.sh</RunScriptOutputName>
+    <RunScriptOutputName Condition="$([MSBuild]::IsOSPlatform('windows'))">RunTests.cmd</RunScriptOutputName>
+    <RunScriptOutputName Condition="!$([MSBuild]::IsOSPlatform('windows'))">RunTests.sh</RunScriptOutputName>
     <RunScriptOutputPath>$([MSBuild]::NormalizePath('$(OutDir)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
 
-    <RunScriptHostDir Condition="'$(TargetOS)' == 'windows'">%RUNTIME_PATH%\</RunScriptHostDir>
-    <RunScriptHostDir Condition="'$(TargetOS)' != 'windows'">$RUNTIME_PATH/</RunScriptHostDir>
+    <RunScriptHostDir Condition="$([MSBuild]::IsOSPlatform('windows'))">%RUNTIME_PATH%\</RunScriptHostDir>
+    <RunScriptHostDir Condition="!$([MSBuild]::IsOSPlatform('windows'))">$RUNTIME_PATH/</RunScriptHostDir>
 
-    <RunScriptHost Condition="'$(TargetOS)' == 'windows'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
-    <RunScriptHost Condition="'$(TargetOS)' != 'windows'">$(RunScriptHostDir)dotnet</RunScriptHost>
+    <RunScriptHost Condition="$([MSBuild]::IsOSPlatform('windows'))">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
+    <RunScriptHost Condition="!$([MSBuild]::IsOSPlatform('windows'))">$(RunScriptHostDir)dotnet</RunScriptHost>
   </PropertyGroup>
 
   <PropertyGroup>

From f6bbba4be772857c8c8214eeb7da2a7e8c942b19 Mon Sep 17 00:00:00 2001
From: yowl <scott.waye@hubse.com>
Date: Fri, 18 Dec 2020 17:01:38 -0500
Subject: [PATCH 2/4] bring target OS test in line with test.targets

---
 src/tests/Directory.Build.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props
index 30bf6a62966e0c..a820eafa18da48 100644
--- a/src/tests/Directory.Build.props
+++ b/src/tests/Directory.Build.props
@@ -138,8 +138,8 @@
 
   <!-- Set Test Wrapper running host OS -->
   <PropertyGroup>
-    <TestWrapperTargetsWindows>false</TestWrapperTargetsWindows>
-    <TestWrapperTargetsWindows Condition=" ('$(TargetsWindows)' != '' And '$(TargetsWindows)' ) OR ('$(TargetOS)' == 'Android' And '$(TargetArchitecture)' == 'arm64' )">true</TestWrapperTargetsWindows>
+     <TestWrapperTargetsWindows>true</TestWrapperTargetsWindows>
+    <TestWrapperTargetsWindows Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">false</TestWrapperTargetsWindows>
   </PropertyGroup>
 
 </Project>

From a8c5682d8b8ff4efded607c67bdb3a7dd9dcaa96 Mon Sep 17 00:00:00 2001
From: yowl <scott.waye@hubse.com>
Date: Fri, 18 Dec 2020 18:20:12 -0500
Subject: [PATCH 3/4] bring target OS test in line

---
 eng/testing/tests.targets | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index 4eafb49b0e24f9..8241897e51efec 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -1,22 +1,22 @@
 <Project>
   <PropertyGroup>
-    <RunScriptInputName Condition="$([MSBuild]::IsOSPlatform('windows'))">RunnerTemplate.cmd</RunScriptInputName>
-    <RunScriptInputName Condition="!$([MSBuild]::IsOSPlatform('windows'))">RunnerTemplate.sh</RunScriptInputName>
+    <RunScriptInputName Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunnerTemplate.cmd</RunScriptInputName>
+    <RunScriptInputName Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">AppleRunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Android'">AndroidRunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Browser'">WasmRunnerTemplate.sh</RunScriptInputName>
 
     <RunScriptInputPath>$(MSBuildThisFileDirectory)$(RunScriptInputName)</RunScriptInputPath>
 
-    <RunScriptOutputName Condition="$([MSBuild]::IsOSPlatform('windows'))">RunTests.cmd</RunScriptOutputName>
-    <RunScriptOutputName Condition="!$([MSBuild]::IsOSPlatform('windows'))">RunTests.sh</RunScriptOutputName>
+    <RunScriptOutputName Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunTests.cmd</RunScriptOutputName>
+    <RunScriptOutputName Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunTests.sh</RunScriptOutputName>
     <RunScriptOutputPath>$([MSBuild]::NormalizePath('$(OutDir)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
 
-    <RunScriptHostDir Condition="$([MSBuild]::IsOSPlatform('windows'))">%RUNTIME_PATH%\</RunScriptHostDir>
-    <RunScriptHostDir Condition="!$([MSBuild]::IsOSPlatform('windows'))">$RUNTIME_PATH/</RunScriptHostDir>
+    <RunScriptHostDir Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">%RUNTIME_PATH%\</RunScriptHostDir>
+    <RunScriptHostDir Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
 
-    <RunScriptHost Condition="$([MSBuild]::IsOSPlatform('windows'))">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
-    <RunScriptHost Condition="!$([MSBuild]::IsOSPlatform('windows'))">$(RunScriptHostDir)dotnet</RunScriptHost>
+    <RunScriptHost Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
+    <RunScriptHost Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
   </PropertyGroup>
 
   <PropertyGroup>

From 7071bbcf92a9babb291090f665dbb5755b44c27b Mon Sep 17 00:00:00 2001
From: yowl <scott.waye@hubse.com>
Date: Fri, 18 Dec 2020 21:10:59 -0500
Subject: [PATCH 4/4] fix up the quotes

---
 eng/testing/tests.targets | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index 8241897e51efec..1fa74390becf87 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -1,22 +1,22 @@
 <Project>
   <PropertyGroup>
-    <RunScriptInputName Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunnerTemplate.cmd</RunScriptInputName>
-    <RunScriptInputName Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunnerTemplate.sh</RunScriptInputName>
+    <RunScriptInputName Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunnerTemplate.cmd</RunScriptInputName>
+    <RunScriptInputName Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">AppleRunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Android'">AndroidRunnerTemplate.sh</RunScriptInputName>
     <RunScriptInputName Condition="'$(TargetOS)' == 'Browser'">WasmRunnerTemplate.sh</RunScriptInputName>
 
     <RunScriptInputPath>$(MSBuildThisFileDirectory)$(RunScriptInputName)</RunScriptInputPath>
 
-    <RunScriptOutputName Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunTests.cmd</RunScriptOutputName>
-    <RunScriptOutputName Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunTests.sh</RunScriptOutputName>
+    <RunScriptOutputName Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunTests.cmd</RunScriptOutputName>
+    <RunScriptOutputName Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunTests.sh</RunScriptOutputName>
     <RunScriptOutputPath>$([MSBuild]::NormalizePath('$(OutDir)', '$(RunScriptOutputName)'))</RunScriptOutputPath>
 
-    <RunScriptHostDir Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">%RUNTIME_PATH%\</RunScriptHostDir>
-    <RunScriptHostDir Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
+    <RunScriptHostDir Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">%RUNTIME_PATH%\</RunScriptHostDir>
+    <RunScriptHostDir Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>
 
-    <RunScriptHost Condition="!($(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
-    <RunScriptHost Condition="$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
+    <RunScriptHost Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
+    <RunScriptHost Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
   </PropertyGroup>
 
   <PropertyGroup>