From 89c1599da5792b2d45545374af64535c178d0317 Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@Microsoft.com>
Date: Tue, 26 May 2020 17:32:11 -0400
Subject: [PATCH] Build test scripts whenever CopyNativeProjectBinaries builds

---
 src/coreclr/tests/src/Directory.Build.targets | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets
index 7103c98da07d78..1d89eb2699e876 100644
--- a/src/coreclr/tests/src/Directory.Build.targets
+++ b/src/coreclr/tests/src/Directory.Build.targets
@@ -106,11 +106,6 @@
     <SkipImportILTargets Condition="'$(CLRTestBuildAllTargets)' != '' And '$(CLRTestNeedTarget)' != '$(CLRTestBuildAllTargets)'">true</SkipImportILTargets>
   </PropertyGroup>
 
-  <Import Project="CLRTest.Execute.targets" />
-  <Target Name="CreateExecuteScript"
-          Condition="'$(GenerateRunScript)' != 'false' And ('$(_WillCLRTestProjectBuild)' == 'true')"
-          DependsOnTargets="GenerateExecutionScriptsInternal" />
-
   <Target Name="CopyNativeProjectBinaries" Condition="'$(_CopyNativeProjectBinaries)' == 'true'">
 
      <ItemGroup>
@@ -195,7 +190,14 @@
 
   </Target>
 
-  <Target Name="CopyAllNativeProjectReferenceBinaries" DependsOnTargets="ResolveCmakeNativeProjectReference;ConsolidateNativeProjectReference;CreateExecuteScript" />
+  <Target Name="CopyAllNativeProjectReferenceBinaries" DependsOnTargets="ResolveCmakeNativeProjectReference;ConsolidateNativeProjectReference" />
+
+  <!-- Build shell or command scripts whenever we copy native binaries -->
+  <Import Project="CLRTest.Execute.targets" />
+  <Target Name="CreateExecuteScript"
+          BeforeTargets="Build;CopyAllNativeProjectReferenceBinaries"
+          Condition="'$(_CopyNativeProjectBinaries)' == 'true' And '$(GenerateRunScript)' != 'false' And ('$(_WillCLRTestProjectBuild)' == 'true')"
+          DependsOnTargets="GenerateExecutionScriptsInternal" />
 
   <Target Name="UpdateReferenceItems"
           BeforeTargets="BeforeResolveReferences"