Use wildcard to resolve S.P.CoreLib from CoreCLRArtifacts (#878)

* Use wildcard to resolve S.P.CoreLib from CoreCLRArtifacts * Probe 2 paths instead
dotnet · Dec 15, 2019 · 57df202 · 57df202
1 parent a3029cb
commit 57df202
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
@@ -32,7 +32,11 @@
       <CoreCLRFiles>
         <IsNative>true</IsNative>
       </CoreCLRFiles>
-      <CoreCLRFiles Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll" />
+      <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll"
+                             Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" />
+      <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll"
+                             Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" />
+      <CoreCLRFiles Include="@(_systemPrivateCoreLib)" />
       <CoreCLRFiles
         Include="
           $(CoreCLRSharedFrameworkDir)PDB/*.pdb;