diff options
| author | Logan Bussell <loganbussell@microsoft.com> | 2022-07-27 21:18:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 21:18:40 +0300 |
| commit | f09bacf09ef10b61cf9f19825f8782171a816dab (patch) | |
| tree | dfc96a5e1bfb0e88435ce489aaab727bf3707a9d | |
| parent | 145f0d270f6350bea941fbd947802ad319180ed7 (diff) | |
Update to .NET 7.0 TFM (#2919)
| -rw-r--r-- | Directory.Build.props | 2 | ||||
| -rw-r--r-- | src/ILLink.Tasks/LinkTask.cs | 2 | ||||
| -rw-r--r-- | src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index d37dc0a41..62047707d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ <IsReferenceAssembly Condition="'$(IsReferenceAssembly)' == '' and '$([System.IO.Path]::GetFileName($(MSBuildProjectDirectory)))' == 'ref'">true</IsReferenceAssembly> <DisableImplicitNamespaceImports_DotNet>true</DisableImplicitNamespaceImports_DotNet> <!-- The TFM for the product (linker, task,.. not analyzer, which is netstandard) --> - <NetCoreAppToolCurrent>net6.0</NetCoreAppToolCurrent> + <NetCoreAppToolCurrent>net7.0</NetCoreAppToolCurrent> <!-- The TFM for all the tests - intentionally different since tests may depend on new framework APIs in order to validate linker interaction with them, linker itself doesn't need the new framework typically. --> <NetCoreAppTestsCurrent>net7.0</NetCoreAppTestsCurrent> diff --git a/src/ILLink.Tasks/LinkTask.cs b/src/ILLink.Tasks/LinkTask.cs index 6684b270f..170ef8f7b 100644 --- a/src/ILLink.Tasks/LinkTask.cs +++ b/src/ILLink.Tasks/LinkTask.cs @@ -263,7 +263,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), "net6.0", "illink.dll"); + _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net7.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 924c38b64..f84654386 100644 --- a/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props +++ b/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props @@ -18,7 +18,7 @@ Copyright (c) .NET Foundation. All rights reserved. <!-- Older SDKs used this property as a sentinel instead, to control the import of this file (but not the targets, which were included with the SDK). --> <UsingILLinkTasksSdk>true</UsingILLinkTasksSdk> - <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\ILLink.Tasks.dll</ILLinkTasksAssembly> + <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net7.0\ILLink.Tasks.dll</ILLinkTasksAssembly> <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll</ILLinkTasksAssembly> </PropertyGroup> |