diff options
| author | Vitek Karas <vitek.karas@microsoft.com> | 2021-08-11 13:30:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 13:30:32 +0300 |
| commit | 7bf5cd4505d6c36f6c33984789e2a23b8837b6f1 (patch) | |
| tree | 774e7c059753c359af61313e532aeb4c7e4f3301 | |
| parent | d8b94bd244f9239ef394817e2bd9a37ec1bae838 (diff) | |
Target net6.0 for linker (#2202)
| -rw-r--r-- | src/Directory.Build.props | 2 | ||||
| -rw-r--r-- | src/ILLink.Tasks/ILLink.Tasks.csproj | 8 | ||||
| -rw-r--r-- | src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6fa42809e..0ddd2dec7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ <PropertyGroup> <RunAnalyzers>true</RunAnalyzers> - <TargetFramework>net5.0</TargetFramework> + <TargetFramework>net6.0</TargetFramework> <Nullable>enable</Nullable> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj index 414e98576..61888771f 100644 --- a/src/ILLink.Tasks/ILLink.Tasks.csproj +++ b/src/ILLink.Tasks/ILLink.Tasks.csproj @@ -1,8 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <!-- Keep these in sync with _ILLinkTasksTFM in Sdk.props. --> - <!-- Keep the netcoreapp TFM in sync with the Mono.Linker.csproj condition below. --> - <TargetFrameworks>net5.0;net472</TargetFrameworks> + <!-- 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. --> + <TargetFrameworks>net6.0;net472</TargetFrameworks> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Description>MSBuild tasks for running the IL Linker</Description> <IsPackable>true</IsPackable> @@ -35,7 +35,7 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="../linker/Mono.Linker.csproj" PrivateAssets="All" Condition=" '$(TargetFramework)' == 'net5.0' " /> + <ProjectReference Include="../linker/Mono.Linker.csproj" PrivateAssets="All" Condition=" '$(TargetFramework)' == 'net6.0' " /> <PackageReference Condition="'$(UseCecilPackage)' == 'true'" Include="Mono.Cecil" Version="$(MonoCecilVersion)" PrivateAssets="All" Publish="True" /> <ProjectReference Condition="'$(UseCecilPackage)' != 'true'" Include="../../external/cecil/Mono.Cecil.csproj" PrivateAssets="All"> <!-- https://github.com/dotnet/sdk/issues/2280#issuecomment-392815466 --> diff --git a/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props b/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props index bf9e8ccda..9742dcea9 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. <PropertyGroup> <UsingILLinkTasksSdk>true</UsingILLinkTasksSdk> - <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\ILLink.Tasks.dll</ILLinkTasksAssembly> + <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\ILLink.Tasks.dll</ILLinkTasksAssembly> <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll</ILLinkTasksAssembly> </PropertyGroup> |