Fix CoreLib path resolution (#39921)

Fixes issue described in #39891 (comment).
dotnet · Jul 25, 2020 · b77b242 · b77b242
1 parent 84eeebb
commit b77b242
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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)" />