From 0e8d0967500ca08e2ce5860e3d6e72e0dfd49923 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 25 Jul 2020 13:38:21 +0200
Subject: [PATCH] Fix CoreLib path resolution

Fixes issue described in https://github.com/dotnet/runtime/pull/39891#issuecomment-663767530.
---
 src/mono/wasm/wasm.targets | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/mono/wasm/wasm.targets b/src/mono/wasm/wasm.targets
index e3210dbc72e9ff..9934c9a845fecf 100644
--- a/src/mono/wasm/wasm.targets
+++ b/src/mono/wasm/wasm.targets
@@ -20,13 +20,16 @@
       <WasmPInvokeModule Include="libSystem.Native" />
       <WasmPInvokeModule Include="libSystem.IO.Compression.Native" />
       <WasmPInvokeModule Include="libSystem.Globalization.Native" />
-      <!-- Include CoreLib via the CollectedBuildOutput as it isn't binplaced into the runtime pack at this time. -->
-      <WasmPInvokeAssembly Include="@(CollectedBuildOutput)"
-                           Condition="'%(CollectedBuildOutput.MSBuildSourceProjectFile)' == '$(CoreLibProject)'" />
       <WasmPInvokeAssembly Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" />
     </ItemGroup>
-
-    <MakeDir Directories="$(ArtifactsObjDir)wasm"/>
+    
+    <!-- Retrieve CoreLib's targetpath via GetTargetPath as it isn't binplaced yet. -->
+    <MSBuild Projects="$(CoreLibProject)"
+             Targets="GetTargetPath">
+      <Output TaskParameter="TargetOutputs" ItemName="WasmPInvokeAssembly" />
+    </MSBuild>
+
+    <MakeDir Directories="$(ArtifactsObjDir)wasm" />
     <PInvokeTableGenerator Modules="@(WasmPInvokeModule)"
                            Assemblies="@(WasmPInvokeAssembly)"
                            OutputPath="$(WasmPInvokeTablePath)" />