diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
index 03fef417a..565e82614 100644
--- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
+++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
-
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
     <AssemblyName>ILSpy.BamlDecompiler.Plugin</AssemblyName>
     <LangVersion>8.0</LangVersion>
-
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-
-    <EnableDefaultItems>false</EnableDefaultItems>
-
     <BaseAddress>6488064</BaseAddress>
+    <UseWpf>true</UseWpf>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -29,12 +24,6 @@
     <OutputPath>..\ILSpy\bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
   <Import Project="..\packages.props" />
 
   <ItemGroup>
@@ -43,93 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\ILSpy\ILSpy.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="BamlElement.cs" />
-    <Compile Include="BamlResourceNodeFactory.cs" />
-    <Compile Include="BamlResourceEntryNode.cs" />
-    <Compile Include="Baml\BamlContext.cs" />
-    <Compile Include="Baml\BamlDocument.cs" />
-    <Compile Include="Baml\BamlNode.cs" />
-    <Compile Include="Baml\BamlReader.cs" />
-    <Compile Include="Baml\BamlRecords.cs" />
-    <Compile Include="Baml\BamlWriter.cs" />
-    <Compile Include="Baml\KnownMembers.cs" />
-    <Compile Include="Baml\KnownThings.cs" />
-    <Compile Include="Baml\KnownThings.g.cs" />
-    <Compile Include="Baml\KnownTypes.cs" />
-    <Compile Include="BamlConnectionId.cs" />
-    <Compile Include="Handlers\Blocks\ConstructorParametersHandler.cs" />
-    <Compile Include="Handlers\Blocks\DocumentHandler.cs" />
-    <Compile Include="Handlers\Blocks\ElementHandler.cs" />
-    <Compile Include="Handlers\Blocks\KeyElementStartHandler.cs" />
-    <Compile Include="Handlers\Blocks\PropertyArrayHandler.cs" />
-    <Compile Include="Handlers\Blocks\PropertyComplexHandler.cs" />
-    <Compile Include="Handlers\Blocks\PropertyDictionaryHandler.cs" />
-    <Compile Include="Handlers\Blocks\PropertyListHandler.cs" />
-    <Compile Include="Handlers\Records\AssemblyInfoHandler.cs" />
-    <Compile Include="Handlers\Records\AttributeInfoHandler.cs" />
-    <Compile Include="Handlers\Records\ConnectionIdHandler.cs" />
-    <Compile Include="Handlers\Records\ConstructorParameterTypeHandler.cs" />
-    <Compile Include="Handlers\Records\ContentPropertyHandler.cs" />
-    <Compile Include="Handlers\Records\DefAttributeHandler.cs" />
-    <Compile Include="Handlers\Records\DefAttributeKeyStringHandler.cs" />
-    <Compile Include="Handlers\Records\DefAttributeKeyTypeHandler.cs" />
-    <Compile Include="Handlers\Records\DeferableContentStartHandler.cs" />
-    <Compile Include="Handlers\Records\LineNumberAndPositionHandler.cs" />
-    <Compile Include="Handlers\Records\LinePositionHandler.cs" />
-    <Compile Include="Handlers\Records\LiteralContentHandler.cs" />
-    <Compile Include="Handlers\Records\OptimizedStaticResourceHandler.cs" />
-    <Compile Include="Handlers\Records\PIMappingHandler.cs" />
-    <Compile Include="Handlers\Records\PresentationOptionsAttributeHandler.cs" />
-    <Compile Include="Handlers\Records\PropertyCustomHandler.cs" />
-    <Compile Include="Handlers\Records\PropertyHandler.cs" />
-    <Compile Include="Handlers\Records\PropertyTypeReferenceHandler.cs" />
-    <Compile Include="Handlers\Records\PropertyWithConverterHandler.cs" />
-    <Compile Include="Handlers\Records\PropertyWithExtensionHandler.cs" />
-    <Compile Include="Handlers\Records\PropertyWithStaticResourceIdHandler.cs" />
-    <Compile Include="Handlers\Records\StaticResourceStartHandler.cs" />
-    <Compile Include="Handlers\Records\StaticResourceIdHandler.cs" />
-    <Compile Include="Handlers\Records\TextHandler.cs" />
-    <Compile Include="Handlers\Records\TextWithConverterHandler.cs" />
-    <Compile Include="Handlers\Records\TypeInfoHandler.cs" />
-    <Compile Include="Handlers\Records\XmlnsPropertyHandler.cs" />
-    <Compile Include="IHandlers.cs" />
-    <Compile Include="IRewritePass.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Rewrite\AttributeRewritePass.cs" />
-    <Compile Include="Rewrite\ConnectionIdRewritePass.cs" />
-    <Compile Include="Rewrite\DocumentRewritePass.cs" />
-    <Compile Include="Rewrite\MarkupExtensionRewritePass.cs" />
-    <Compile Include="Rewrite\XClassRewritePass.cs" />
-    <Compile Include="XamlContext.cs" />
-    <Compile Include="XamlDecompiler.cs" />
-    <Compile Include="Xaml\NamespaceMap.cs" />
-    <Compile Include="Xaml\XamlExtension.cs" />
-    <Compile Include="Xaml\XamlPathDeserializer.cs" />
-    <Compile Include="Xaml\XamlProperty.cs" />
-    <Compile Include="Xaml\XamlResourceKey.cs" />
-    <Compile Include="Xaml\XamlType.cs" />
-    <Compile Include="Xaml\XamlUtils.cs" />
-    <Compile Include="XmlnsDictionary.cs" />
+    <ProjectReference Include="..\ILSpy\ILSpy.csproj" />
+    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
+    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
   </ItemGroup>
 
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-
-  <Target Name="RemoveTransitiveProjectReferences" AfterTargets="IncludeTransitiveProjectReferences">
-    <ItemGroup>
-      <ProjectReference Remove="@(_TransitiveProjectReferences)" />
-    </ItemGroup>
-  </Target>
-
 </Project>
\ No newline at end of file
diff --git a/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj b/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
index acf41f32b..21204bb1b 100644
--- a/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
+++ b/ILSpy.ReadyToRun/ILSpy.ReadyToRun.csproj
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
     <AssemblyName>ILSpy.ReadyToRun.Plugin</AssemblyName>
     <LangVersion>8.0</LangVersion>
-
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <NeutralResourcesLanguage>en-US</NeutralResourcesLanguage>
-    <EnableDefaultItems>false</EnableDefaultItems>
     <UseWpf>true</UseWpf>
-    <ExtrasEnableDefaultPageItems>false</ExtrasEnableDefaultPageItems>
-    <ExtrasEnableDefaultResourceItems>false</ExtrasEnableDefaultResourceItems>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -30,48 +26,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\ILSpy\ILSpy.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="ReadyToRunDisassembler.cs" />
-    <Compile Include="ReadyToRunLanguage.cs" />
-    <Compile Include="ReadyToRunOptionPage.xaml.cs">
-      <DependentUpon>ReadyToRunOptionPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ReadyToRunOptions.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.zh-Hans.resx">
-      <Generator></Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Include="ReadyToRunOptionPage.xaml" />
+    <ProjectReference Include="..\ILSpy\ILSpy.csproj" />
+    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
+    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
   </ItemGroup>
 
   <Import Project="../packages.props" />
@@ -88,10 +45,4 @@
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
   </ItemGroup>
 
-  <Target Name="RemoveTransitiveProjectReferences" AfterTargets="IncludeTransitiveProjectReferences">
-    <ItemGroup>
-      <ProjectReference Remove="@(_TransitiveProjectReferences)" />
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj
index 84a804877..77e1264c7 100644
--- a/ILSpy.Tests/ILSpy.Tests.csproj
+++ b/ILSpy.Tests/ILSpy.Tests.csproj
@@ -62,10 +62,6 @@
     <ProjectReference Include="..\ILSpy\ILSpy.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
diff --git a/ILSpy/DebugInfo/DiaSymNativeDebugInfoProvider.cs b/ILSpy/DebugInfo/DiaSymNativeDebugInfoProvider.cs
deleted file mode 100644
index fe3d58ef7..000000000
--- a/ILSpy/DebugInfo/DiaSymNativeDebugInfoProvider.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) 2018 Siegfried Pammer
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this
-// software and associated documentation files (the "Software"), to deal in the Software
-// without restriction, including without limitation the rights to use, copy, modify, merge,
-// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
-using System.Text;
-using System.Threading.Tasks;
-using ICSharpCode.Decompiler.DebugInfo;
-using ICSharpCode.Decompiler.Metadata;
-using ICSharpCode.Decompiler.Util;
-using Microsoft.DiaSymReader;
-
-namespace ICSharpCode.ILSpy.DebugInfo
-{
-	class DiaSymNativeDebugInfoProvider : IDebugInfoProvider, ISymReaderMetadataProvider
-	{
-		PEFile module;
-		string pdbFileName;
-		Stream stream;
-		MetadataReader metadata;
-		ISymUnmanagedReader5 reader;
-
-		public DiaSymNativeDebugInfoProvider(PEFile module, string pdbFileName, Stream stream)
-		{
-			this.module = module;
-			this.pdbFileName = pdbFileName;
-			this.stream = stream;
-			this.metadata = module.Metadata;
-			this.reader = SymUnmanagedReaderFactory.CreateReader<ISymUnmanagedReader5>(stream, this);
-		}
-
-		public string Description => $"Loaded from PDB file: {pdbFileName}";
-
-		public IList<Decompiler.DebugInfo.SequencePoint> GetSequencePoints(MethodDefinitionHandle handle)
-		{
-			var method = reader.GetMethod(MetadataTokens.GetToken(handle));
-			if (method == null || method.GetSequencePointCount(out int count) != 0)
-				return Empty<Decompiler.DebugInfo.SequencePoint>.Array;
-			var sequencePoints = new Decompiler.DebugInfo.SequencePoint[count];
-			var points = method.GetSequencePoints();
-			int i = 0;
-			var buffer = new char[1024];
-			foreach (var point in points) {
-				string url;
-				if (point.Document.GetUrl(buffer.Length, out int length, buffer) == 0) {
-					url = new string(buffer, 0, length - 1);
-				} else {
-					url = "";
-				}
-				sequencePoints[i] = new Decompiler.DebugInfo.SequencePoint() {
-					Offset = point.Offset,
-					StartLine = point.StartLine,
-					StartColumn = point.StartColumn,
-					EndLine = point.EndLine,
-					EndColumn = point.EndColumn,
-					DocumentUrl = url
-				};
-				
-				i++;
-			}
-			return sequencePoints;
-		}
-
-		public IList<Variable> GetVariables(MethodDefinitionHandle handle)
-		{
-			var method = reader.GetMethod(MetadataTokens.GetToken(handle));
-			var scopes = new Queue<ISymUnmanagedScope>(new[] { method.GetRootScope() });
-			var variables = new List<Variable>();
-
-			while (scopes.Count > 0) {
-				var scope = scopes.Dequeue();
-
-				foreach (var local in scope.GetLocals()) {
-					variables.Add(new Variable() { Name = local.GetName() });
-				}
-
-				foreach (var s in scope.GetChildren())
-					scopes.Enqueue(s);
-			}
-
-			return variables;
-		}
-
-		public bool TryGetName(MethodDefinitionHandle handle, int index, out string name)
-		{
-			var method = reader.GetMethod(MetadataTokens.GetToken(handle));
-			var scopes = new Queue<ISymUnmanagedScope>(new[] { method.GetRootScope() });
-			name = null;
-
-			while (scopes.Count > 0) {
-				var scope = scopes.Dequeue();
-
-				foreach (var local in scope.GetLocals()) {
-					if (local.GetSlot() == index) {
-						name = local.GetName();
-						return true;
-					}
-				}
-
-				foreach (var s in scope.GetChildren())
-					scopes.Enqueue(s);
-			}
-
-			return false;
-		}
-
-		unsafe bool ISymReaderMetadataProvider.TryGetStandaloneSignature(int standaloneSignatureToken, out byte* signature, out int length)
-		{
-			var handle = (StandaloneSignatureHandle)MetadataTokens.Handle(standaloneSignatureToken);
-			if (handle.IsNil) {
-				signature = null;
-				length = 0;
-				return false;
-			}
-
-			var sig = metadata.GetStandaloneSignature(handle);
-			var blob = metadata.GetBlobReader(sig.Signature);
-
-			signature = blob.StartPointer;
-			length = blob.Length;
-			return true;
-		}
-
-		bool ISymReaderMetadataProvider.TryGetTypeDefinitionInfo(int typeDefinitionToken, out string namespaceName, out string typeName, out TypeAttributes attributes)
-		{
-			var handle = (TypeDefinitionHandle)MetadataTokens.Handle(typeDefinitionToken);
-			if (handle.IsNil) {
-				namespaceName = null;
-				typeName = null;
-				attributes = 0;
-				return false;
-			}
-
-			var typeDefinition = metadata.GetTypeDefinition(handle);
-			namespaceName = metadata.GetString(typeDefinition.Namespace);
-			typeName = metadata.GetString(typeDefinition.Name);
-			attributes = typeDefinition.Attributes;
-			return true;
-		}
-
-		bool ISymReaderMetadataProvider.TryGetTypeReferenceInfo(int typeReferenceToken, out string namespaceName, out string typeName)
-		{
-			var handle = (TypeReferenceHandle)MetadataTokens.Handle(typeReferenceToken);
-			if (handle.IsNil) {
-				namespaceName = null;
-				typeName = null;
-				return false;
-			}
-
-			var typeReference = metadata.GetTypeReference(handle);
-			namespaceName = metadata.GetString(typeReference.Namespace);
-			typeName = metadata.GetString(typeReference.Name);
-			return true;
-		}
-	}
-}
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index b977567f8..ac93d2fff 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
@@ -8,11 +8,7 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <GenerateSupportedRuntime>false</GenerateSupportedRuntime>
-    <EnableDefaultItems>false</EnableDefaultItems>
     <UseWpf>true</UseWpf>
-    <ExtrasEnableDefaultPageItems>false</ExtrasEnableDefaultPageItems>
-    <ExtrasEnableDefaultResourceItems>false</ExtrasEnableDefaultResourceItems>
-
     <RootNamespace>ICSharpCode.ILSpy</RootNamespace>
 
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@@ -38,20 +34,11 @@
     <CodeAnalysisRuleSet>..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
   <Import Project="..\packages.props" />
 
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="$(AvalonEditVersion)" />
+    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
     <PackageReference Include="Dirkster.AvalonDock" Version="4.50.1" />
@@ -63,776 +50,28 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
-    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="$(DSRConverterXmlVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\ICSharpCode.Decompiler.PdbProvider.Cecil\MonoCecilDebugInfoProvider.cs" Link="DebugInfo\MonoCecilDebugInfoProvider.cs" />
-    <Compile Include="AboutPage.cs" />
-    <Compile Include="Analyzers\AnalyzerContext.cs" />
-    <Compile Include="Analyzers\AnalyzerScope.cs" />
-    <Compile Include="Analyzers\Builtin\AttributeAppliedToAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\EventImplementedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\EventOverriddenByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\MethodImplementedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\MemberImplementsInterfaceAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\MethodOverriddenByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\MethodVirtualUsedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\MethodUsedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\MethodUsesAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\PropertyImplementedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\PropertyOverriddenByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\TypeExposedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\TypeInstantiatedByAnalyzer.cs" />
-    <Compile Include="Analyzers\Builtin\TypeUsedByAnalyzer.cs" />
-    <Compile Include="Analyzers\IAnalyzer.cs" />
-    <Compile Include="Analyzers\AnalyzerTreeView.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedAccessorTreeNode.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedEventTreeNode.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedMethodTreeNode.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedPropertyTreeNode.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedModuleTreeNode.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedTypeTreeNode.cs" />
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="AssemblyList.cs" />
-    <Compile Include="AssemblyListManager.cs" />
-    <Compile Include="AvalonEdit\ITextMarker.cs" />
-    <Compile Include="AvalonEdit\TextMarkerService.cs" />
-    <Compile Include="Commands\DecompileInNewViewCommand.cs" />
-    <Compile Include="Commands\CheckForUpdatesCommand.cs" />
-    <Compile Include="Commands\BrowseBackCommand.cs" />
-    <Compile Include="Commands\BrowseForwardCommand.cs" />
-    <Compile Include="CommandLineArguments.cs" />
-    <Compile Include="Commands\DelegateCommand.cs" />
-    <Compile Include="Commands\DecompileCommand.cs" />
-    <Compile Include="Commands\DisassembleAllCommand.cs" />
-    <Compile Include="Commands\ExitCommand.cs" />
-    <Compile Include="Commands\CommandWrapper.cs" />
-    <Compile Include="Metadata\DebugDirectoryTreeNode.cs" />
-    <Compile Include="Metadata\GoToTokenCommand.cs" />
-    <Compile Include="Commands\ILSpyCommands.cs" />
-    <Compile Include="Commands\IProtocolHandler.cs" />
-    <Compile Include="Commands\ManageAssemblyListsCommand.cs" />
-    <Compile Include="Commands\Pdb2XmlCommand.cs" />
-    <Compile Include="Commands\RemoveAssembliesWithLoadErrors.cs" />
-    <Compile Include="Commands\SelectPdbContextMenuEntry.cs" />
-    <Compile Include="Commands\ShowCFGContextMenuEntry.cs" />
-    <Compile Include="Commands\ShowDebugSteps.cs" />
-    <Compile Include="Commands\SortAssemblyListCommand.cs" />
-    <Compile Include="Controls\BoolToVisibilityConverter.cs" />
-    <Compile Include="Controls\CustomDialog.cs" />
-    <Compile Include="Controls\GridViewColumnAutoSize.cs" />
-    <Compile Include="Controls\MarkupExtensions.cs" />
-    <Compile Include="Controls\ResourceObjectTable.xaml.cs">
-      <DependentUpon>ResourceObjectTable.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Commands\DecompileAllCommand.cs" />
-    <Compile Include="Commands\ExportCommandAttribute.cs" />
-    <Compile Include="Controls\ExtensionMethods.cs" />
-    <Compile Include="Controls\SearchBox.cs" />
-    <Compile Include="Controls\SortableGridViewColumn.cs" />
-    <Compile Include="Controls\XamlResourceExtension.cs" />
-    <Compile Include="EntityReference.cs" />
-    <Compile Include="Metadata\CorTables\FieldRVATableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\FieldMarshalTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\NestedClassTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ImplMapTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\PropertyMapTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\EventMapTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\InterfaceImplTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ClassLayoutTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\LocalConstantTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\ImportScopeTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\LocalVariableTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\LocalScopeTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\CustomDebugInformationTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\StateMachineMethodTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\MethodDebugInformationTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DebugTables\DocumentTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\FlagsFilterControl.xaml.cs" />
-    <Compile Include="Metadata\FlagsTooltip.xaml.cs" />
-    <Compile Include="Metadata\HexFilterControl.xaml.cs" />
-    <Compile Include="Metadata\MetaDataGrid.cs" />
-    <Compile Include="Metadata\MetadataProtocolHandler.cs" />
-    <Compile Include="Metadata\MetadataTableTreeNode.cs" />
-    <Compile Include="Metadata\DebugMetadataTreeNode.cs" />
-    <Compile Include="TreeNodes\PackageFolderTreeNode.cs" />
-    <Compile Include="ViewModels\LegacyToolPaneModel.cs" />
-    <Compile Include="ViewModels\ManageAssemblyListsViewModel.cs" />
-    <Compile Include="ViewModels\ViewModelBase.cs" />
-    <Compile Include="Views\CreateListDialog.xaml.cs">
-      <DependentUpon>CreateListDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DebugInfo\DebugInfoUtils.cs" />
-    <Compile Include="DebugInfo\PortableDebugInfoProvider.cs" />
-    <Compile Include="Views\DebugSteps.xaml.cs">
-      <DependentUpon>DebugSteps.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Docking\ActiveTabPageConverter.cs" />
-    <Compile Include="Docking\CloseAllDocumentsCommand.cs" />
-    <Compile Include="ViewModels\AssemblyListPaneModel.cs" />
-    <Compile Include="Docking\DockLayoutSettings.cs" />
-    <Compile Include="ViewModels\TabPageModel.cs" />
-    <Compile Include="Docking\PaneCollection.cs" />
-    <Compile Include="ViewModels\PaneModel.cs" />
-    <Compile Include="Docking\PaneStyleSelector.cs" />
-    <Compile Include="Docking\PaneTemplateSelector.cs" />
-    <Compile Include="ViewModels\DebugStepsPaneModel.cs" />
-    <Compile Include="ViewModels\AnalyzerPaneModel.cs" />
-    <Compile Include="ViewModels\SearchPaneModel.cs" />
-    <Compile Include="ViewModels\ToolPaneModel.cs" />
-    <Compile Include="ILSpyTraceListener.cs" />
-    <Compile Include="DecompilationOptions.cs" />
-    <Compile Include="ExtensionMethods.cs" />
-    <Compile Include="FilterSettings.cs" />
-    <Compile Include="GuessFileType.cs" />
-    <Compile Include="ContextMenuEntry.cs" />
-    <Compile Include="Languages\CSharpBracketSearcher.cs" />
-    <Compile Include="Languages\CSharpILMixedLanguage.cs" />
-    <Compile Include="Languages\CSharpLanguage.cs" />
-    <Compile Include="Languages\CSharpLexer.cs" />
-    <Compile Include="Languages\CSharpHighlightingTokenWriter.cs" />
-    <Compile Include="ILSpySettings.cs" />
-    <Compile Include="Images\AccessOverlayIcon.cs" />
-    <Compile Include="Images\MemberIcon.cs" />
-    <Compile Include="Images\TypeIcon.cs" />
-    <Compile Include="ISmartTextOutput.cs" />
-    <Compile Include="Images\Images.cs" />
-    <Compile Include="Languages\ILAstLanguage.cs" />
-    <Compile Include="Languages\ILLanguage.cs" />
-    <Compile Include="Languages\IResourceFileHandler.cs" />
-    <Compile Include="Languages\Language.cs" />
-    <Compile Include="Languages\Languages.cs" />
-    <Compile Include="Metadata\CorTables\MethodImplTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Options\DecompilerSettingsPanel.xaml.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Search\AbstractEntitySearchStrategy.cs" />
-    <Compile Include="Search\NamespaceSearchStrategy.cs" />
-    <Compile Include="Search\AssemblySearchStrategy.cs" />
-    <Compile Include="Metadata\CorTables\AssemblyRefTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\AssemblyTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ConstantTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\CustomAttributeTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\DeclSecurityTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\EventTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ExportedTypeTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\FieldLayoutTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\FieldTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\FileTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\GenericParamConstraintTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\GenericParamTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ManifestResourceTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\MemberRefTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\MethodSemanticsTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\MethodSpecTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\MethodTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ModuleRefTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ModuleTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\ParamTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\PropertyTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\StandAloneSigTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\TypeDefTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\TypeRefTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\CorTables\TypeSpecTableTreeNode.cs">
-      <SubType>Code</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Compile>
-    <Compile Include="Metadata\DataDirectoriesTreeNode.cs" />
-    <Compile Include="Metadata\DosHeaderTreeNode.cs" />
-    <Compile Include="Metadata\CoffHeaderTreeNode.cs" />
-    <Compile Include="Metadata\Helpers.cs" />
-    <Compile Include="Metadata\MetadataTableViews.xaml.cs" />
-    <Compile Include="Metadata\MetadataTreeNode.cs" />
-    <Compile Include="Metadata\OptionalHeaderTreeNode.cs" />
-    <Compile Include="Search\LiteralSearchStrategy.cs" />
-    <Compile Include="LoadedAssembly.cs" />
-    <Compile Include="LoadedAssemblyExtensions.cs" />
-    <Compile Include="LoadedPackage.cs" />
-    <Compile Include="Search\MemberSearchStrategy.cs" />
-    <Compile Include="Search\MetadataTokenSearchStrategy.cs" />
-    <Compile Include="NativeMethods.cs" />
-    <Compile Include="NavigationHistory.cs" />
-    <Compile Include="NavigationState.cs" />
-    <Compile Include="Commands\OpenCommand.cs" />
-    <Compile Include="Commands\OpenFromGacCommand.cs" />
-    <Compile Include="Views\OpenFromGacDialog.xaml.cs">
-      <DependentUpon>OpenFromGacDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ResourceStringTable.xaml.cs">
-      <DependentUpon>ResourceStringTable.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ManageAssemblyListsDialog.xaml.cs" />
-    <Compile Include="Options\DisplaySettings.cs" />
-    <Compile Include="Options\DisplaySettingsPanel.xaml.cs">
-      <DependentUpon>DisplaySettingsPanel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Options\MiscSettings.cs" />
-    <Compile Include="Options\MiscSettingsPanel.xaml.cs">
-      <DependentUpon>MiscSettingsPanel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Options\OptionsDialog.xaml.cs">
-      <DependentUpon>OptionsDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Commands\RefreshCommand.cs" />
-    <Compile Include="Commands\SaveCommand.cs" />
-    <Compile Include="Search\ResourceSearchStrategy.cs" />
-    <Compile Include="Search\SearchPane.cs">
-      <DependentUpon>SearchPane.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Commands\SimpleCommand.cs" />
-    <Compile Include="Search\AbstractSearchStrategy.cs" />
-    <Compile Include="Search\SearchResult.cs" />
-    <Compile Include="SolutionWriter.cs" />
-    <Compile Include="TaskHelper.cs" />
-    <Compile Include="TextView\BracketHighlightRenderer.cs" />
-    <Compile Include="TextView\EditorCommands.cs" />
-    <Compile Include="TextView\FoldingCommands.cs" />
-    <Compile Include="Commands\SaveCodeContextMenuEntry.cs" />
-    <Compile Include="TextView\DocumentationUIBuilder.cs" />
-    <Compile Include="Analyzers\AnalyzeCommand.cs" />
-    <Compile Include="Analyzers\Builtin\FieldAccessAnalyzer.cs" />
-    <Compile Include="Analyzers\TreeNodes\AnalyzedFieldTreeNode.cs" />
-    <Compile Include="Analyzers\AnalyzerEntityTreeNode.cs" />
-    <Compile Include="Analyzers\AnalyzerSearchTreeNode.cs" />
-    <Compile Include="Analyzers\AnalyzerTreeNode.cs" />
-    <Compile Include="Analyzers\RemoveAnalyzeContextMenuEntry.cs" />
-    <Compile Include="TreeNodes\BaseTypesEntryNode.cs" />
-    <Compile Include="Commands\CopyFullyQualifiedNameContextMenuEntry.cs" />
-    <Compile Include="TreeNodes\DerivedTypesEntryNode.cs" />
-    <Compile Include="TreeNodes\FilterResult.cs" />
-    <Compile Include="Commands\GeneratePdbContextMenuEntry.cs" />
-    <Compile Include="TreeNodes\IMemberTreeNode.cs" />
-    <Compile Include="TreeNodes\NaturalStringComparer.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\CursorResourceEntryNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\IconResourceEntryNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\ImageListResourceEntryNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\ImageResourceEntryNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\IResourceNodeFactory.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\ResourceEntryNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\ResourcesFileTreeNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\ResourceTreeNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\XamlResourceNode.cs" />
-    <Compile Include="TreeNodes\ResourceNodes\XmlResourceNode.cs" />
-    <Compile Include="Commands\SearchMsdnContextMenuEntry.cs" />
-    <Compile Include="Analyzers\Builtin\TypeExtensionMethodsAnalyzer.cs" />
-    <Compile Include="Docking\DockWorkspace.cs" />
     <EmbeddedResource Include="..\doc\ILSpyAboutPage.txt" />
     <EmbeddedResource Include="..\doc\ILSpyAboutPage_zh_Hans.txt" />
     <EmbeddedResource Include="..\doc\third-party-notices.txt" />
     <EmbeddedResource Include="..\doc\license.txt">
       <Link>license.txt</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Condition=" '$(COMPUTERNAME)' != 'DANIEL-E590' " Include="Properties\Resources.zh-Hans.resx" />
+    <Resource Include="Images\NuGet.png" />
     <Resource Include="Images\ILSpy.ico" />
     <EmbeddedResource Include="TextView\CSharp-Mode.xshd" />
     <EmbeddedResource Include="TextView\ILAsm-Mode.xshd" />
     <EmbeddedResource Include="TextView\Asm-Mode.xshd" />
-    <None Include="app.config" />
-    <None Include="app.manifest" />
-    <None Include="Properties\app.config.template" />
-    <None Include="Properties\AssemblyInfo.template.cs" />
-    <None Include="Properties\launchSettings.json" />
-    <Compile Include="Properties\WPFAssemblyInfo.cs" />
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SessionSettings.cs" />
-    <Compile Include="TextView\CaretHighlightAdorner.cs" />
-    <Compile Include="TextView\DecompilerTextView.cs">
-      <DependentUpon>DecompilerTextView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="TextView\OutputLengthExceededException.cs" />
-    <Compile Include="TextView\ReferenceElementGenerator.cs" />
-    <Compile Include="TextView\AvalonEditTextOutput.cs" />
-    <Compile Include="TextView\UIElementGenerator.cs" />
-    <Compile Include="TreeNodes\AssemblyListTreeNode.cs" />
-    <Compile Include="TreeNodes\AssemblyReferenceTreeNode.cs" />
-    <Compile Include="TreeNodes\AssemblyTreeNode.cs" />
-    <Compile Include="TreeNodes\BaseTypesTreeNode.cs" />
-    <Compile Include="TreeNodes\DerivedTypesTreeNode.cs" />
-    <Compile Include="TreeNodes\EventTreeNode.cs" />
-    <Compile Include="TreeNodes\FieldTreeNode.cs" />
-    <Compile Include="TreeNodes\ILSpyTreeNode.cs" />
-    <Compile Include="TreeNodes\MethodTreeNode.cs" />
-    <Compile Include="TreeNodes\ModuleReferenceTreeNode.cs" />
-    <Compile Include="TreeNodes\NamespaceTreeNode.cs" />
-    <Compile Include="TreeNodes\PropertyTreeNode.cs" />
-    <Compile Include="TreeNodes\ReferenceFolderTreeNode.cs" />
-    <Compile Include="TreeNodes\ResourceListTreeNode.cs" />
-    <Compile Include="TreeNodes\ThreadingSupport.cs" />
-    <Compile Include="TreeNodes\TypeTreeNode.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Include="Controls\ResourceObjectTable.xaml" />
-    <Page Include="Controls\ResourceStringTable.xaml" />
-    <Page Include="Controls\SearchBoxStyle.xaml" />
-    <Page Include="Metadata\FlagsFilterControl.xaml" />
-    <Page Include="Metadata\FlagsTooltip.xaml" />
-    <Page Include="Metadata\HexFilterControl.xaml" />
-    <Page Include="Views\CreateListDialog.xaml" />
-    <Page Include="Views\DebugSteps.xaml" />
-    <Page Include="Images\Assembly.xaml" />
-    <Page Include="Images\AssemblyList.xaml" />
-    <Page Include="Images\AssemblyListGAC.xaml" />
-    <Page Include="Images\AssemblyWarning.xaml" />
-    <Page Include="Images\Back.xaml" />
-    <Page Include="Images\Class.xaml" />
-    <Page Include="Images\Close.xaml" />
-    <Page Include="Images\CollapseAll.xaml" />
-    <Page Include="Images\Constructor.xaml" />
-    <Page Include="Images\Copy.xaml" />
-    <Page Include="Images\Delegate.xaml" />
-    <Page Include="Images\Delete.xaml" />
-    <Page Include="Images\Enum.xaml" />
-    <Page Include="Images\EnumValue.xaml" />
-    <Page Include="Images\Event.xaml" />
-    <Page Include="Images\ExtensionMethod.xaml" />
-    <Page Include="Images\Field.xaml" />
-    <Page Include="Images\FieldReadOnly.xaml" />
-    <Page Include="Images\FindAssembly.xaml" />
-    <Page Include="Images\Folder.Closed.xaml" />
-    <Page Include="Images\Folder.Open.xaml" />
-    <Page Include="Images\Forward.xaml" />
-    <Page Include="Images\Indexer.xaml" />
-    <Page Include="Images\Interface.xaml" />
-    <Page Include="Images\Library.xaml" />
-    <Page Include="Images\Literal.xaml" />
-    <Page Include="Images\Method.xaml" />
-    <Page Include="Images\Namespace.xaml" />
-    <Page Include="Images\OK.xaml" />
-    <Page Include="Images\Open.xaml" />
-    <Page Include="Images\Operator.xaml" />
-    <Page Include="Images\OverlayCompilerControlled.xaml" />
-    <Page Include="Images\OverlayInternal.xaml" />
-    <Page Include="Images\OverlayPrivate.xaml" />
-    <Page Include="Images\OverlayPrivateProtected.xaml" />
-    <Page Include="Images\OverlayProtected.xaml" />
-    <Page Include="Images\OverlayProtectedInternal.xaml" />
-    <Page Include="Images\OverlayStatic.xaml" />
-    <Page Include="Images\PInvokeMethod.xaml" />
-    <Page Include="Images\Property.xaml" />
-    <Page Include="Images\ReferenceFolder.xaml" />
-    <Page Include="Images\Refresh.xaml" />
-    <Page Include="Images\Resource.xaml" />
-    <Page Include="Images\ResourceImage.xaml" />
-    <Page Include="Images\ResourceResourcesFile.xaml" />
-    <Page Include="Images\ResourceXml.xaml" />
-    <Page Include="Images\ResourceXsd.xaml" />
-    <Page Include="Images\ResourceXsl.xaml" />
-    <Page Include="Images\ResourceXslt.xaml" />
-    <Page Include="Images\Save.xaml" />
-    <Page Include="Images\Search.xaml" />
-    <Page Include="Images\SearchMsdn.xaml" />
-    <Page Include="Images\ShowAll.xaml" />
-    <Page Include="Images\ShowPrivateInternal.xaml" />
-    <Page Include="Images\ShowPublicOnly.xaml" />
-    <Page Include="Images\Sort.xaml" />
-    <Page Include="Images\Struct.xaml" />
-    <Page Include="Images\SubTypes.xaml" />
-    <Page Include="Images\SuperTypes.xaml" />
-    <Page Include="Images\ViewCode.xaml" />
-    <Page Include="Images\VirtualMethod.xaml" />
-    <Page Include="Images\Warning.xaml" />
-    <Page Include="MainWindow.xaml" />
-    <Page Include="Metadata\MetadataTableViews.xaml" />
-    <Page Include="Views\OpenFromGacDialog.xaml" />
-    <Page Include="Views\ManageAssemblyListsDialog.xaml" />
-    <Page Include="Options\DecompilerSettingsPanel.xaml" />
-    <Page Include="Options\DisplaySettingsPanel.xaml" />
-    <Page Include="Options\MiscSettingsPanel.xaml" />
-    <Page Include="Options\OptionsDialog.xaml" />
-    <Page Include="Search\SearchPane.xaml" />
-    <Page Include="TextView\DecompilerTextView.xaml" />
-    <Page Include="themes\generic.xaml" />
   </ItemGroup>
 
   <ItemGroup>
-    <Page Update="@(Page)" SubType="Designer" Generator="MSBuild:Compile" />
-    <Page Update="Metadata\FlagsFilterControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Metadata\FlagsTooltip.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Metadata\HexFilterControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Metadata\MetadataTableViews.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Assembly.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\AssemblyWarning.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\AssemblyList.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\AssemblyListGAC.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Back.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Class.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Close.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\CollapseAll.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Constructor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Copy.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Delegate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Delete.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Enum.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\EnumValue.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Event.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ExtensionMethod.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Field.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\FieldReadOnly.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\FindAssembly.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Folder.Closed.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Folder.Open.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Forward.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Indexer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Interface.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Library.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Literal.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Method.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OK.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Open.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Operator.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayCompilerControlled.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayInternal.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayPrivate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayPrivateProtected.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayProtected.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayProtectedInternal.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\OverlayStatic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\PInvokeMethod.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Property.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ReferenceFolder.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Refresh.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Resource.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ResourceImage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ResourceResourcesFile.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ResourceXml.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ResourceXsd.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ResourceXsl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ResourceXslt.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Save.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Search.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\SearchMsdn.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ShowAll.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ShowPrivateInternal.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ShowPublicOnly.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Sort.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Struct.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\SubTypes.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\SuperTypes.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\ViewCode.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\VirtualMethod.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Images\Warning.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Update="Options\DecompilerSettingsPanel.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
+    <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="Search\SearchPane.xaml" />
-    <None Include="@(Resource)" />
+  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
+    <PackageReference Include="Microsoft.DiaSymReader.Converter.Xml" Version="$(DSRConverterXmlVersion)" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -850,13 +89,11 @@
     <SortResXInput Include="Properties\*.resx" />
     <SortResXInput Include="..\ILSpy.AddIn\*.resx" />
     <SortResXInput Include="..\ILSpy.ReadyToRun\Properties\*.resx" />
+    <Compile Remove="Properties\AssemblyInfo.template.cs" />
+    <None Remove="Properties\launchSettings.json" />
     <SortResXStamp Include="obj\sort-resx.stamp" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Resource Include="Images\NuGet.png" />
-  </ItemGroup>
-
   <Target Name="SortResX" BeforeTargets="BeforeBuild" Inputs="@(SortResXInput)" Outputs="@(SortResXStamp)">
     <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
       <SortResX>powershell -NoProfile -ExecutionPolicy Bypass -File BuildTools/sort-resx.ps1</SortResX>
diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj
index 191b435e1..1eb18eb58 100644
--- a/TestPlugin/TestPlugin.csproj
+++ b/TestPlugin/TestPlugin.csproj
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="MSBuild.Sdk.Extras">
-
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
     <AssemblyName>Test.Plugin</AssemblyName>
-
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-
-    <EnableDefaultItems>False</EnableDefaultItems>
     <UseWpf>true</UseWpf>
-    <ExtrasEnableDefaultPageItems>false</ExtrasEnableDefaultPageItems>
-    <ExtrasEnableDefaultResourceItems>false</ExtrasEnableDefaultResourceItems>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -25,37 +19,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
     <ProjectReference Include="..\ILSpy\ILSpy.csproj" />
+    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
     <ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="AboutPageAddition.cs" />
-    <Compile Include="ContextMenuCommand.cs" />
-    <Compile Include="CustomLanguage.cs" />
-    <Compile Include="CustomOptionPage.xaml.cs">
-      <DependentUpon>CustomOptionPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainMenuCommand.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Resource Include="Clear.png" />
     <None Include="Readme.txt" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Page Include="CustomOptionPage.xaml" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file