From ae9ddaf12b93029d54ca6793ba7d893cc4797224 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 24 Apr 2020 11:17:25 -0700 Subject: [PATCH] Pick up renamed Microsoft.NET.ILLink.Tasks package (#35214) --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- eng/illink.targets | 6 +++--- .../CreateRuntimeRootILLinkDescriptorFile.targets | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c03059..8b31e5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -170,9 +170,9 @@ https://github.com/dotnet/runtime 0375524a91a47ca4db3ee1be548f74bab7e26e76 - + https://github.com/mono/linker - 8caef57d1f3bc7a188e5dd26d43a2d34151223f9 + 7573e99c7665f565fe4a6ac4784d5c641213d5e1 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 4874549..fd67c6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,7 +122,7 @@ 3.1.0-preview-20200129.1 - 5.0.0-preview.3.20210.1 + 5.0.0-preview.3.20220.1 6.0.1-alpha.1.20206.1 6.0.1-alpha.1.20206.1 diff --git a/eng/illink.targets b/eng/illink.targets index cecc5c2..ac7db3b 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -8,8 +8,8 @@ - - $([MSBuild]::NormalizeDirectory('$(PkgILLink_Tasks)', 'tools')) + $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NET_ILLink_Tasks)', 'tools')) $(ILLinkTasksDir)netcoreapp3.0/ILLink.Tasks.dll $(ILLinkTasksDir)$(NetFrameworkCurrent)/ILLink.Tasks.dll $(IntermediateOutputPath)$(TargetName)$(TargetExt) diff --git a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets index d06367c..a40473e 100644 --- a/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +++ b/src/coreclr/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets @@ -11,7 +11,7 @@ <_CortypeFilePath Condition=" '$(_CortypeFilePath)' == '' ">$(MSBuildThisFileDirectory)..\inc\cortypeinfo.h <_RexcepFilePath Condition=" '$(_RexcepFilePath)' == '' ">$(MSBuildThisFileDirectory)..\vm\rexcep.h <_ILLinkTrimXmlFilePath Condition=" '$(_ILLinkTrimXmlFilePath)' == '' ">$(MSBuildThisFileDirectory)ILLinkTrim.xml - <_ILLinkTasksToolsDir>$(PkgILLink_Tasks)/tools + <_ILLinkTasksToolsDir>$(PkgMicrosoft_NET_ILLink_Tasks)/tools <_ILLinkTasksDir>$(_ILLinkTasksToolsDir)/$(NetFrameworkCurrent)/ <_ILLinkTasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_ILLinkTasksToolsDir)/netcoreapp3.0/ -- 2.7.4