diff options
| author | Sven Boemer <sbomer@gmail.com> | 2017-09-13 03:57:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 03:57:53 +0300 |
| commit | 4c540ae9a9525196390a32c96a1f0bc76e33969a (patch) | |
| tree | 7793f155d9ab2bbca0dd30689c5a7c99bab6bd87 /external | |
| parent | 155a46c0c59fddefc009c2a4affd0fd2b3bac2b3 (diff) | |
Use linker from ILLink.Tasks (#23945)
* Try to use ILLink.Tasks
* Use new linker package without netstandard cecil
* Update illink path based on host environment
Diffstat (limited to 'external')
| -rw-r--r-- | external/ILLink/ILLink.depproj | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/external/ILLink/ILLink.depproj b/external/ILLink/ILLink.depproj index 18808d3e64..2a5ea0be96 100644 --- a/external/ILLink/ILLink.depproj +++ b/external/ILLink/ILLink.depproj @@ -8,21 +8,30 @@ <EnableBinPlacing>false</EnableBinPlacing> <NugetRuntimeIdentifier>$(ToolRuntimeRID)</NugetRuntimeIdentifier> <RidSpecificAssets>true</RidSpecificAssets> + <ILLinkTasksPackageId>illink.tasks</ILLinkTasksPackageId> + <ILLinkTasksPackageVersion>0.1.4-preview-981901</ILLinkTasksPackageVersion> </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.NETCore.ILLink"> - <Version>0.1.9-preview</Version> - <IncludeAssets>Analyzers;Build;ContentFiles;Native;Runtime</IncludeAssets> + <PackageReference Include="$(ILLinkTasksPackageId)"> + <Version>$(ILLinkTasksPackageVersion)</Version> </PackageReference> - <Content Include="illink.runtimeconfig.json"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <Target Name="IncludeAllFiles" + <Target Name="IncludeToolsFiles" AfterTargets="ResolveNuGetPackages"> <ItemGroup> - <ReferenceCopyLocalPaths Include="%(ReferenceCopyLocalPaths.RootDir)%(ReferenceCopyLocalPaths.Directory)\*.*" /> + <ReferenceCopyLocalPaths Include="$(PackagesDir)\$(ILLinkTasksPackageId)\$(ILLinkTasksPackageVersion)\tools\netcoreapp2.0\*.*"> + <NuGetPackageId>$(ILLinkTasksPackageId)</NuGetPackageId> + <NuGetPackageVersion>$(ILLinkTasksPackageVersion)</NuGetPackageVersion> + <SubFolder>/netcoreapp2.0/</SubFolder> + </ReferenceCopyLocalPaths> + </ItemGroup> + <ItemGroup> + <ReferenceCopyLocalPaths Include="$(PackagesDir)\$(ILLinkTasksPackageId)\$(ILLinkTasksPackageVersion)\tools\net46\*.*"> + <NuGetPackageId>$(ILLinkTasksPackageId)</NuGetPackageId> + <NuGetPackageVersion>$(ILLinkTasksPackageVersion)</NuGetPackageVersion> + <SubFolder>/net46/</SubFolder> + </ReferenceCopyLocalPaths> </ItemGroup> </Target> -</Project>
\ No newline at end of file +</Project> |