From 4b1adcd8af1eb63837355eb09e098fe31211954c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 24 Feb 2021 01:40:59 +0100
Subject: [PATCH 1/2] Fix Sdk folder path in linker.tasks pkg

---
 src/ILLink.Tasks/ILLink.Tasks.csproj | 5 +++--
 src/ILLink.Tasks/sdk/Sdk.props       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj
index 7069d3b1e59c..e824d13ce0ac 100644
--- a/src/ILLink.Tasks/ILLink.Tasks.csproj
+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj
@@ -19,6 +19,7 @@
     <!-- Place linker and cecil alongside ILLink.Tasks in the output, for integration tests. -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Nullable>disable</Nullable>
+    <PackageType>MSBuildSdk</PackageType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,8 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="sdk/Sdk.props" PackagePath="sdk" />
-    <Content Include="build/$(PackageId).props" PackagePath="build" />
+    <Content Include="sdk/Sdk.props" PackagePath="Sdk/" />
+    <Content Include="build/$(PackageId).props" PackagePath="build/" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ILLink.Tasks/sdk/Sdk.props b/src/ILLink.Tasks/sdk/Sdk.props
index b51937a35cb0..503405e65d94 100644
--- a/src/ILLink.Tasks/sdk/Sdk.props
+++ b/src/ILLink.Tasks/sdk/Sdk.props
@@ -11,6 +11,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 -->
 <Project>
 
-  <Import Project="..\build\Microsoft.NET.ILLink.Tasks.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\build\Microsoft.NET.ILLink.Tasks.props" />
 
 </Project>

From eb85b207f45b1e0683fd03b924036d693bbe671a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 24 Feb 2021 02:03:55 +0100
Subject: [PATCH 2/2] Update ILLink.Tasks.csproj

---
 src/ILLink.Tasks/ILLink.Tasks.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ILLink.Tasks/ILLink.Tasks.csproj b/src/ILLink.Tasks/ILLink.Tasks.csproj
index e824d13ce0ac..78ebf92ba5ca 100644
--- a/src/ILLink.Tasks/ILLink.Tasks.csproj
+++ b/src/ILLink.Tasks/ILLink.Tasks.csproj
@@ -19,7 +19,6 @@
     <!-- Place linker and cecil alongside ILLink.Tasks in the output, for integration tests. -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Nullable>disable</Nullable>
-    <PackageType>MSBuildSdk</PackageType>
   </PropertyGroup>
 
   <ItemGroup>