Fix TestILC copy for uapaot

dotnet · Dec 3, 2018 · 33440b2 · 33440b2
1 parent a1a67e3
commit 33440b2
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
@@ -172,11 +172,15 @@
       <TestILCFolder Condition="'$(TestILCFolder)' == ''">$(PackagesDir)$(TestILCToolsPackageName)\$(ProjectNTfsTestILCPackageVersion)\TestILC</TestILCFolder>
     </PropertyGroup>
 
-    <Warning Text="Could not find the TestILC Tools at '$(TestILCFolder)'. Please run sync." Condition="('$(TestILCFolder)' == '' or !Exists('$(TestILCFolder)')) AND '$(BuildAllConfigurations)' != 'true'" />
+    <Warning Text="Could not find the TestILC Tools at '$(TestILCFolder)'. Please run sync." Condition="('$(TestILCFolder)' == '' OR !Exists('$(TestILCFolder)')) AND '$(BuildAllConfigurations)' != 'true'" />
 
-    <Copy Condition="'$(TestILCFolder)' != ''"
-          SourceFiles="$(TestILCFolder)"
-          DestinationFolder="$(InternalTestILCFolder)"
+    <ItemGroup Condition="Exists('$(TestILCFolder)')">
+      <TestILCFolderContents Include="$(TestILCFolder)\**\*" />
+    </ItemGroup>
+
+    <Copy Condition="Exists('$(TestILCFolder)')"
+          SourceFiles="@(TestILCFolderContents)"
+          DestinationFolder="$(InternalTestILCFolder)\%(RecursiveDir)"
           SkipUnchangedFiles="true" />
 
   </Target>