From 5bf0a3f4b30814c65faa380bff83fdc105ef9323 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Sun, 13 Jun 2021 22:37:21 -0700
Subject: [PATCH] Fix ILVerify dependencies (#54112)

- Update ILVerify to build for NetCoreAppToolCurrent
---
 src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj | 10 +++++-----
 src/coreclr/tools/ILVerify/ILVerify.csproj                 |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj b/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj
index 3fcc2d5..5b808c6 100644
--- a/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj
+++ b/src/coreclr/.nuget/dotnet-ilverify/dotnet-ilverify.pkgproj
@@ -13,19 +13,19 @@
 
   <ItemGroup>
     <PackageFile Include="DotnetToolSettings.xml">
-       <TargetPath>tools\netcoreapp3.1\any\DotnetToolSettings.xml</TargetPath>
+       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\DotnetToolSettings.xml</TargetPath>
     </PackageFile>
     <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\ILVerify.dll">
-       <TargetPath>tools\netcoreapp3.1\any\ILVerify.dll</TargetPath>
+       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\ILVerify.dll</TargetPath>
     </PackageFile>
     <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\System.CommandLine.dll">
-       <TargetPath>tools\netcoreapp3.1\any\System.CommandLine.dll</TargetPath>
+       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\System.CommandLine.dll</TargetPath>
     </PackageFile>
     <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\ILVerify.deps.json">
-       <TargetPath>tools\netcoreapp3.1\any\ILVerify.deps.json</TargetPath>
+       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\ILVerify.deps.json</TargetPath>
     </PackageFile>
     <PackageFile Include="$(ArtifactsDir)bin\ILVerify\$(TargetArchitecture)\$(Configuration)\ILVerify.runtimeconfig.json">
-       <TargetPath>tools\netcoreapp3.1\any\ILVerify.runtimeconfig.json</TargetPath>
+       <TargetPath>tools\$(NetCoreAppToolCurrent)\any\ILVerify.runtimeconfig.json</TargetPath>
     </PackageFile>
   </ItemGroup>
 
diff --git a/src/coreclr/tools/ILVerify/ILVerify.csproj b/src/coreclr/tools/ILVerify/ILVerify.csproj
index 606b4ea..28f18b5 100644
--- a/src/coreclr/tools/ILVerify/ILVerify.csproj
+++ b/src/coreclr/tools/ILVerify/ILVerify.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <UseAppHost>false</UseAppHost>
     <RollForward>Major</RollForward>
-- 
2.7.4