From 2d0e6b49f63732124615c16807446761d2917124 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Fri, 22 May 2020 10:07:21 -0700
Subject: [PATCH] Fix wasm build when runtime configuration and configuration
 are different (#36855)

* Fix wasm build when runtime configuration and configuration are different

* PR Feedback
---
 src/libraries/pretest.proj                              |  1 +
 src/libraries/src.proj                                  |  9 ---------
 src/mono/wasm/wasm.proj                                 | 17 ++++++-----------
 .../mobile.tasks/WasmAppBuilder/WasmAppBuilder.csproj   |  4 ++++
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 9414103..01ff1b7 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -18,6 +18,7 @@
 
     <ProjectReference Include="$(CommonTestPath)AppleTestRunner\AppleTestRunner.csproj" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'"/>
     <ProjectReference Include="$(CommonTestPath)AndroidTestRunner\AndroidTestRunner.csproj" Condition="'$(TargetOS)' == 'Android'" />
+    <ProjectReference Include="$(MonoProjectRoot)wasm\wasm.proj" Condition="'$(TargetOS)' == 'Browser'" />
   </ItemGroup>
 
   <Target Name="RestoreTestHost"
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index dbf6557..35120f0 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -45,13 +45,4 @@
              Projects="@(ApiCompatProject)"
              Properties="$(TraversalGlobalProperties)" />
   </Target>
-
-  <!-- Wasm runtimes depend on the mono runtime and libs to be built, so they can only be built here -->
-  <Target Name="BuildWasmPackageDependency"
-          Condition="'$(TargetOS)' == 'Browser'"
-          AfterTargets="Build">
-    <MSBuild Projects="$(MonoProjectRoot)\wasm\wasm.proj"
-             Properties="Configuration=$(Configuration);TargetOS=$(TargetOS);TargetArchitecture=$(TargetArchitecture)"/>
-  </Target>
-
 </Project>
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index d83f1fc..4da4663 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.Build.NoTargets" DefaultTargets="BuildWasmRuntimes">
+<Project Sdk="Microsoft.Build.Traversal">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
   </PropertyGroup>
 
   <UsingTask TaskName="PInvokeTableGenerator"
-    AssemblyFile="$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'WasmAppBuilder', '$(MonoConfiguration)', '$(NetCoreAppCurrent)'))publish\WasmAppBuilder.dll"/>
+    AssemblyFile="$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish', 'WasmAppBuilder.dll'))"/>
 
   <PropertyGroup>
     <WasmPInvokeTablePath>$(MonoObjDir)wasm/pinvoke-table.h</WasmPInvokeTablePath>
@@ -28,14 +28,7 @@
     <Error Condition="'$(EMSDK_PATH)' == ''" Text="The EMSDK_PATH environment variable should be set pointing to the emscripten SDK root dir."/>
   </Target>
 
-  <Target Name="BuildWasmAppBuilder">
-    <!-- Need to publish this since it references System.Reflection.MetadataLoadContext -->
-    <MSBuild Projects="$(RepoRoot)\tools-local\tasks\mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj"
-             Properties="Configuration=$(Configuration)"
-             Targets="Restore;Build;Publish"/>
-  </Target>
-
-  <Target Name="BuildPInvokeTable" DependsOnTargets="CheckEnv;BuildWasmAppBuilder">
+  <Target Name="BuildPInvokeTable" DependsOnTargets="CheckEnv">
     <MakeDir Directories="$(MonoObjDir)wasm"/>
     <PInvokeTableGenerator
       Modules="@(WasmPInvokeModules)"
@@ -44,7 +37,9 @@
       />
   </Target>
 
-  <Target Name="BuildWasmRuntimes" DependsOnTargets="BuildPInvokeTable">
+  <Target Name="BuildWasmRuntimes"
+          AfterTargets="Build"
+          DependsOnTargets="BuildPInvokeTable">
     <Exec Command="make -C $(MonoProjectRoot)wasm all SHELL=/bin/bash BINDIR=$(ArtifactsBinDir) MONO_BIN_DIR=$(MonoArtifactsPath) OBJDIR=$(ArtifactsObjDir) SYS_NATIVE_DIR=$(ArtifactsBinDir)/native/$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) CONFIG=$(Configuration) PINVOKE_TABLE=$(WasmPInvokeTablePath)" IgnoreStandardErrorWarningFormat="true"/>
   </Target>
 
diff --git a/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.csproj b/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.csproj
index 7913d15..ab82b35 100644
--- a/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.csproj
+++ b/tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.csproj
@@ -16,4 +16,8 @@
     <Compile Include="PInvokeTableGenerator.cs" />
     <Compile Include="WasmAppBuilder.cs" />
   </ItemGroup>
+
+  <Target Name="PublishBuilder"
+          AfterTargets="Build"
+          DependsOnTargets="Publish" />
 </Project>
-- 
2.7.4