Skip to content

Commit 736ac8a

Browse files
authored
Fix wrong path after the TFM change (dotnet/linker#2204)
Commit migrated from dotnet/linker@272bd6d
1 parent 7819670 commit 736ac8a

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<!-- Keep these in sync with ILLinkTasksAssembly in Microsoft.NET.ILLInk.Tasks.props. -->
44
<!-- Keep the net#.0 TFM in sync with the Mono.Linker.csproj condition below. -->
5+
<!-- Keep the net#.0 TFM in sync with the code in LinkTask.cs in method ILLink.ILLinkPath. -->
56
<TargetFrameworks>net6.0;net472</TargetFrameworks>
67
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
78
<Description>MSBuild tasks for running the IL Linker</Description>

src/tools/illink/src/ILLink.Tasks/LinkTask.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public string ILLinkPath {
253253

254254
var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
255255
// The linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks.
256-
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net5.0", "illink.dll");
256+
_illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net6.0", "illink.dll");
257257
return _illinkPath;
258258
}
259259
set => _illinkPath = value;

src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class TestCaseSandbox
1616

1717
static NPath GetArtifactsTestPath ()
1818
{
19-
// Converts paths like /root-folder/linker/artifacts/bin/Mono.Linker.Tests/Debug/net5.0/illink.dll
19+
// Converts paths like /root-folder/linker/artifacts/bin/Mono.Linker.Tests/Debug/net6.0/illink.dll
2020
// to /root-folder/linker/artifacts/testcases/
2121
string artifacts = Path.GetFullPath (Path.Combine (Path.GetDirectoryName (_linkerAssemblyPath), "..", "..", "..", ".."));
2222
string tests = Path.Combine (artifacts, "testcases");

0 commit comments

Comments
 (0)