From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 23 Jul 2020 01:09:46 +0000 (-0700)
Subject: Try re-enabling IBC on macOS. (#39801)
X-Git-Tag: submit/tizen/20210909.063632~6474
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a4298cf15379678c4d437a6554a1453706cc3b3;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Try re-enabling IBC on macOS. (#39801)
---

diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets
index 6ed7e99..73e19c9 100644
--- a/eng/codeOptimization.targets
+++ b/eng/codeOptimization.targets
@@ -4,12 +4,7 @@
      <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' or '$(TargetsMobile)' == 'true'">false</IsEligibleForNgenOptimization>
+     <IsEligibleForNgenOptimization Condition="'$(TargetsMobile)' == 'true'">false</IsEligibleForNgenOptimization>
   </PropertyGroup>
 
   <Target Name="SetApplyNgenOptimization"