From 3f6474bb8abb607d07e53c3d75dfb7b156836bbd Mon Sep 17 00:00:00 2001
From: jagarg <jagarg@microsoft.com>
Date: Mon, 21 May 2018 19:09:55 +0530
Subject: [PATCH 1/2] Conditionally delete resource folder

---
 src/Adapter/Build/Desktop/MSTest.TestAdapter.targets   | 6 ++++--
 src/Adapter/Build/Universal/MSTest.TestAdapter.targets | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets b/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
index 7abf88deec..286ce92b13 100644
--- a/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
@@ -36,8 +36,10 @@
   <Target Name="CleanupMSTestV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableMSTestV2CopyResources) == 'true'" DependsOnTargets="GetMSTestV2CultureHierarchy">
     <ItemGroup>
        <ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
+	   <FilesInResourceDirectories Include="%(ResourceDirectories.Identity)\**\*" />
     </ItemGroup>
-    <!-- RemoveDir does not throw if the folder does not exist. Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
-    <RemoveDir Directories="@(ResourceDirectories)" ContinueOnError="true"/>
+    <!-- RemoveDir does not throw if the folder does not exist. Remove resource folder only when it is empty.
+	Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
+    <RemoveDir Directories="@(ResourceDirectories)" Condition="'@(FilesInResourceDirectories->Count())' == 0" ContinueOnError="true" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Adapter/Build/Universal/MSTest.TestAdapter.targets b/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
index 9d05e3b15b..ddfbdfee84 100644
--- a/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
@@ -43,8 +43,10 @@
   <Target Name="CleanupMSTestV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableMSTestV2CopyResources) == 'true'" DependsOnTargets="GetMSTestV2CultureHierarchy">
     <ItemGroup>
        <ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
+	   <FilesInResourceDirectories Include="%(ResourceDirectories.Identity)\**\*" />
     </ItemGroup>
-    <!-- RemoveDir does not throw if the folder does not exist. Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
-    <RemoveDir Directories="@(ResourceDirectories)" ContinueOnError="true"/>
+    <!-- RemoveDir does not throw if the folder does not exist. Remove resource folder only when it is empty.
+	Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
+    <RemoveDir Directories="@(ResourceDirectories)" Condition="'@(FilesInResourceDirectories->Count())' == 0" ContinueOnError="true" />
   </Target>
 </Project>
\ No newline at end of file

From 917e0a35af23602628b38f193805c6813056e89c Mon Sep 17 00:00:00 2001
From: jagarg <jagarg@microsoft.com>
Date: Wed, 23 May 2018 19:11:49 +0530
Subject: [PATCH 2/2] Removing Cleaning up of empty resource folders

---
 src/Adapter/Build/Desktop/MSTest.TestAdapter.targets   | 10 ----------
 src/Adapter/Build/Universal/MSTest.TestAdapter.targets | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets b/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
index 286ce92b13..0649e3a2ac 100644
--- a/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
@@ -32,14 +32,4 @@
     </ItemGroup>
   </Target>
 
-  <!-- This is required because an empty resource folder is left even though the files within are cleaned up. -->
-  <Target Name="CleanupMSTestV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableMSTestV2CopyResources) == 'true'" DependsOnTargets="GetMSTestV2CultureHierarchy">
-    <ItemGroup>
-       <ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
-	   <FilesInResourceDirectories Include="%(ResourceDirectories.Identity)\**\*" />
-    </ItemGroup>
-    <!-- RemoveDir does not throw if the folder does not exist. Remove resource folder only when it is empty.
-	Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
-    <RemoveDir Directories="@(ResourceDirectories)" Condition="'@(FilesInResourceDirectories->Count())' == 0" ContinueOnError="true" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Adapter/Build/Universal/MSTest.TestAdapter.targets b/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
index ddfbdfee84..b0404380c6 100644
--- a/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
@@ -39,14 +39,4 @@
     </ItemGroup>
   </Target>
 
-  <!-- This is required because an empty resource folder is left even though the files within are cleaned up. -->
-  <Target Name="CleanupMSTestV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableMSTestV2CopyResources) == 'true'" DependsOnTargets="GetMSTestV2CultureHierarchy">
-    <ItemGroup>
-       <ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
-	   <FilesInResourceDirectories Include="%(ResourceDirectories.Identity)\**\*" />
-    </ItemGroup>
-    <!-- RemoveDir does not throw if the folder does not exist. Remove resource folder only when it is empty.
-	Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
-    <RemoveDir Directories="@(ResourceDirectories)" Condition="'@(FilesInResourceDirectories->Count())' == 0" ContinueOnError="true" />
-  </Target>
 </Project>
\ No newline at end of file