VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-10 18:11:04 +09:00
Code Activity

Run IBCMerge on Linux build (dotnet/corefx#36763)

Browse source 
* Restores IBC data for both Linux and Windows on all platforms
* Chooses the right IBC data based on the target OS
* When target OS isn't anything specific (like, e.g. System.Linq and other assemblies that are not OS specific), embeds Windows IBC data

Commit migrated from ef2ee1291e
This commit is contained in:
Michal Strehovský 2019-04-11 14:08:14 +02:00 • committed by GitHub
parent 247837957a
commit 092ef1586a
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eng/codeOptimization.targets
View file

@ -9,6 +9,10 @@
<Target Name="SetApplyNgenOptimization" <Target Name="SetApplyNgenOptimization"
Condition="'$(IsEligibleForNgenOptimization)' == 'true'" Condition="'$(IsEligibleForNgenOptimization)' == 'true'"
BeforeTargets="CoreCompile"> 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> <ItemGroup>
<_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" /> <_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" />
</ItemGroup> </ItemGroup>
@ -17,4 +21,4 @@
</PropertyGroup> </PropertyGroup>
</Target> </Target>
</Project> </Project>

7
src/libraries/external/optimizationData/optimizationData.depproj vendored
View file

@ -3,14 +3,11 @@
<!-- Copy to IBC directory --> <!-- Copy to IBC directory -->
<OutputPath>$(IbcOptimizationDataDir)</OutputPath> <OutputPath>$(IbcOptimizationDataDir)</OutputPath>
<EnableBinPlacing>false</EnableBinPlacing> <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> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- IBC data --> <!-- IBC data -->
<IBCPackage Include="$(CoreFxOptimizationDataPackageId)" Version="$(CoreFxOptimizationDataVersion)" /> <IBCPackage Include="$(WindowsCoreFxOptimizationDataPackageId)" Version="$(WindowsCoreFxOptimizationDataVersion)" />
<IBCPackage Include="$(LinuxCoreFxOptimizationDataPackageId)" Version="$(LinuxCoreFxOptimizationDataVersion)" />
<PackageReference Include="@(IBCPackage)" GeneratePathProperty="true" /> <PackageReference Include="@(IBCPackage)" GeneratePathProperty="true" />
</ItemGroup> </ItemGroup>