From 57df20206691c6123b6e2d392b661cb3541fc24a Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Sat, 14 Dec 2019 18:36:43 -0600 Subject: [PATCH] Use wildcard to resolve S.P.CoreLib from CoreCLRArtifacts (#878) * Use wildcard to resolve S.P.CoreLib from CoreCLRArtifacts * Probe 2 paths instead --- eng/liveBuilds.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 9065ac6..0fc0a9a 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -32,7 +32,11 @@ true - + <_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)' == ''" /> +