diff --git a/eng/packaging.targets b/eng/packaging.targets index ea2f143ec498d..a36102a37acd5 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -274,9 +274,10 @@ - + - - - - - $(ToolsILLinkDir)$(NetCoreAppToolCurrent)/ILLink.Tasks.dll - - true true diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template index bec1429a03f3d..3916d05f77086 100644 --- a/eng/testing/linker/project.csproj.template +++ b/eng/testing/linker/project.csproj.template @@ -1,4 +1,4 @@ - + @@ -6,7 +6,15 @@ {ToolsILLinkDir} - + + + + + $(ToolsILLinkDir)$(NetCoreAppToolCurrent)/ILLink.Tasks.dll + {TargetFramework} @@ -84,6 +92,4 @@ - - diff --git a/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj index 9cd6c8810b661..1199101f63825 100644 --- a/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj +++ b/src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj @@ -26,6 +26,20 @@ false + + + + + + + + diff --git a/src/tools/illink/src/linker/Mono.Linker.csproj b/src/tools/illink/src/linker/Mono.Linker.csproj index 16e5cf9b988b2..e5cdbb86c5eb7 100644 --- a/src/tools/illink/src/linker/Mono.Linker.csproj +++ b/src/tools/illink/src/linker/Mono.Linker.csproj @@ -24,6 +24,43 @@ $(DefineConstants);ILLINK + + + $([System.IO.Path]::ChangeExtension($(ProjectRuntimeConfigFilePath), pack.json)) + + + + + + + <_RuntimeConfigContents>$([System.IO.File]::ReadAllText('$(ProjectRuntimeConfigFilePath)')) + "version": ".*" + "version": "$(Version)" + <_NewRuntimeConfigContents>$([System.Text.RegularExpressions.Regex]::Replace($(_RuntimeConfigContents), $(ReplacementPattern), $(ReplacementString))) + + + + + + + + + + + +