diff options
| author | Vitek Karas <vitek.karas@microsoft.com> | 2021-08-11 18:35:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 18:35:24 +0300 |
| commit | 272bd6d4d1e0da69b1b779c40d2927a0141a5bc8 (patch) | |
| tree | e8b2911e2674c4c084118207ee39d5c6d9677c62 | |
| parent | 7bf5cd4505d6c36f6c33984789e2a23b8837b6f1 (diff) | |
Fix wrong path after the TFM change (#2204)
| -rw-r--r-- | src/ILLink.Tasks/ILLink.Tasks.csproj | 1 | ||||
| -rw-r--r-- | src/ILLink.Tasks/LinkTask.cs | 2 | ||||
| -rw-r--r-- | test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj index 61888771f..0ecf5d15c 100644 --- a/src/ILLink.Tasks/ILLink.Tasks.csproj +++ b/src/ILLink.Tasks/ILLink.Tasks.csproj @@ -2,6 +2,7 @@ <PropertyGroup> <!-- Keep these in sync with ILLinkTasksAssembly in Microsoft.NET.ILLInk.Tasks.props. --> <!-- Keep the net#.0 TFM in sync with the Mono.Linker.csproj condition below. --> + <!-- Keep the net#.0 TFM in sync with the code in LinkTask.cs in method ILLink.ILLinkPath. --> <TargetFrameworks>net6.0;net472</TargetFrameworks> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Description>MSBuild tasks for running the IL Linker</Description> diff --git a/src/ILLink.Tasks/LinkTask.cs b/src/ILLink.Tasks/LinkTask.cs index 20adaf035..93dfe755a 100644 --- a/src/ILLink.Tasks/LinkTask.cs +++ b/src/ILLink.Tasks/LinkTask.cs @@ -253,7 +253,7 @@ namespace ILLink.Tasks var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location); // The linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks. - _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net5.0", "illink.dll"); + _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net6.0", "illink.dll"); return _illinkPath; } set => _illinkPath = value; diff --git a/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs b/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs index 98f4d95f9..9fc1bfa2c 100644 --- a/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs +++ b/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs @@ -16,7 +16,7 @@ namespace Mono.Linker.Tests.TestCasesRunner static NPath GetArtifactsTestPath () { - // Converts paths like /root-folder/linker/artifacts/bin/Mono.Linker.Tests/Debug/net5.0/illink.dll + // Converts paths like /root-folder/linker/artifacts/bin/Mono.Linker.Tests/Debug/net6.0/illink.dll // to /root-folder/linker/artifacts/testcases/ string artifacts = Path.GetFullPath (Path.Combine (Path.GetDirectoryName (_linkerAssemblyPath), "..", "..", "..", "..")); string tests = Path.Combine (artifacts, "testcases"); |