Merge pull request #1728 from icsharpcode/removingcsprojhacks

Removing csproj hacks

ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <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="ILSpyUpdateAssemblyInfo" BeforeTargets="BeforeBuild">
-
-  <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>

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"