From 31a65f0fbaad1c395d4bd9aa68c9dbda15f65c95 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Mon, 9 Mar 2020 15:37:24 -0700
Subject: [PATCH] Disable IBCMerge on OSX builds (#33393)

* Disable System.Private.CoreLib IBCMerge on MacOS.

* Disable IBCMerge on mac across the board.

* Update comment to include link to issue.
---
 eng/codeOptimization.targets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets
index 9f13545..cbd2474 100644
--- a/eng/codeOptimization.targets
+++ b/eng/codeOptimization.targets
@@ -4,6 +4,12 @@
      <IsEligibleForNgenOptimization>true</IsEligibleForNgenOptimization>
      <IsEligibleForNgenOptimization Condition="'$(IsReferenceAssembly)' == 'true'">false</IsEligibleForNgenOptimization>
      <IsEligibleForNgenOptimization Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">false</IsEligibleForNgenOptimization>
+      <!-- There's an issue causing IBCMerge failures because of mismatched MVIDs
+           across many of our assemblies on Mac, so disable
+           IBCMerge optimizations on Mac for now to unblock the offical build.
+           See issue https://github.com/dotnet/runtime/issues/33303
+      -->
+      <IsEligibleForNgenOptimization Condition="'$(TargetOS)' == 'OSX'">false</IsEligibleForNgenOptimization>
   </PropertyGroup>
 
   <Target Name="SetApplyNgenOptimization"
-- 
2.7.4