fixup! Fix outerloop issues

Author: RussKie

eng/Testing.targets

@@ -54,12 +54,10 @@
     <SkipTests Condition=" '$(IsGitHubActionsRunner)' == 'true' and '$(BuildOs)' != 'windows' and '$(RunOnGithubActionsLinux)' == 'true' ">false</SkipTests>
 
     <!-- Only run tests if the build is running on Helix infra  -->
-    <SkipTests Condition=" '$(IsAzdoHelixRunner)' == 'true' and '$(BuildOs)' == 'windows' and '$(RunOnAzdoHelixWindows)' == 'true' ">false</SkipTests>
-    <SkipTests Condition=" '$(IsAzdoHelixRunner)' == 'true' and '$(BuildOs)' != 'windows' and '$(RunOnAzdoHelixLinux)' == 'true' ">false</SkipTests>
+    <SkipTests Condition=" '$(IsAzdoHelixRunner)' == 'true' and '$(RunOnAzdoHelix)' == 'true' ">false</SkipTests>
 
     <!-- Otherwise, run tests on AzDO CI agents -->
-    <SkipTests Condition=" '$(IsAzdoCIRunner)' == 'true' and '$(BuildOs)' == 'windows' and '$(RunOnAzdoCIWindows)' == 'true' ">false</SkipTests>
-    <SkipTests Condition=" '$(IsAzdoCIRunner)' == 'true' and '$(BuildOs)' != 'windows' and '$(RunOnAzdoCILinux)' == 'true' ">false</SkipTests>
+    <SkipTests Condition=" '$(IsAzdoCIRunner)' == 'true' and '$(RunOnAzdoCI)' == 'true' ">false</SkipTests>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' and '$(IncludeTestUtilities)' == 'true' ">