Sync with current ReClass.NET project.

Author: KN4CK3R

DotNetInspectorPlugin.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN32</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RECLASSNET32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WIN32;RELEASE</DefineConstants>
+    <DefineConstants>TRACE;RECLASSNET32;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -38,7 +38,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\x64\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RECLASSNET64</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -48,7 +48,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\x64\</OutputPath>
-    <DefineConstants>TRACE;WIN64;RELEASE</DefineConstants>
+    <DefineConstants>TRACE;RECLASSNET64;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -154,12 +154,6 @@
     </Compile>
     <Compile Include="ReClassNetDataReader.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ReClass.NET\ReClass.NET.csproj">
-      <Project>{BFB8917D-E9B4-463F-A6E8-612C35728C78}</Project>
-      <Name>ReClass.NET</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="InspectorForm.resx">
       <DependentUpon>InspectorForm.cs</DependentUpon>
@@ -172,7 +166,12 @@
   <ItemGroup>
     <None Include="Resources\logo.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\ReClass.NET\ReClass.NET\ReClass.NET.csproj">
+      <Project>{bfb8917d-e9b4-463f-a6e8-612c35728c78}</Project>
+      <Name>ReClass.NET</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

DotNetInspectorPlugin.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetInspectorPlugin", "DotNetInspectorPlugin.csproj", "{CA79BA0B-0D80-476A-B793-FC7EF6DCEAD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,4 +41,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {780C26C0-D5C9-4EB7-BEA5-95AC51577CE0}
+	EndGlobalSection
 EndGlobal

DotNetInspectorPluginExt.cs

@@ -23,12 +23,7 @@ public override bool Initialize(IPluginHost pluginHost)
 				Terminate();
 			}
 
-			if (pluginHost == null)
-			{
-				throw new ArgumentNullException(nameof(pluginHost));
-			}
-
-			host = pluginHost;
+			host = pluginHost ?? throw new ArgumentNullException(nameof(pluginHost));
 
 			var menuItem = host.MainWindow.MainMenu.Items.OfType<ToolStripMenuItem>().FirstOrDefault(i => i.Text == "Process");
 			if (menuItem != null)

DotNetObject.cs

@@ -8,7 +8,7 @@
 namespace DotNetInspectorPlugin
 {
 	[DebuggerDisplay("{" + nameof(DebuggerDisplay) + ",nq}")]
-	class DotNetObject : IComparable<DotNetObject>
+	internal class DotNetObject : IComparable<DotNetObject>
 	{
 		public string DebuggerDisplay => $"{Type.Name} {Name}";
 
@@ -78,7 +78,7 @@ private string GetRootName()
 		{
 			if (Parent == null)
 			{
-				return Name == null ? string.Empty : Name;
+				return Name ?? string.Empty;
 			}
 
 			return Parent.GetRootName();
@@ -111,22 +111,21 @@ public string GetFormattedValue(bool hex)
 				{
 					return (bool)value ? bool.TrueString : bool.FalseString;
 				}
-				else if (Type.ElementType == ClrElementType.Char)
+				if (Type.ElementType == ClrElementType.Char)
 				{
 					return $"'{value}'";
 				}
-				else if (Type.ElementType == ClrElementType.String)
+				if (Type.ElementType == ClrElementType.String)
 				{
 					if (value == null)
 					{
 						return NullString;
 					}
 					return $"\"{value}\"";
 				}
-				else if (IsFloatingPointValueType || IsIntegerValueType)
+				if (IsFloatingPointValueType || IsIntegerValueType)
 				{
-					var formattable = value as IFormattable;
-					if (formattable != null)
+					if (value is IFormattable formattable)
 					{
 						string format = null;
 						if (IsIntegerValueType && hex)
@@ -137,7 +136,7 @@ public string GetFormattedValue(bool hex)
 					}
 					return value.ToString();
 				}
-				else if (Type.ElementType == ClrElementType.FunctionPointer)
+				if (Type.ElementType == ClrElementType.FunctionPointer)
 				{
 					return $"0x{value:X}";
 				}
@@ -153,7 +152,7 @@ public void SetValue(object value)
 
 		public int CompareTo(DotNetObject other)
 		{
-			return Name.CompareTo(other?.Name);
+			return string.Compare(Name, other?.Name, StringComparison.Ordinal);
 		}
 	}
 }

DotNetObjectCollector.cs

@@ -6,9 +6,9 @@
 
 namespace DotNetInspectorPlugin
 {
-	class DotNetObjectCollector
+	internal class DotNetObjectCollector
 	{
-		private ClrHeap heap;
+		private readonly ClrHeap heap;
 
 		public DotNetObjectCollector(ClrHeap heap)
 		{
@@ -25,7 +25,7 @@ public IEnumerable<DotNetObject> EnumerateObjects()
 			foreach (var root in heap.EnumerateRoots())
 			{
 				heap.EnumerateObjectAddresses();
-				if (root == null || root.Type == null || root.Name == null)
+				if (root?.Type == null || root.Name == null)
 				{
 					continue;
 				}
@@ -116,9 +116,9 @@ private void RecursiveEnumerateObjects(HashSet<ulong> visited, DotNetObject pare
 		}
 	}
 
-	public class ClrGlobals
+	internal class ClrGlobals
 	{
-		public static readonly string[] ExcludeRootNamespaces = new string[]
+		public static readonly string[] ExcludeRootNamespaces =
 		{
 			"System.",
 			"Microsoft.",
@@ -128,7 +128,7 @@ public class ClrGlobals
 			"Newtonsoft.",
 		};
 
-		public static readonly string[] ExcludeNames = new string[]
+		public static readonly string[] ExcludeNames =
 		{
 			"finalization handle",
 			"strong handle",
@@ -137,7 +137,7 @@ public class ClrGlobals
 			"local var"
 		};
 
-		public static readonly string[] ExcludePrefix = new string[]
+		public static readonly string[] ExcludePrefix =
 		{
 			"static var "
 		};

InspectorForm.cs

@@ -31,10 +31,7 @@ public InspectorForm(RemoteProcess process)
 				e.Cancel = ((DotNetObject)e.RowObject).IsValueType == false;
 			};
 
-			olvColumnValue.AspectGetter = obj =>
-			{
-				return ((DotNetObject)obj).GetFormattedValue(false);
-			};
+			olvColumnValue.AspectGetter = obj => ((DotNetObject)obj).GetFormattedValue(false);
 
 			olvColumnValue.AspectPutter = (obj, value) =>
 			{

ReClassNetDataReader.cs

@@ -8,7 +8,7 @@
 
 namespace DotNetInspectorPlugin
 {
-	class ReClassNetDataReader : IDataReader
+	internal class ReClassNetDataReader : IDataReader
 	{
 		private readonly RemoteProcess process;