Merge pull request dotnet/corefx#25956 from erozenfeld/UpdateILLinkVe…

…rsion Update ILLink version. Commit migrated from dotnet/corefx@c7d4e25
picenka21 · Dec 21, 2017 · 035786b · 035786b
2 parents 7886be0 + d5c0af2
commit 035786b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/libraries/external/ILLink/ILLink.depproj b/src/libraries/external/ILLink/ILLink.depproj
@@ -9,7 +9,7 @@
     <NugetRuntimeIdentifier>$(ToolRuntimeRID)</NugetRuntimeIdentifier>
     <RidSpecificAssets>true</RidSpecificAssets>
     <ILLinkTasksPackageId>illink.tasks</ILLinkTasksPackageId>
-    <ILLinkTasksPackageVersion>0.1.4-preview-981901</ILLinkTasksPackageVersion>
+    <ILLinkTasksPackageVersion>0.1.4-preview-1222833</ILLinkTasksPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="$(ILLinkTasksPackageId)">

diff --git a/src/libraries/illink.targets b/src/libraries/illink.targets
@@ -71,6 +71,8 @@
       <ILLinkArgs>$(ILLinkArgs) -v true</ILLinkArgs>
       <!-- reflection heuristics to apply -->
       <ILLinkArgs>$(ILLinkArgs) -h LdtokenTypeMethods,InstanceConstructors</ILLinkArgs>
+      <!-- add a linker step to clear initlocals flag on all assemblies before the output step -->
+      <ILLinkArgs Condition="'$(ILLinkClearInitLocals)' == 'true'">$(ILLinkArgs) -s ILLink.CustomSteps.ClearInitLocalsStep,ILLink.CustomSteps:OutputStep</ILLinkArgs>
     </PropertyGroup>
 
     <MakeDir Directories="$(ILLinkTrimInputPath)" />