Skip to content

Commit a0ae661

Browse files
authored
Update ILLinkTasksVersion dependency (#32170)
* Revert "Revert "Update ILLinkTasksVersion dependency (#2334)" (#31807)" This reverts commit 334391b. * Update ILLink version * Update ILLink task netcore execution version * Another version update
1 parent 8d386b4 commit a0ae661

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<Uri>https://github.com/dotnet/standard</Uri>
3737
<Sha>cfe95a23647c7de1fe1a349343115bd7720d6949</Sha>
3838
</Dependency>
39-
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.19567.1">
39+
<Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20114.2">
4040
<Uri>https://github.com/mono/linker</Uri>
41-
<Sha>cbdda5a2a6fbf01f74581aa956ef2e7b03b96977</Sha>
41+
<Sha>e5d6b69677dfc0da19c5b2c96b3466e8d5016327</Sha>
4242
</Dependency>
4343
</ProductDependencies>
4444
<ToolsetDependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<!-- Docs -->
125125
<MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
126126
<!-- ILLink -->
127-
<ILLinkTasksVersion>0.1.6-prerelease.19567.1</ILLinkTasksVersion>
127+
<ILLinkTasksVersion>0.1.6-prerelease.20114.2</ILLinkTasksVersion>
128128
<!-- Mono LLVM -->
129129
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
130130
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>6.0.1-alpha.1.20078.4</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

eng/illink.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!-- Inputs and outputs of ILLinkTrimAssembly -->
1111
<PropertyGroup>
1212
<ILLinkTasksDir>$([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools'))</ILLinkTasksDir>
13-
<ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' == 'core'">$(ILLinkTasksDir)netcoreapp2.0/ILLink.Tasks.dll</ILLinkTasksPath>
13+
<ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' == 'core'">$(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll</ILLinkTasksPath>
1414
<ILLinkTasksPath Condition="'$(ILLinkTasksPath)' == '' and '$(MSBuildRuntimeType)' != 'core'">$(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll</ILLinkTasksPath>
1515
<ILLinkTrimAssemblyPath>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</ILLinkTrimAssemblyPath>
1616
<ILLinkTrimAssemblySymbols>$(IntermediateOutputPath)$(TargetName).pdb</ILLinkTrimAssemblySymbols>
@@ -83,6 +83,8 @@
8383
<ILLinkArgs>$(ILLinkArgs) --skip-unresolved true</ILLinkArgs>
8484
<!-- keep interface implementations -->
8585
<ILLinkArgs>$(ILLinkArgs) --disable-opt unusedinterfaces</ILLinkArgs>
86+
<!-- disable optimization to unblock dependencies bump -->
87+
<ILLinkArgs>$(ILLinkArgs) --disable-opt ipconstprop</ILLinkArgs>
8688
<!-- keep PreserveDependencyAttribute unless a project explicitly disables it -->
8789
<ILLinkArgs Condition="'$(ILLinkKeepDepAttributes)' != 'false'">$(ILLinkArgs) --keep-dep-attributes true</ILLinkArgs>
8890
</PropertyGroup>

src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<_ILLinkTrimXmlFilePath Condition=" '$(_ILLinkTrimXmlFilePath)' == '' ">$(MSBuildThisFileDirectory)ILLinkTrim.xml</_ILLinkTrimXmlFilePath>
1414
<_ILLinkTasksToolsDir>$(PkgILLink_Tasks)/tools</_ILLinkTasksToolsDir>
1515
<_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/</_ILLinkTasksDir>
16-
<_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp2.0/</_ILLinkTasksDir>
16+
<_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/</_ILLinkTasksDir>
1717
</PropertyGroup>
1818

1919
<!--

0 commit comments

Comments
 (0)