From 506afd2c2b00800daf75b86f8ce48acb1c83ad84 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Mon, 8 Jun 2020 08:39:12 -0400
Subject: [PATCH] Revert "Try a cleaner `.app` find in msbuild, from
 @akoeplinger"

This reverts commit 64da851be89f6f4dd00be7f804534aa3af15259d.
---
 src/libraries/sendtohelix.proj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 7502a9cabf4e1..aeff1506fb4d7 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -105,7 +105,10 @@
 
     <ItemGroup Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">
       <!-- Find all directories named *.app and strip the trailing slash -->
-      <XHarnessAppFolderToTest Include="$([System.IO.Directory]::GetDirectories('$(TestArchiveTestsRoot)', '*.app', System.IO.SearchOption.AllDirectories))">
+      <_appBundleFiles Include="$(TestArchiveTestsRoot)**/*"/>
+      <_appBundleDirs Include="@(_appBundleFiles->'%(RootDir)%(Directory)'->Distinct())"/>
+      <XHarnessAppFolderToTest Include="@(_appBundleDirs->Replace(&quot;.app/&quot;, &quot;.app&quot;))"
+                               Condition="$([System.Text.RegularExpressions.Regex]::IsMatch(%(Identity), '\.app/?$'))">
         <Targets Condition="'$(TargetArchitecture)' == 'arm'">ios-device</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'arm64'">ios-device</Targets>
         <Targets Condition="'$(TargetArchitecture)' == 'x64'">ios-simulator-64</Targets>