From 7b3f91627f6f98a5e1c46311419c264d7506c11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= <michals@microsoft.com>
Date: Tue, 16 Apr 2019 18:10:35 +0200
Subject: [PATCH] Revert "Revert "Run IBCMerge on Linux build (#36763)"
 (#36791)"

This reverts commit 8e843314e1dbd3b3f26abb1f285349be8920cce4.
---
 Directory.Build.props                              | 9 +++++++--
 eng/codeOptimization.targets                       | 6 +++++-
 external/optimizationData/optimizationData.depproj | 7 ++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3f4f2b1a16eb..05f23e1bf042 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -266,8 +266,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- Embed IBC data on Windows release builds, if IBCMerge isn't available this will just log the commandline -->
-    <EnablePartialNgenOptimization Condition="'$(EnablePartialNgenOptimization)' == '' and '$(OS)' == 'Windows_NT' and '$(ConfigurationGroup)' == 'Release'">true</EnablePartialNgenOptimization>
+    <!-- Embed IBC data on release builds, if IBCMerge isn't available this will just log the commandline -->
+    <EnablePartialNgenOptimization Condition="'$(EnablePartialNgenOptimization)' == '' and '$(ConfigurationGroup)' == 'Release'">true</EnablePartialNgenOptimization>
+
+    <WindowsCoreFxOptimizationDataPackageId>optimization.windows_nt-x64.IBC.CoreFx</WindowsCoreFxOptimizationDataPackageId>
+    <WindowsCoreFxOptimizationDataVersion>$(optimizationwindows_ntx64IBCCoreFxPackageVersion)</WindowsCoreFxOptimizationDataVersion>
+    <LinuxCoreFxOptimizationDataPackageId>optimization.linux-x64.IBC.CoreFx</LinuxCoreFxOptimizationDataPackageId>
+    <LinuxCoreFxOptimizationDataVersion>$(optimizationwindows_ntx64IBCCoreFxPackageVersion)</LinuxCoreFxOptimizationDataVersion>
   </PropertyGroup>
 
   <!-- Set up Default symbol and optimization for Configuration -->
diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets
index c52fec409f7f..b49f8e52bec5 100644
--- a/eng/codeOptimization.targets
+++ b/eng/codeOptimization.targets
@@ -9,6 +9,10 @@
   <Target Name="SetApplyNgenOptimization"
           Condition="'$(IsEligibleForNgenOptimization)' == 'true'"
           BeforeTargets="CoreCompile">
+    <PropertyGroup>
+      <IbcOptimizationDataDir Condition="'$(OSGroup)' == 'Unix' or '$(OSGroup)' == 'Linux'">$(IbcOptimizationDataDir)$(LinuxCoreFxOptimizationDataPackageId)\</IbcOptimizationDataDir>
+      <IbcOptimizationDataDir Condition="'$(OSGroup)' != 'Unix' and '$(OSGroup)' != 'Linux'">$(IbcOptimizationDataDir)$(WindowsCoreFxOptimizationDataPackageId)\</IbcOptimizationDataDir>
+    </PropertyGroup>
     <ItemGroup>
       <_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" />
     </ItemGroup>
@@ -17,4 +21,4 @@
     </PropertyGroup>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/external/optimizationData/optimizationData.depproj b/external/optimizationData/optimizationData.depproj
index 7a5efe42cccc..7bdc2518c2c3 100644
--- a/external/optimizationData/optimizationData.depproj
+++ b/external/optimizationData/optimizationData.depproj
@@ -3,14 +3,11 @@
     <!-- Copy to IBC directory -->
     <OutputPath>$(IbcOptimizationDataDir)</OutputPath>
     <EnableBinPlacing>false</EnableBinPlacing>
-
-    <CoreFxOptimizationDataPackageId>optimization.windows_nt-x64.IBC.CoreFx</CoreFxOptimizationDataPackageId>
-    <CoreFxOptimizationDataPackageId Condition="'$(IBCTarget)'=='Linux'">optimization.linux-x64.IBC.CoreFx</CoreFxOptimizationDataPackageId>
-    <CoreFxOptimizationDataVersion>$(optimizationwindows_ntx64IBCCoreFxPackageVersion)</CoreFxOptimizationDataVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- IBC data -->
-    <IBCPackage Include="$(CoreFxOptimizationDataPackageId)" Version="$(CoreFxOptimizationDataVersion)" />
+    <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackageId)" Version="$(WindowsCoreFxOptimizationDataVersion)" />
+    <IBCPackage Include="$(LinuxCoreFxOptimizationDataPackageId)" Version="$(LinuxCoreFxOptimizationDataVersion)" />
     <PackageReference Include="@(IBCPackage)" GeneratePathProperty="true" />
   </ItemGroup>