From b62b33a61c4a51a167470789abb0d91b7bd0bfdd Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Thu, 17 Dec 2020 16:09:12 +0300
Subject: [PATCH 1/4] Remove the logic duplication for iOS case

---
 src/libraries/sendtohelixhelp.proj         | 17 ++++-------------
 src/mono/netcore/sample/iOS/Program.csproj | 10 +++++-----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 742f4bb0e1df1..6ed27664439ac 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -177,8 +177,9 @@
     <Message Importance="High" Text="Using Timeout: $(_workItemTimeout)" />
 
     <ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
+      <_apps Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))" />
       <!-- Create work items for test apps -->
-      <XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))">
+      <XHarnessAppBundleToTest Include="@(_apps)">
         <Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
@@ -186,20 +187,10 @@
 
         <TestTimeout>$(_workItemTimeout)</TestTimeout>
         <LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
-      </XHarnessAppBundleToTest>
-
-      <!-- Create work items for run-only apps -->
-      <XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveRoot)runonly', '*.app', System.IO.SearchOption.AllDirectories))" >
-        <Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
-        <Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
-        <Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
-        <Targets Condition="'$(TargetArchitecture)' == 'x86'">ios-simulator-32</Targets>
-
-        <LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
         <!-- The sample app doesn't need test runner -->
-        <IncludesTestRunner>false</IncludesTestRunner>
+        <IncludesTestRunner Condition="$([System.String]::new('%(Identity)').Contains('runonly')">false</IncludesTestRunner>
         <!-- The sample's C# Main method returns 42 so it should be considered by xharness as a success -->
-        <ExpectedExitCode>42</ExpectedExitCode>
+        <ExpectedExitCode Condition="$([System.String]::new('%(Identity)').Contains('runonly')">42</ExpectedExitCode>
       </XHarnessAppBundleToTest>
     </ItemGroup>
 
diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj
index a300148a88a37..671cde3bdfad5 100644
--- a/src/mono/netcore/sample/iOS/Program.csproj
+++ b/src/mono/netcore/sample/iOS/Program.csproj
@@ -99,17 +99,17 @@
       <!-- AnyCPU as Platform-->
       <OSPlatformConfig>$(TargetOS).AnyCPU.$(Configuration)</OSPlatformConfig>
       <!-- <OSPlatformConfig>$(TargetOS).$(Platform).$(Configuration)</OSPlatformConfig> -->
-      <HelixArchiveRoot>$(ArtifactsDir)helix/</HelixArchiveRoot>
-      <HelixArchiveRunOnlyRoot>$(HelixArchiveRoot)runonly/</HelixArchiveRunOnlyRoot>
-      <HelixArchiveRunOnlyAppsDir>$(HelixArchiveRunOnlyRoot)$(OSPlatformConfig)/</HelixArchiveRunOnlyAppsDir>
+      <TestArchiveRoot>$(ArtifactsDir)helix/</TestArchiveRoot>
+      <TestArchiveTestsRoot>$(TestArchiveRoot)tests/</TestArchiveTestsRoot>
+      <TestArchiveRunOnlyAppsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/runonly/</TestArchiveRunOnlyAppsDir>
     </PropertyGroup>
     <ItemGroup>
       <_appFiles Include="$(AppBundlePath)/../**/*" />
     </ItemGroup>
     <Copy SourceFiles="@(_appFiles)"
-          DestinationFolder="$(HelixArchiveRunOnlyAppsDir)/%(RecursiveDir)" />
+          DestinationFolder="$(TestArchiveRunOnlyAppsDir)/%(RecursiveDir)" />
 
     <Message Importance="High" Text="AppBundlePath: $(AppBundlePath)"/>
-    <Message Importance="High" Text="HelixArchiveRunOnlyAppsDir: $(HelixArchiveRunOnlyAppsDir)"/>
+    <Message Importance="High" Text="TestArchiveRunOnlyAppsDir: $(TestArchiveRunOnlyAppsDir)"/>
   </Target>
 </Project>

From a4a2f181a02f3b63ae576fa44ad863fbfead8afe Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Thu, 17 Dec 2020 17:33:01 +0300
Subject: [PATCH 2/4] Parenthesis

---
 src/libraries/sendtohelixhelp.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 6ed27664439ac..c9047890bf695 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -188,9 +188,9 @@
         <TestTimeout>$(_workItemTimeout)</TestTimeout>
         <LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
         <!-- The sample app doesn't need test runner -->
-        <IncludesTestRunner Condition="$([System.String]::new('%(Identity)').Contains('runonly')">false</IncludesTestRunner>
+        <IncludesTestRunner Condition="$([System.String]::new('%(Identity)').Contains('runonly'))">false</IncludesTestRunner>
         <!-- The sample's C# Main method returns 42 so it should be considered by xharness as a success -->
-        <ExpectedExitCode Condition="$([System.String]::new('%(Identity)').Contains('runonly')">42</ExpectedExitCode>
+        <ExpectedExitCode Condition="$([System.String]::new('%(Identity)').Contains('runonly'))">42</ExpectedExitCode>
       </XHarnessAppBundleToTest>
     </ItemGroup>
 

From 99137e8a6081db952c22f58bf5932b6f1b6a0a4b Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Fri, 18 Dec 2020 11:23:34 +0300
Subject: [PATCH 3/4] Try the approach with ItemDefinitionGroup

---
 src/libraries/sendtohelixhelp.proj         | 19 ++++++++++++-------
 src/mono/netcore/sample/iOS/Program.csproj | 10 +++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index c9047890bf695..e15b7abeb4490 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -176,21 +176,26 @@
     <Message Importance="High" Text="Using WorkItemArchiveWildCard: $(WorkItemArchiveWildCard)" />
     <Message Importance="High" Text="Using Timeout: $(_workItemTimeout)" />
 
-    <ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
-      <_apps Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))" />
-      <!-- Create work items for test apps -->
-      <XHarnessAppBundleToTest Include="@(_apps)">
+    <ItemDefinitionGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
+      <XHarnessAppBundleToTest>
         <Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'x86'">ios-simulator-32</Targets>
-
         <TestTimeout>$(_workItemTimeout)</TestTimeout>
         <LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
+      </XHarnessAppBundleToTest>
+    </ItemDefinitionGroup>
+
+    <ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
+      <!-- Create work items for test apps -->
+      <XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))" />
+      <!-- Create work items for run-only apps -->
+      <XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveRoot)runonly', '*.app', System.IO.SearchOption.AllDirectories))" >
         <!-- The sample app doesn't need test runner -->
-        <IncludesTestRunner Condition="$([System.String]::new('%(Identity)').Contains('runonly'))">false</IncludesTestRunner>
+        <IncludesTestRunner>false</IncludesTestRunner>
         <!-- The sample's C# Main method returns 42 so it should be considered by xharness as a success -->
-        <ExpectedExitCode Condition="$([System.String]::new('%(Identity)').Contains('runonly'))">42</ExpectedExitCode>
+        <ExpectedExitCode>42</ExpectedExitCode>
       </XHarnessAppBundleToTest>
     </ItemGroup>
 
diff --git a/src/mono/netcore/sample/iOS/Program.csproj b/src/mono/netcore/sample/iOS/Program.csproj
index 671cde3bdfad5..a300148a88a37 100644
--- a/src/mono/netcore/sample/iOS/Program.csproj
+++ b/src/mono/netcore/sample/iOS/Program.csproj
@@ -99,17 +99,17 @@
       <!-- AnyCPU as Platform-->
       <OSPlatformConfig>$(TargetOS).AnyCPU.$(Configuration)</OSPlatformConfig>
       <!-- <OSPlatformConfig>$(TargetOS).$(Platform).$(Configuration)</OSPlatformConfig> -->
-      <TestArchiveRoot>$(ArtifactsDir)helix/</TestArchiveRoot>
-      <TestArchiveTestsRoot>$(TestArchiveRoot)tests/</TestArchiveTestsRoot>
-      <TestArchiveRunOnlyAppsDir>$(TestArchiveTestsRoot)$(OSPlatformConfig)/runonly/</TestArchiveRunOnlyAppsDir>
+      <HelixArchiveRoot>$(ArtifactsDir)helix/</HelixArchiveRoot>
+      <HelixArchiveRunOnlyRoot>$(HelixArchiveRoot)runonly/</HelixArchiveRunOnlyRoot>
+      <HelixArchiveRunOnlyAppsDir>$(HelixArchiveRunOnlyRoot)$(OSPlatformConfig)/</HelixArchiveRunOnlyAppsDir>
     </PropertyGroup>
     <ItemGroup>
       <_appFiles Include="$(AppBundlePath)/../**/*" />
     </ItemGroup>
     <Copy SourceFiles="@(_appFiles)"
-          DestinationFolder="$(TestArchiveRunOnlyAppsDir)/%(RecursiveDir)" />
+          DestinationFolder="$(HelixArchiveRunOnlyAppsDir)/%(RecursiveDir)" />
 
     <Message Importance="High" Text="AppBundlePath: $(AppBundlePath)"/>
-    <Message Importance="High" Text="TestArchiveRunOnlyAppsDir: $(TestArchiveRunOnlyAppsDir)"/>
+    <Message Importance="High" Text="HelixArchiveRunOnlyAppsDir: $(HelixArchiveRunOnlyAppsDir)"/>
   </Target>
 </Project>

From 4f1e08d2043083e6203d9f7a2294acbb749ce369 Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Fri, 18 Dec 2020 12:39:31 +0300
Subject: [PATCH 4/4] ItemDefinitionGroup can't be inside target

---
 src/libraries/sendtohelixhelp.proj | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index e15b7abeb4490..312dc2dd9566c 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -158,6 +158,17 @@
     <HelixProperties Condition="'$(Scenario)' != ''" Include="scenario" Value="$(Scenario)" />
   </ItemGroup>
 
+  <ItemDefinitionGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
+    <XHarnessAppBundleToTest>
+      <Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
+      <Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
+      <Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
+      <Targets Condition="'$(TargetArchitecture)' == 'x86'">ios-simulator-32</Targets>
+      <TestTimeout>$(_workItemTimeout)</TestTimeout>
+      <LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
+    </XHarnessAppBundleToTest>
+  </ItemDefinitionGroup>
+
   <!--
     Create all the Helix data to start a set of jobs. Create a set of work items, one for each libraries
     test assembly. All will have the same command line. Note that this target is listed in the
@@ -176,17 +187,6 @@
     <Message Importance="High" Text="Using WorkItemArchiveWildCard: $(WorkItemArchiveWildCard)" />
     <Message Importance="High" Text="Using Timeout: $(_workItemTimeout)" />
 
-    <ItemDefinitionGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
-      <XHarnessAppBundleToTest>
-        <Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
-        <Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
-        <Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>
-        <Targets Condition="'$(TargetArchitecture)' == 'x86'">ios-simulator-32</Targets>
-        <TestTimeout>$(_workItemTimeout)</TestTimeout>
-        <LaunchTimeout>$(_workItemTimeout)</LaunchTimeout>
-      </XHarnessAppBundleToTest>
-    </ItemDefinitionGroup>
-
     <ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
       <!-- Create work items for test apps -->
       <XHarnessAppBundleToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))" />