From d6f40ea4c7a5a1541a10211136a17554c495b6a3 Mon Sep 17 00:00:00 2001
From: Drew Scoggins <anscoggi@microsoft.com>
Date: Fri, 26 Oct 2018 15:26:41 -0700
Subject: [PATCH] Update codeOptimization targets

This work allows us to specify the IBC data package that we will
pull down depending on whether we are doing application for
Linux or Windows.
---
 .../PackageFiles/codeOptimization.targets                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/codeOptimization.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/codeOptimization.targets
index cd934f5163..7eecb164c3 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/codeOptimization.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/codeOptimization.targets
@@ -6,6 +6,7 @@
     <OptimizationDataVersion Condition="'$(OptimizationDataVersion)'==''">2.0.0-rc-61101-16</OptimizationDataVersion>
     <CoreFxOptimizationDataVersion Condition="'$(CoreFxOptimizationDataVersion)'==''">99.99.99-master-20180815-0120</CoreFxOptimizationDataVersion>
     <OptimizationDataPackageName Condition="'$(OptimizationDataPackageName)'==''">RoslynDependencies.OptimizationData</OptimizationDataPackageName>
+    <CoreFxOptimizationDataPackageName Condition="'$(CoreFxOptimizationDataPackageName)'=='' and '$(IBCTarget)'=='Linux'">optimization.linux-x64.IBC.CoreFx</CoreFxOptimizationDataPackageName>
     <CoreFxOptimizationDataPackageName Condition="'$(CoreFxOptimizationDataPackageName)'==''">optimization.windows_nt-x64.IBC.CoreFx</CoreFxOptimizationDataPackageName>
     <OptimizationDataDir Condition="'$(OptimizationDataDir)'==''">$(ToolsDir)OptimizationData/</OptimizationDataDir>
     <RestoreDefaultOptimizationDataPackage Condition="'$(RestoreDefaultOptimizationDataPackage)'==''">true</RestoreDefaultOptimizationDataPackage>
@@ -84,7 +85,6 @@
 
   <!-- We need the OptimizationData package in order to be able to optimize the assembly -->
   <Target Name="RestoreOptimizationDataPackage"
-          BeforeTargets="Sync"
           Condition="'$(EnableProfileGuidedOptimization)'=='true' and '$(RestoreDefaultOptimizationDataPackage)'=='true' and !Exists('$(OptimizationDataDir)project.csproj')">
     <!-- Dynamically create a project.json file used to restore the optimization data-->
     <PropertyGroup>