From 5388a18c4622bec4936d17569027172cbd037488 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Sun, 29 Sep 2019 12:14:29 +0200
Subject: [PATCH 1/2] Remove old hacks for decompiler csproj

---
 ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj | 6 ++----
 global.json                                          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
index 9f2c10d1b..fe8e13487 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -620,12 +619,11 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
 
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-
   <Target Name="BeforeBuild">
     <PropertyGroup>
       <UpdateAssemblyInfo>powershell -NoProfile -ExecutionPolicy Bypass -File BuildTools/update-assemblyinfo.ps1 $(Configuration)</UpdateAssemblyInfo>
     </PropertyGroup>
     <Exec WorkingDirectory=".." Command="$(UpdateAssemblyInfo)" Timeout="60000" />
   </Target>
+  
 </Project>
\ No newline at end of file
diff --git a/global.json b/global.json
index 6ba836210..6e5ed6274 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
 	"msbuild-sdks": {
-		"MSBuild.Sdk.Extras": "2.0.24"
+		"MSBuild.Sdk.Extras": "2.0.54"
 	},
 	"sdk": {
 		"version": "3.0.100"

From 7de25bc4b59c84f39ec17e7c848ed81ccbfe98e1 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Sun, 29 Sep 2019 12:22:22 +0200
Subject: [PATCH 2/2] Change target name to using BeforeTargets

---
 ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
index fe8e13487..cd5bc932b 100644
--- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
+++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
@@ -619,7 +619,7 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
 
-  <Target Name="BeforeBuild">
+  <Target Name="ILSpyUpdateAssemblyInfo" BeforeTargets="BeforeBuild">
     <PropertyGroup>
       <UpdateAssemblyInfo>powershell -NoProfile -ExecutionPolicy Bypass -File BuildTools/update-assemblyinfo.ps1 $(Configuration)</UpdateAssemblyInfo>
     </PropertyGroup>