diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0ddd2dec71f4..6fa42809e979 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ true - net6.0 + net5.0 enable \ No newline at end of file diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj index 96807dfde2b6..72141f2bd63b 100644 --- a/src/ILLink.Tasks/ILLink.Tasks.csproj +++ b/src/ILLink.Tasks/ILLink.Tasks.csproj @@ -1,8 +1,8 @@  - - - net6.0;net472 + + + net5.0;net472 false MSBuild tasks for running the IL Linker true @@ -35,7 +35,7 @@ - + diff --git a/src/ILLink.Tasks/LinkTask.cs b/src/ILLink.Tasks/LinkTask.cs index 1a8cb848522c..b3f369a0db06 100644 --- a/src/ILLink.Tasks/LinkTask.cs +++ b/src/ILLink.Tasks/LinkTask.cs @@ -248,7 +248,7 @@ public string ILLinkPath { 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), "net6.0", "illink.dll"); + _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net5.0", "illink.dll"); return _illinkPath; } set => _illinkPath = value; diff --git a/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props b/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props index 9742dcea935c..bf9e8ccda233 100644 --- a/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props +++ b/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props @@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved. true - $(MSBuildThisFileDirectory)..\tools\net6.0\ILLink.Tasks.dll + $(MSBuildThisFileDirectory)..\tools\net5.0\ILLink.Tasks.dll $(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll diff --git a/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.targets b/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.targets index 1004e77aeece..3f74821883b8 100644 --- a/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.targets +++ b/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.targets @@ -2,7 +2,7 @@ - $(MSBuildThisFileDirectory)..\tools\net6.0\ILLink.Tasks.dll + $(MSBuildThisFileDirectory)..\tools\net5.0\ILLink.Tasks.dll $(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll diff --git a/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs b/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs index 9fc1bfa2c6a7..98f4d95f97ec 100644 --- a/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs +++ b/test/Mono.Linker.Tests/TestCasesRunner/TestCaseSandbox.cs @@ -16,7 +16,7 @@ public class TestCaseSandbox static NPath GetArtifactsTestPath () { - // Converts paths like /root-folder/linker/artifacts/bin/Mono.Linker.Tests/Debug/net6.0/illink.dll + // Converts paths like /root-folder/linker/artifacts/bin/Mono.Linker.Tests/Debug/net5.0/illink.dll // to /root-folder/linker/artifacts/testcases/ string artifacts = Path.GetFullPath (Path.Combine (Path.GetDirectoryName (_linkerAssemblyPath), "..", "..", "..", "..")); string tests = Path.Combine (artifacts, "testcases");