From 7508032eefa8a11b607fee0ced25e60dbdb4ed44 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 20 May 2020 16:19:51 -0400
Subject: [PATCH 1/3] Shift producing wasm binaries to the native dir so that
 they'll come over to the installer on CI

---
 src/mono/wasm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile
index 6dc4699c7e4293..e652422d1aef3d 100644
--- a/src/mono/wasm/Makefile
+++ b/src/mono/wasm/Makefile
@@ -44,7 +44,7 @@ emsdk_env.sh: | provision-wasm
 
 MONO_OBJ_DIR=$(OBJDIR)/mono/Browser.wasm.$(CONFIG)
 MONO_INCLUDE_DIR=$(MONO_BIN_DIR)/include/mono-2.0
-BUILDS_BIN_DIR=$(MONO_BIN_DIR)/wasm/runtimes
+BUILDS_BIN_DIR=$(SYS_NATIVE_DIR)/wasm/runtimes
 BUILDS_OBJ_DIR=$(MONO_OBJ_DIR)/wasm/runtimes
 MONO_LIBS = \
 	$(MONO_BIN_DIR)/{libmono-ee-interp.a,libmonosgen-2.0.a,libmono-ilgen.a,libmono-icall-table.a} \

From 3a76c19758eb68935a938be368397b7523af6beb Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Thu, 21 May 2020 16:02:06 -0400
Subject: [PATCH 2/3] Glob the native files for mobile and make sure they get
 reflected in the installer

---
 eng/liveBuilds.targets                                      | 6 +++++-
 .../pkg/projects/netcoreapp/src/netcoreapp.depproj          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 0101292cdf18a3..98419ffad35a01 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -175,7 +175,7 @@
         $(LibrariesAllBinArtifactsPath)*.dll;
         $(LibrariesAllBinArtifactsPath)*.pdb"
         IsNative="" />
-      <LibrariesRuntimeFiles Include="
+      <LibrariesRuntimeFiles Condition="'$(TargetsMobile)' != 'true'" Include="
         $(LibrariesNativeArtifactsPath)*.dll;
         $(LibrariesNativeArtifactsPath)*.dylib;
         $(LibrariesNativeArtifactsPath)*.a;
@@ -184,6 +184,10 @@
         $(LibrariesNativeArtifactsPath)*.dwarf;
         $(LibrariesNativeArtifactsPath)*.pdb"
         IsNative="true" />
+      <LibrariesRuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
+                             Include="
+        $(LibrariesNativeArtifactsPath)\**\*.*" 
+        IsNative="true" />
     </ItemGroup>
 
     <Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The 'libs' subset must be built before building this project." />
diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
index 339c8a26e30655..863f359bf37003 100644
--- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
+++ b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
@@ -105,7 +105,7 @@
 
     <ItemGroup Condition="'$(PackageRID)' != ''">
       <LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" />
-      <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native" />
+      <LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native/%(RecursiveDir)" />
       <ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
     </ItemGroup>
 

From 0f5adef1718ec2cb33a5b2db7fd1b533d88d3717 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steveisok@users.noreply.github.com>
Date: Thu, 21 May 2020 21:58:57 -0400
Subject: [PATCH 3/3] Update eng/liveBuilds.targets

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
---
 eng/liveBuilds.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 98419ffad35a01..83f8c41353d293 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -186,7 +186,7 @@
         IsNative="true" />
       <LibrariesRuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
                              Include="
-        $(LibrariesNativeArtifactsPath)\**\*.*" 
+        $(LibrariesNativeArtifactsPath)**\*.*" 
         IsNative="true" />
     </ItemGroup>