From 04915a6937c48cb07cd6293e081012d16160b596 Mon Sep 17 00:00:00 2001
From: 0xd4d <de4dot@gmail.com>
Date: Wed, 11 Nov 2020 17:15:52 +0100
Subject: [PATCH] Use .NET 5.0 SDK and net5.0-windows tfm

---
 .github/workflows/build.yml                      |  4 ++--
 DnSpyCommon.props                                | 16 ++++++++--------
 .../ILSpy.Decompiler/ICSharpCode.Decompiler      |  2 +-
 Extensions/ILSpy.Decompiler/NRefactory           |  2 +-
 Extensions/dnSpy.Debugger/Mono.Debugger.Soft     |  2 +-
 Libraries/ICSharpCode.TreeView                   |  2 +-
 build.ps1                                        |  2 +-
 dnSpy/dnSpy-x86/dnSpy-x86.csproj                 |  3 +--
 dnSpy/dnSpy/dnSpy.csproj                         |  4 ++--
 global.json                                      |  2 +-
 10 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df909c585..35923885b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
           $env:PATH = $msbuildPath + ';' + $env:PATH
           .\build.ps1 core-x86
           New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
-          Compress-Archive -Path dnSpy\dnSpy\bin\Release\netcoreapp3.1\win-x86\publish\* -DestinationPath C:\builtfiles\dnSpy-netcore-win32.zip
+          Compress-Archive -Path dnSpy\dnSpy\bin\Release\net5.0-windows\win-x86\publish\* -DestinationPath C:\builtfiles\dnSpy-netcore-win32.zip
           .\clean-all.cmd
 
       - name: Build dnSpy (.NET Core x64)
@@ -53,7 +53,7 @@ jobs:
           $env:PATH = $msbuildPath + ';' + $env:PATH
           .\build.ps1 core-x64
           New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
-          Compress-Archive -Path dnSpy\dnSpy\bin\Release\netcoreapp3.1\win-x64\publish\* -DestinationPath C:\builtfiles\dnSpy-netcore-win64.zip
+          Compress-Archive -Path dnSpy\dnSpy\bin\Release\net5.0-windows\win-x64\publish\* -DestinationPath C:\builtfiles\dnSpy-netcore-win64.zip
           .\clean-all.cmd
 
       - uses: actions/upload-artifact@v2
diff --git a/DnSpyCommon.props b/DnSpyCommon.props
index 8ed018953..b1407ac13 100644
--- a/DnSpyCommon.props
+++ b/DnSpyCommon.props
@@ -5,20 +5,20 @@
         - build.ps1
         - .github/workflows/build.yml
     NOTE: Update the ABOVE files when TargetFrameworks is updated -->
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
     <IsDotNetFramework>false</IsDotNetFramework>
-    <IsDotNetCore>false</IsDotNetCore>
-    <IsSelfContainedDotNetCore>false</IsSelfContainedDotNetCore>
-    <IsDotNetFramework Condition=" !$(TargetFramework.StartsWith(netcoreapp)) ">true</IsDotNetFramework>
-    <IsDotNetCore Condition=" $(TargetFramework.StartsWith(netcoreapp)) ">true</IsDotNetCore>
-    <IsSelfContainedDotNetCore Condition=" '$(IsDotNetCore)' == 'true' ">true</IsSelfContainedDotNetCore>
+    <IsDotNet>false</IsDotNet>
+    <IsSelfContainedDotNet>false</IsSelfContainedDotNet>
+    <IsDotNetFramework Condition=" $(TargetFramework.StartsWith(net4)) ">true</IsDotNetFramework>
+    <IsDotNet Condition=" !$(TargetFramework.StartsWith(net4)) ">false</IsDotNet>
+    <IsSelfContainedDotNet Condition=" '$(IsDotNet)' == 'true' ">true</IsSelfContainedDotNet>
     <Features>strict;nullablePublicOnly</Features>
     <LangVersion>8.0</LangVersion>
     <LangVersion Condition=" $(MSBuildProjectFile.EndsWith('.vbproj')) " >latest</LangVersion>
     <NeutralLanguage>en</NeutralLanguage>
     <AppDesignerFolderContentsVisibleOnlyInShowAllFiles>false</AppDesignerFolderContentsVisibleOnlyInShowAllFiles>
     <!-- Make sure we don't have to publish each extension to get all their refs -->
-    <CopyLocalLockFileAssemblies Condition=" '$(IsDotNetCore)' == 'true' ">true</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies Condition=" '$(IsDotNet)' == 'true' ">true</CopyLocalLockFileAssemblies>
     <!-- If this gets updated, also update .github/workflows/build.yml and build.ps1 -->
     <DnSpyRuntimeIdentifiers>win-x86;win-x64</DnSpyRuntimeIdentifiers>
     <SatelliteResourceLanguages>cs;de;es;es-ES;fa;fr;hu;it;pt-BR;pt-PT;ru;tr;uk;zh-CN</SatelliteResourceLanguages>
@@ -48,7 +48,7 @@
     <SCCompositionVersion>4.6.0</SCCompositionVersion>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)Build\ConvertToNetstandardReferences\ConvertToNetstandardReferences.tasks" Condition=" '$(IsDotNetCore)' == 'true' " />
+  <Import Project="$(MSBuildThisFileDirectory)Build\ConvertToNetstandardReferences\ConvertToNetstandardReferences.tasks" Condition=" '$(IsDotNet)' == 'true' " />
 
   <!-- .NET Core 3.0 SDK doesn't currently support COMReference: https://github.com/dnSpy/dnSpy/issues/1053 -->
   <PropertyGroup>
diff --git a/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler b/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler
index 97ea1d816..3fa5701e6 160000
--- a/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler
+++ b/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler
@@ -1 +1 @@
-Subproject commit 97ea1d816cfc9a277716a3bb85f1b9aa2c827b2a
+Subproject commit 3fa5701e6e4056735b13a6c1b32bd6ec9e36c43c
diff --git a/Extensions/ILSpy.Decompiler/NRefactory b/Extensions/ILSpy.Decompiler/NRefactory
index 5bd78d261..79d99d6fc 160000
--- a/Extensions/ILSpy.Decompiler/NRefactory
+++ b/Extensions/ILSpy.Decompiler/NRefactory
@@ -1 +1 @@
-Subproject commit 5bd78d261161772567e859c9bdd3b15580562069
+Subproject commit 79d99d6fc3ff5b2c95ffa4861f0294a6c6b894c6
diff --git a/Extensions/dnSpy.Debugger/Mono.Debugger.Soft b/Extensions/dnSpy.Debugger/Mono.Debugger.Soft
index fcf8e6fa1..2b98df22e 160000
--- a/Extensions/dnSpy.Debugger/Mono.Debugger.Soft
+++ b/Extensions/dnSpy.Debugger/Mono.Debugger.Soft
@@ -1 +1 @@
-Subproject commit fcf8e6fa19c8e153e6a97c486848056e6cf49b60
+Subproject commit 2b98df22e811bf1311c05b6df519bd0389a7ee7e
diff --git a/Libraries/ICSharpCode.TreeView b/Libraries/ICSharpCode.TreeView
index 976e8a786..dd6e2ae10 160000
--- a/Libraries/ICSharpCode.TreeView
+++ b/Libraries/ICSharpCode.TreeView
@@ -1 +1 @@
-Subproject commit 976e8a786a8c42e11fe26ae81f0984a3b8b7997c
+Subproject commit dd6e2ae107b7756dda894f5d1bf47e45fd401144
diff --git a/build.ps1 b/build.ps1
index ae1d7b4ca..a6d715a9b 100644
--- a/build.ps1
+++ b/build.ps1
@@ -2,7 +2,7 @@ param([string]$buildtfm = 'all', [switch]$NoMsbuild)
 $ErrorActionPreference = 'Stop'
 
 $net_tfm = 'net48'
-$netcore_tfm = 'netcoreapp3.1'
+$netcore_tfm = 'net5.0-windows'
 $configuration = 'Release'
 $net_baseoutput = "dnSpy\dnSpy\bin\$configuration"
 $apphostpatcher_dir = "Build\AppHostPatcher"
diff --git a/dnSpy/dnSpy-x86/dnSpy-x86.csproj b/dnSpy/dnSpy-x86/dnSpy-x86.csproj
index 370d5ad09..634d72cae 100644
--- a/dnSpy/dnSpy-x86/dnSpy-x86.csproj
+++ b/dnSpy/dnSpy-x86/dnSpy-x86.csproj
@@ -10,8 +10,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\dnSpy.snk</AssemblyOriginatorKeyFile>
     <Nullable>enable</Nullable>
-    <!-- If it's .NET Core, we can only use 32-bit only or 64-bit only exes. dnSpy-x86 isn't needed. -->
-    <OutputPath Condition=" '$(IsDotNetCore)' != 'true' ">..\dnSpy\bin\$(Configuration)\</OutputPath>
+    <OutputPath Condition=" '$(IsDotNetFramework)' == 'true' ">..\dnSpy\bin\$(Configuration)\</OutputPath>
 
     <RuntimeIdentifiers>$(DnSpyRuntimeIdentifiers)</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
diff --git a/dnSpy/dnSpy/dnSpy.csproj b/dnSpy/dnSpy/dnSpy.csproj
index be4d284a2..69382751e 100644
--- a/dnSpy/dnSpy/dnSpy.csproj
+++ b/dnSpy/dnSpy/dnSpy.csproj
@@ -94,8 +94,8 @@
     <PackageReference Include="Iced" Version="$(IcedVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Composition" Version="$(MSVSCompositionVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MSVSIntellisenseVersion)" />
-    <!-- Self contained .NET Core apps already ship with this DLL (not necessarily the same version, though) -->
-    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(DiaSymReaderVersion)" Condition=" '$(IsSelfContainedDotNetCore)' != 'true' " />
+    <!-- Self contained .NET apps already ship with this DLL (not necessarily the same version, though) -->
+    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(DiaSymReaderVersion)" Condition=" '$(IsSelfContainedDotNet)' != 'true' " />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MSVSTextVersion)" />
   </ItemGroup>
 
diff --git a/global.json b/global.json
index 14afd189a..208bc74fb 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.200",
+    "version": "5.0.100",
     "rollForward": "latestMinor"
   }
 }