From e2333333f45892965f684ef21d7ebc73cc791ccb Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Fri, 12 Nov 2021 14:23:47 -0800
Subject: [PATCH] Ensure each published platform uses matching hostfxr library

---
 build.cake | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/build.cake b/build.cake
index 6f77bb9ee9..73741ac2f8 100644
--- a/build.cake
+++ b/build.cake
@@ -160,7 +160,7 @@ Task("InstallMonoAssets")
     .WithCriteria(() => !Platform.Current.IsWindows)
     .Does(() =>
 {
-    if (DirectoryHelper.Exists(env.Folders.Mono))
+    if (DirectoryHelper.Exists(env.Folders.Mono) && !publishAll)
     {
         Information("Skipping Mono assets installation, because they already exist.");
         return;
@@ -716,7 +716,7 @@ Task("Test")
         }
 });
 
-void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolder)
+void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolder, string platformName = null)
 {
     DirectoryHelper.Copy(sourceFolder, outputFolder, copySubDirectories: false);
 
@@ -725,8 +725,52 @@ void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolde
     // Copy MSBuild runtime and libraries
     DirectoryHelper.Copy($"{env.Folders.MSBuild}", msbuildFolder);
 
-    var msbuildBinFolder = CombinePaths(msbuildFolder, "bin", "Current");
+    var msbuildBinFolder = CombinePaths(msbuildFolder, "Current", "Bin");
     EnsureDirectoryExists(msbuildBinFolder);
+
+    if (platformName == null)
+    {
+        return;
+    }
+
+    // We built the .msbuild folder initially based on the current platform.
+    // We are now copying Mono for a particular platform and need to ensure that
+    // we are including the appropriate hostfxr library.
+
+    var platformParts = platformName.Split("-");
+    var platform = platformParts[0];
+    var architecture = platformParts.Length > 1 ? platformParts[1] : "x64";
+
+    // Since multiple linux builds will be generated we need to
+    var msbuildSdkResolverTargetFolder = CombinePaths(msbuildBinFolder, "SdkResolvers", "Microsoft.DotNet.MSBuildSdkResolver");
+    var hostfxrDylibPath = CombinePaths(msbuildSdkResolverTargetFolder, "libhostfxr.dylib");
+    var hostfxrSoPath = CombinePaths(msbuildSdkResolverTargetFolder, "libhostfxr.so");
+
+    if (FileHelper.Exists(hostfxrSoPath))
+    {
+        // Remove the Linux hostfxr library.
+        FileHelper.Delete(hostfxrSoPath);
+    }
+    else if (FileHelper.Exists(hostfxrDylibPath))
+    {
+        // Remove the MacOS hostfxr library.
+        FileHelper.Delete(hostfxrDylibPath);
+    }
+
+    if (platform == "osx")
+    {
+        CopyDotNetHostResolver(env, "osx", "x64", "libhostfxr.dylib", msbuildSdkResolverTargetFolder, copyToArchSpecificFolder: false);
+    }
+    else if (platform == "linux")
+    {
+        if (architecture == "x86")
+        {
+            // There is no x86 hostfxr use x64 instead.
+            architecture = "x64";
+        }
+
+        CopyDotNetHostResolver(env, "linux", architecture, "libhostfxr.so", msbuildSdkResolverTargetFolder, copyToArchSpecificFolder: false);
+    }
 }
 
 void CopyExtraDependencies(BuildEnvironment env, string outputFolder)
@@ -829,7 +873,7 @@ string PublishMonoBuildForPlatform(string project, MonoRuntime monoRuntime, Buil
     var sourceFolder = CombinePaths(env.Folders.ArtifactsPublish, project, "mono");
     var omnisharpFolder = CombinePaths(outputFolder, "omnisharp");
 
-    CopyMonoBuild(env, sourceFolder, omnisharpFolder);
+    CopyMonoBuild(env, sourceFolder, omnisharpFolder, monoRuntime.PlatformName);
 
     CopyExtraDependencies(env, outputFolder);
     AddOmniSharpBindingRedirects(omnisharpFolder);