diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 413207fe677c4c..8bce5003baaef1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ https://github.com/dotnet/standard cfe95a23647c7de1fe1a349343115bd7720d6949 - + https://github.com/mono/linker - cbdda5a2a6fbf01f74581aa956ef2e7b03b96977 + e5d6b69677dfc0da19c5b2c96b3466e8d5016327 diff --git a/eng/Versions.props b/eng/Versions.props index c8a49752b09d82..6efea8ac7f7424 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,7 +122,7 @@ 3.0.0-preview9-190909-1 - 0.1.6-prerelease.19567.1 + 0.1.6-prerelease.20114.2 6.0.1-alpha.1.20078.4 6.0.1-alpha.1.20078.4 diff --git a/eng/illink.targets b/eng/illink.targets index 59960f31aa19a7..ae2de5625865b8 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -10,7 +10,7 @@ $([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools')) - $(ILLinkTasksDir)netcoreapp2.0/ILLink.Tasks.dll + $(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll $(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll $(IntermediateOutputPath)$(TargetName)$(TargetExt) $(IntermediateOutputPath)$(TargetName).pdb @@ -83,6 +83,8 @@ $(ILLinkArgs) --skip-unresolved true $(ILLinkArgs) --disable-opt unusedinterfaces + + $(ILLinkArgs) --disable-opt ipconstprop $(ILLinkArgs) --keep-dep-attributes true diff --git a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets index f64d3894770427..d06367c480c6f3 100644 --- a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +++ b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets @@ -13,7 +13,7 @@ <_ILLinkTrimXmlFilePath Condition=" '$(_ILLinkTrimXmlFilePath)' == '' ">$(MSBuildThisFileDirectory)ILLinkTrim.xml <_ILLinkTasksToolsDir>$(PkgILLink_Tasks)/tools <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/ - <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp2.0/ + <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/