diff --git a/eng/Versions.props b/eng/Versions.props
index 0c5a74170eda681036590c5aee7b500a67d8081e..634fe53fa48fda26acbce0a38db37714b1cc0710 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -135,9 +135,11 @@
5.0.0
5.0.0
5.0.0
+ 7.0.0
4.9.0
8.0.0-alpha.1.22611.2
6.0.0
+ 7.0.0
4.5.4
4.5.0
8.0.0-alpha.1.22611.2
@@ -172,6 +174,8 @@
1.0.27
17.3.2
$(MicrosoftBuildVersion)
+ $(MicrosoftBuildVersion)
+ $(MicrosoftBuildVersion)
6.2.2
6.2.2
@@ -184,6 +188,8 @@
2.4.2
1.0.0
2.4.5
+ 3.12.0
+ 4.1.0
3.1.2
13.0.1
1.0.2
@@ -210,9 +216,6 @@
0.11.4-alpha.22619.1
0.11.4-alpha.22619.1
-
- 17.0.0-preview-21267-01
- 17.0.0-preview-21267-01
8.0.0-alpha.1.22612.1
diff --git a/src/tools/illink/PATENTS.TXT b/src/tools/illink/PATENTS.TXT
deleted file mode 100644
index a868428bb19ce1548a4bf2e6bea7405856dcc03c..0000000000000000000000000000000000000000
--- a/src/tools/illink/PATENTS.TXT
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Patent Promise for Mono
-
-Microsoft Corporation and its affiliates (“Microsoft”) promise not to
-assert any Applicable Patents against you for making, using, selling,
-offering for sale, importing, or distributing Mono.
-
-If you file, maintain, or voluntarily participate in any claim in a
-lawsuit alleging direct or contributory patent infringement by Mono,
-or inducement of patent infringement by Mono, then your rights under
-this promise will automatically terminate.
-
-This promise is not an assurance that (i) any Applicable Patents are
-valid or enforceable or (ii) Mono does not infringe patents or other
-intellectual property rights of any third party. No rights except
-those expressly stated in this promise are granted, waived or received
-by Microsoft, whether by implication, exhaustion, estoppel or
-otherwise. This is a personal promise directly from Microsoft to you,
-and you agree as a condition of benefitting from it that no Microsoft
-rights are received from suppliers, distributors, or otherwise in
-connection with this promise.
-
-Definitions:
-
-“Mono” means those portions of the software development technology, as
-originally distributed by Xamarin, Inc. or the .NET Foundation under
-the name “Mono,” that implement .NET Framework Functionality, provided
-that such portions at a minimum implement all of the required parts of
-the mandatory provisions of Standard ECMA-335 – Common Language
-Infrastructure (CLI).
-
-“.NET Framework Functionality” means any functionality in Microsoft’s
-.NET Framework as described in Microsoft’s API documentation on
-Microsoft’s MSDN website, including the functionality in
-Windowsbase.dll, but excluding all other functionality in the Windows
-Presentation Foundation component of .NET Framework.
-
-“Applicable Patents” are those patent claims, currently owned by
-Microsoft and acquired in the future, that are necessarily infringed
-by Mono. For clarity, Applicable Patents do not include any patent
-claims that are infringed (x) by any underlying or enabling technology
-that may be used, combined, or distributed in connection with Mono
-(such as hardware, operating systems, or applications that run on
-Mono), (y) only as a consequence of modification of Mono, or (z) only
-by the combination of Mono with third party code.
diff --git a/src/tools/illink/README.md b/src/tools/illink/README.md
index e4a0d374581d07e06ba7c91607f318960fc417f6..66eacd90dbb9cb70dd67a1e22af63a29cd70c576 100644
--- a/src/tools/illink/README.md
+++ b/src/tools/illink/README.md
@@ -1,6 +1,6 @@
# Trimming Tools
-This repository hosts various tools and msbuild tasks which are used when trimming managed applications with .NET 5 and newer.
+This project hosts various tools and msbuild tasks which are used when trimming managed applications with modern .NET.
## IL Trimmer
@@ -22,26 +22,4 @@ The [tlens](src/tlens/README.md) is another tool for developers which can be use
Another tool available for developers is implemented as [Roslyn Analyzer](src/ILLink.RoslynAnalyzer) which runs on source code and warns developers about code patterns and APIs which are problematic when building code which could be used with trimmed apps.
# Contributing
-
-We welcome contributions! Many developers have helped make this project better by reporting [issues](https://github.com/dotnet/linker/issues) or contributing [pull requests](https://github.com/dotnet/linker/pulls).
-
-## How to build all projects
-
-There is a shell script available in the root folder which can build the whole project and much more (build.cmd on Windows).
-
-```sh
-./build.sh
-```
-
-## Running tests from CLI
-
-The same script can be used to run all tests from the terminal. We also have integration into Visual Studio and individual tests or whole test suites can be run within IDE as well.
-
-```sh
-./build.sh -test
-```
-
-
-## CI Build & Test Status
-
-[](https://dev.azure.com/dnceng-public/public/_build/latest?definitionId=105&branchName=main)
+We welcome contributions! Many developers have helped make this project better by reporting [issues](https://github.com/dotnet/runtime/issues) or contributing [pull requests](https://github.com/dotnet/runtime/pulls) and tagging with the label `area-Tools-ILLink`.
diff --git a/src/tools/illink/ilasm.ilproj b/src/tools/illink/ilasm.ilproj
deleted file mode 100644
index b13fc40428b3bb142fc375252dd08a67eaedee02..0000000000000000000000000000000000000000
--- a/src/tools/illink/ilasm.ilproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
- net7.0
-
-
-
-
- ilasm
- ilasm.exe
-
-
-
-
\ No newline at end of file
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Mono.Linker.Tests.Cases.csproj b/src/tools/illink/test/Mono.Linker.Tests.Cases/Mono.Linker.Tests.Cases.csproj
index 7d1c6de28083f9d592d5969222271952061bdfdd..ad7814bc13053e0f55bf087c070af48b402d18d4 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/Mono.Linker.Tests.Cases.csproj
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/Mono.Linker.Tests.Cases.csproj
@@ -68,7 +68,7 @@
-
+
diff --git a/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj b/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj
index 1ac6ba3aa6c7ac99ed39058a3864b64f6c67b531..e30470d7f8e624415a132759832125525b2c56cb 100644
--- a/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj
+++ b/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj
@@ -2,7 +2,6 @@
true
- $(DefineConstants);DEBUG
@@ -18,30 +17,25 @@
-
-
+
+
-
+
-
-
-
- $(MSBuildThisFileDirectory)../../ilasm.ilproj
-
-
-
-
-
+
+
+
+
@@ -57,6 +51,9 @@
$(ArtifactsDir)
+
+ $(CoreCLRArtifactsPath)
+
$(ArtifactsBinDir)
diff --git a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILCompiler.cs b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILCompiler.cs
index 02bb2edbbaa4f6c11070476bd0006f57767bf6d9..7b5835d2b0fc4fa13ff7da6c3a2b294f7d00ba71 100644
--- a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILCompiler.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ILCompiler.cs
@@ -65,9 +65,9 @@ protected virtual NPath LocateIlasm ()
#if NETCOREAPP
var extension = RuntimeInformation.IsOSPlatform (OSPlatform.Windows) ? ".exe" : "";
- var toolsDir = Path.Combine((string)AppContext.GetData("Mono.Linker.Tests.ArtifactsDir")!, "tools");
+ var toolsDir = (string)AppContext.GetData("Mono.Linker.Tests.ILToolsDir")!;
- var ilasmPath = Path.GetFullPath (Path.Combine (toolsDir, "ilasm", $"ilasm{extension}")).ToNPath ();
+ var ilasmPath = Path.GetFullPath (Path.Combine (toolsDir, $"ilasm{extension}")).ToNPath ();
if (ilasmPath.FileExists ())
return ilasmPath;