Finish updating ilspy plugin and add tests

Ashkank01 · Feb 12, 2020 · 2d47443 · 2d47443
1 parent 19b186b
commit 2d47443
Show file tree

Hide file tree

Showing 123 changed files with 474 additions and 184 deletions.
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.AvalonEdit.dll b/Resources/Dependencies/ILSpy/ICSharpCode.AvalonEdit.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.Decompiler.dll b/Resources/Dependencies/ILSpy/ICSharpCode.Decompiler.dll
diff --git a/Resources/Dependencies/ILSpy/ICSharpCode.TreeView.dll b/Resources/Dependencies/ILSpy/ICSharpCode.TreeView.dll
diff --git a/Resources/Dependencies/ILSpy/ILSpy.BamlDecompiler.Plugin.dll b/Resources/Dependencies/ILSpy/ILSpy.BamlDecompiler.Plugin.dll
diff --git a/Resources/Dependencies/ILSpy/ILSpy.exe b/Resources/Dependencies/ILSpy/ILSpy.exe
diff --git a/Resources/Dependencies/ILSpy/ILSpy.exe.config b/Resources/Dependencies/ILSpy/ILSpy.exe.config
diff --git a/Resources/Dependencies/ILSpy/Microsoft.Win32.Primitives.dll b/Resources/Dependencies/ILSpy/Microsoft.Win32.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/Mono.Cecil.Mdb.dll b/Resources/Dependencies/ILSpy/Mono.Cecil.Mdb.dll
diff --git a/Resources/Dependencies/ILSpy/Mono.Cecil.Pdb.dll b/Resources/Dependencies/ILSpy/Mono.Cecil.Pdb.dll
diff --git a/Resources/Dependencies/ILSpy/Mono.Cecil.Rocks.dll b/Resources/Dependencies/ILSpy/Mono.Cecil.Rocks.dll
diff --git a/Resources/Dependencies/ILSpy/Mono.Cecil.dll b/Resources/Dependencies/ILSpy/Mono.Cecil.dll
diff --git a/Resources/Dependencies/ILSpy/OSVersionHelper.dll b/Resources/Dependencies/ILSpy/OSVersionHelper.dll
diff --git a/Resources/Dependencies/ILSpy/System.AppContext.dll b/Resources/Dependencies/ILSpy/System.AppContext.dll
diff --git a/Resources/Dependencies/ILSpy/System.Collections.Concurrent.dll b/Resources/Dependencies/ILSpy/System.Collections.Concurrent.dll
diff --git a/Resources/Dependencies/ILSpy/System.Collections.Immutable.dll b/Resources/Dependencies/ILSpy/System.Collections.Immutable.dll
diff --git a/Resources/Dependencies/ILSpy/System.Collections.NonGeneric.dll b/Resources/Dependencies/ILSpy/System.Collections.NonGeneric.dll
diff --git a/Resources/Dependencies/ILSpy/System.Collections.Specialized.dll b/Resources/Dependencies/ILSpy/System.Collections.Specialized.dll
diff --git a/Resources/Dependencies/ILSpy/System.Collections.dll b/Resources/Dependencies/ILSpy/System.Collections.dll
diff --git a/Resources/Dependencies/ILSpy/System.ComponentModel.EventBasedAsync.dll b/Resources/Dependencies/ILSpy/System.ComponentModel.EventBasedAsync.dll
diff --git a/Resources/Dependencies/ILSpy/System.ComponentModel.Primitives.dll b/Resources/Dependencies/ILSpy/System.ComponentModel.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.ComponentModel.TypeConverter.dll b/Resources/Dependencies/ILSpy/System.ComponentModel.TypeConverter.dll
diff --git a/Resources/Dependencies/ILSpy/System.ComponentModel.dll b/Resources/Dependencies/ILSpy/System.ComponentModel.dll
diff --git a/Resources/Dependencies/ILSpy/System.Console.dll b/Resources/Dependencies/ILSpy/System.Console.dll
diff --git a/Resources/Dependencies/ILSpy/System.Data.Common.dll b/Resources/Dependencies/ILSpy/System.Data.Common.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.Contracts.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.Contracts.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.Debug.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.Debug.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.FileVersionInfo.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.FileVersionInfo.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.Process.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.Process.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.StackTrace.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.StackTrace.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.TextWriterTraceListener.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.TextWriterTraceListener.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.Tools.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.Tools.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.TraceSource.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.TraceSource.dll
diff --git a/Resources/Dependencies/ILSpy/System.Diagnostics.Tracing.dll b/Resources/Dependencies/ILSpy/System.Diagnostics.Tracing.dll
diff --git a/Resources/Dependencies/ILSpy/System.Drawing.Primitives.dll b/Resources/Dependencies/ILSpy/System.Drawing.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.Dynamic.Runtime.dll b/Resources/Dependencies/ILSpy/System.Dynamic.Runtime.dll
diff --git a/Resources/Dependencies/ILSpy/System.Globalization.Calendars.dll b/Resources/Dependencies/ILSpy/System.Globalization.Calendars.dll
diff --git a/Resources/Dependencies/ILSpy/System.Globalization.Extensions.dll b/Resources/Dependencies/ILSpy/System.Globalization.Extensions.dll
diff --git a/Resources/Dependencies/ILSpy/System.Globalization.dll b/Resources/Dependencies/ILSpy/System.Globalization.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.Compression.ZipFile.dll b/Resources/Dependencies/ILSpy/System.IO.Compression.ZipFile.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.Compression.dll b/Resources/Dependencies/ILSpy/System.IO.Compression.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.FileSystem.DriveInfo.dll b/Resources/Dependencies/ILSpy/System.IO.FileSystem.DriveInfo.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.FileSystem.Primitives.dll b/Resources/Dependencies/ILSpy/System.IO.FileSystem.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.FileSystem.Watcher.dll b/Resources/Dependencies/ILSpy/System.IO.FileSystem.Watcher.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.FileSystem.dll b/Resources/Dependencies/ILSpy/System.IO.FileSystem.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.IsolatedStorage.dll b/Resources/Dependencies/ILSpy/System.IO.IsolatedStorage.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.MemoryMappedFiles.dll b/Resources/Dependencies/ILSpy/System.IO.MemoryMappedFiles.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.Pipes.dll b/Resources/Dependencies/ILSpy/System.IO.Pipes.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.UnmanagedMemoryStream.dll b/Resources/Dependencies/ILSpy/System.IO.UnmanagedMemoryStream.dll
diff --git a/Resources/Dependencies/ILSpy/System.IO.dll b/Resources/Dependencies/ILSpy/System.IO.dll
diff --git a/Resources/Dependencies/ILSpy/System.Linq.Expressions.dll b/Resources/Dependencies/ILSpy/System.Linq.Expressions.dll
diff --git a/Resources/Dependencies/ILSpy/System.Linq.Parallel.dll b/Resources/Dependencies/ILSpy/System.Linq.Parallel.dll
diff --git a/Resources/Dependencies/ILSpy/System.Linq.Queryable.dll b/Resources/Dependencies/ILSpy/System.Linq.Queryable.dll
diff --git a/Resources/Dependencies/ILSpy/System.Linq.dll b/Resources/Dependencies/ILSpy/System.Linq.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.Http.dll b/Resources/Dependencies/ILSpy/System.Net.Http.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.NameResolution.dll b/Resources/Dependencies/ILSpy/System.Net.NameResolution.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.NetworkInformation.dll b/Resources/Dependencies/ILSpy/System.Net.NetworkInformation.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.Ping.dll b/Resources/Dependencies/ILSpy/System.Net.Ping.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.Primitives.dll b/Resources/Dependencies/ILSpy/System.Net.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.Requests.dll b/Resources/Dependencies/ILSpy/System.Net.Requests.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.Security.dll b/Resources/Dependencies/ILSpy/System.Net.Security.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.Sockets.dll b/Resources/Dependencies/ILSpy/System.Net.Sockets.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.WebHeaderCollection.dll b/Resources/Dependencies/ILSpy/System.Net.WebHeaderCollection.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.WebSockets.Client.dll b/Resources/Dependencies/ILSpy/System.Net.WebSockets.Client.dll
diff --git a/Resources/Dependencies/ILSpy/System.Net.WebSockets.dll b/Resources/Dependencies/ILSpy/System.Net.WebSockets.dll
diff --git a/Resources/Dependencies/ILSpy/System.ObjectModel.dll b/Resources/Dependencies/ILSpy/System.ObjectModel.dll
diff --git a/Resources/Dependencies/ILSpy/System.Reflection.Extensions.dll b/Resources/Dependencies/ILSpy/System.Reflection.Extensions.dll
diff --git a/Resources/Dependencies/ILSpy/System.Reflection.Metadata.dll b/Resources/Dependencies/ILSpy/System.Reflection.Metadata.dll
diff --git a/Resources/Dependencies/ILSpy/System.Reflection.Primitives.dll b/Resources/Dependencies/ILSpy/System.Reflection.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.Reflection.dll b/Resources/Dependencies/ILSpy/System.Reflection.dll
diff --git a/Resources/Dependencies/ILSpy/System.Resources.Reader.dll b/Resources/Dependencies/ILSpy/System.Resources.Reader.dll
diff --git a/Resources/Dependencies/ILSpy/System.Resources.ResourceManager.dll b/Resources/Dependencies/ILSpy/System.Resources.ResourceManager.dll
diff --git a/Resources/Dependencies/ILSpy/System.Resources.Writer.dll b/Resources/Dependencies/ILSpy/System.Resources.Writer.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.CompilerServices.VisualC.dll b/Resources/Dependencies/ILSpy/System.Runtime.CompilerServices.VisualC.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Extensions.dll b/Resources/Dependencies/ILSpy/System.Runtime.Extensions.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Handles.dll b/Resources/Dependencies/ILSpy/System.Runtime.Handles.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.InteropServices.RuntimeInformation.dll b/Resources/Dependencies/ILSpy/System.Runtime.InteropServices.RuntimeInformation.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.InteropServices.dll b/Resources/Dependencies/ILSpy/System.Runtime.InteropServices.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Numerics.dll b/Resources/Dependencies/ILSpy/System.Runtime.Numerics.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Formatters.dll b/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Formatters.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Json.dll b/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Json.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Primitives.dll b/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Xml.dll b/Resources/Dependencies/ILSpy/System.Runtime.Serialization.Xml.dll
diff --git a/Resources/Dependencies/ILSpy/System.Runtime.dll b/Resources/Dependencies/ILSpy/System.Runtime.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Claims.dll b/Resources/Dependencies/ILSpy/System.Security.Claims.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Cryptography.Algorithms.dll b/Resources/Dependencies/ILSpy/System.Security.Cryptography.Algorithms.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Cryptography.Csp.dll b/Resources/Dependencies/ILSpy/System.Security.Cryptography.Csp.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Cryptography.Encoding.dll b/Resources/Dependencies/ILSpy/System.Security.Cryptography.Encoding.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Cryptography.Primitives.dll b/Resources/Dependencies/ILSpy/System.Security.Cryptography.Primitives.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Cryptography.X509Certificates.dll b/Resources/Dependencies/ILSpy/System.Security.Cryptography.X509Certificates.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.Principal.dll b/Resources/Dependencies/ILSpy/System.Security.Principal.dll
diff --git a/Resources/Dependencies/ILSpy/System.Security.SecureString.dll b/Resources/Dependencies/ILSpy/System.Security.SecureString.dll
diff --git a/Resources/Dependencies/ILSpy/System.Text.Encoding.Extensions.dll b/Resources/Dependencies/ILSpy/System.Text.Encoding.Extensions.dll
diff --git a/Resources/Dependencies/ILSpy/System.Text.Encoding.dll b/Resources/Dependencies/ILSpy/System.Text.Encoding.dll
diff --git a/Resources/Dependencies/ILSpy/System.Text.RegularExpressions.dll b/Resources/Dependencies/ILSpy/System.Text.RegularExpressions.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.Overlapped.dll b/Resources/Dependencies/ILSpy/System.Threading.Overlapped.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.Tasks.Parallel.dll b/Resources/Dependencies/ILSpy/System.Threading.Tasks.Parallel.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.Tasks.dll b/Resources/Dependencies/ILSpy/System.Threading.Tasks.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.Thread.dll b/Resources/Dependencies/ILSpy/System.Threading.Thread.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.ThreadPool.dll b/Resources/Dependencies/ILSpy/System.Threading.ThreadPool.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.Timer.dll b/Resources/Dependencies/ILSpy/System.Threading.Timer.dll
diff --git a/Resources/Dependencies/ILSpy/System.Threading.dll b/Resources/Dependencies/ILSpy/System.Threading.dll
diff --git a/Resources/Dependencies/ILSpy/System.ValueTuple.dll b/Resources/Dependencies/ILSpy/System.ValueTuple.dll
diff --git a/Resources/Dependencies/ILSpy/System.Xml.ReaderWriter.dll b/Resources/Dependencies/ILSpy/System.Xml.ReaderWriter.dll
diff --git a/Resources/Dependencies/ILSpy/System.Xml.XDocument.dll b/Resources/Dependencies/ILSpy/System.Xml.XDocument.dll
diff --git a/Resources/Dependencies/ILSpy/System.Xml.XPath.XDocument.dll b/Resources/Dependencies/ILSpy/System.Xml.XPath.XDocument.dll
diff --git a/Resources/Dependencies/ILSpy/System.Xml.XPath.dll b/Resources/Dependencies/ILSpy/System.Xml.XPath.dll
diff --git a/Resources/Dependencies/ILSpy/System.Xml.XmlDocument.dll b/Resources/Dependencies/ILSpy/System.Xml.XmlDocument.dll
diff --git a/Resources/Dependencies/ILSpy/System.Xml.XmlSerializer.dll b/Resources/Dependencies/ILSpy/System.Xml.XmlSerializer.dll
diff --git a/Resources/Dependencies/ILSpy/netstandard.dll b/Resources/Dependencies/ILSpy/netstandard.dll
diff --git a/Resources/Dependencies/ILSpy/zh-Hans/ILSpy.resources.dll b/Resources/Dependencies/ILSpy/zh-Hans/ILSpy.resources.dll
diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddIn.sln b/Tools/ILSpyPlugAddIn/ILSpyPlugAddIn.sln
@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpyPlugAddIn", "ILSpyPlugAddIn\ILSpyPlugAddIn.csproj", "{08FE791B-5864-4E6F-AF7B-A02742C9C764}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpyPlugAddin", "ILSpyPlugAddin\ILSpyPlugAddin.csproj", "{08FE791B-5864-4E6F-AF7B-A02742C9C764}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpyPlugAddin.Tests", "ILSpyPlugAddin.Tests\ILSpyPlugAddin.Tests\ILSpyPlugAddin.Tests.csproj", "{573518BB-28C4-47DC-81A1-1C1FECDD87D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpyPlugAddin.Tests", "ILSpyPlugAddin.Tests\ILSpyPlugAddin.Tests.csproj", "{573518BB-28C4-47DC-81A1-1C1FECDD87D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly", "TestAssembly\TestAssembly.csproj", "{C13647E4-4A55-4962-9834-D2A26E54B985}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{573518BB-28C4-47DC-81A1-1C1FECDD87D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{573518BB-28C4-47DC-81A1-1C1FECDD87D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{573518BB-28C4-47DC-81A1-1C1FECDD87D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C13647E4-4A55-4962-9834-D2A26E54B985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C13647E4-4A55-4962-9834-D2A26E54B985}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C13647E4-4A55-4962-9834-D2A26E54B985}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C13647E4-4A55-4962-9834-D2A26E54B985}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin.Tests/ILSpyPlugAddin.Tests/UtilitiesTests.cs b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin.Tests/ILSpyPlugAddin.Tests/UtilitiesTests.cs
diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GenerateFieldAccessParameterEntry.cs b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GenerateFieldAccessParameterEntry.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using System.Windows;
 using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.TreeNodes;
-using Mono.Cecil;
 
 namespace Cosmos.ILSpyPlugs.Plugin
 {
@@ -20,7 +15,7 @@ public override bool IsVisible(TextViewContext context)
                 foreach (var node in context.SelectedTreeNodes)
                 {
                     var xCurrentField = node as FieldTreeNode;
-                    if ((xCurrentField != null) && !xCurrentField.FieldDefinition.HasConstant)
+                    if ((xCurrentField != null) && !xCurrentField.FieldDefinition.IsConst)
                     {
                         return true;
                     }

diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GenerateMethodPlugEntry.cs b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GenerateMethodPlugEntry.cs
@@ -1,13 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using System.Windows;
 using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.TreeNodes;
-using Mono.Cecil;
 
 namespace Cosmos.ILSpyPlugs.Plugin
 {

diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GeneratePropertyAccessorsPlugEntry.cs b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GeneratePropertyAccessorsPlugEntry.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using System.Windows;
 using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.TreeNodes;
-using Mono.Cecil;
 
 namespace Cosmos.ILSpyPlugs.Plugin
 {
@@ -42,7 +37,7 @@ public override void Execute(TextViewContext context)
                 var xCurrentProperty = node as PropertyTreeNode;
                 if (node != null)
                 {
-                    xString.Append(GenerateProperty(xCurrentProperty.PropertyDefinition));
+                    xString.Append(Utilities.GeneratePropertyPlugEntry(xCurrentProperty.PropertyDefinition));
                     xString.AppendLine();
                 }
             }
@@ -51,21 +46,5 @@ public override void Execute(TextViewContext context)
 
             MessageBox.Show("Done", "Cosmos Plug tool");
         }
-
-        public string GenerateProperty(PropertyDefinition property)
-        {
-            StringBuilder xString = new StringBuilder();
-            if (property.GetMethod != null)
-            {
-                xString.AppendLine(Utilities.GenerateMethodPlugEntry(property.GetMethod));
-                xString.AppendLine();
-            }
-            if (property.SetMethod != null)
-            {
-                xString.AppendLine(Utilities.GenerateMethodPlugEntry(property.SetMethod));
-                xString.AppendLine();
-            }
-            return xString.ToString();
-        }
     }
 }
diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GenerateTypePlugEntry.cs b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/GenerateTypePlugEntry.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using System.Windows;
 using ICSharpCode.ILSpy;
 using ICSharpCode.ILSpy.TreeNodes;
-using Mono.Cecil;
 
 namespace Cosmos.ILSpyPlugs.Plugin
 {

diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/ILSpyPlugAddIn.csproj b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/ILSpyPlugAddIn.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net46</TargetFramework>
+        <TargetFramework>net462</TargetFramework>
         <RootNamespace>Cosmos.ILSpyPlugs.Plugin</RootNamespace>
         <AssemblyName>Cosmos.ILSpyPlugs.Plugin</AssemblyName>
         <IncludeWpfReferences>True</IncludeWpfReferences>
     </PropertyGroup>
 
     <ItemGroup>
         <ILSpyReference Include="ICSharpCode.TreeView.dll" />
+        <ILSpyReference Include="ICSharpCode.Decompiler.dll" />
         <ILSpyReference Include="ILSpy.exe" />
-        <ILSpyReference Include="Mono.Cecil.dll" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/Properties/launchSettings.json b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
     "profiles": {
-        "ILSpyPlugAddIn": {
+        "ILSpyPlugAddin": {
             "commandName": "Executable",
             "executablePath": "./ILSpy.exe"
         }

diff --git a/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/Utilities.cs b/Tools/ILSpyPlugAddIn/ILSpyPlugAddin/Utilities.cs
@@ -3,29 +3,29 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using ICSharpCode.Decompiler.TypeSystem;
 using ICSharpCode.ILSpy;
-using Mono.Cecil;
 
 namespace Cosmos.ILSpyPlugs.Plugin
 {
     public static class Utilities
     {
-        public static string GenerateTypePlugEntry(TypeDefinition type)
+        public static string GenerateTypePlugEntry(ITypeDefinition type)
         {
-            var xString = new StringBuilder();
-            xString.AppendFormat(
-                type.IsPublic
+            var xSB = new StringBuilder();
+            xSB.AppendFormat(
+                type.Accessibility == Accessibility.Public
                     ? "[Plug(Target = typeof(global::{0}))]"
-                    : "[Plug(TargetName = \"{0}, {1}\")]", Utilities.GetCSharpTypeName(type), type.Module.Assembly.Name);
-            xString.AppendLine();
-            xString.AppendFormat("public static class {0}Impl", type.Name);
-            xString.AppendLine();
-            xString.AppendLine("{");
-            xString.AppendLine("}");
-            return xString.ToString();
+                    : "[Plug(TargetName = \"{0}, {1}\")]", Utilities.GetCSharpTypeName(type), type.ParentModule.AssemblyName);
+            xSB.AppendLine();
+            xSB.AppendFormat("public static class {0}Impl", type.Name);
+            xSB.AppendLine();
+            xSB.AppendLine("{");
+            xSB.AppendLine("}");
+            return xSB.ToString();
         }
 
-        public static string GenerateMethodPlugEntry(MethodDefinition method)
+        public static string GenerateMethodPlugEntry(IMethod method)
         {
             var xSB = new StringBuilder();
 
@@ -34,11 +34,11 @@ public static string GenerateMethodPlugEntry(MethodDefinition method)
 
             if (!method.IsStatic)
             {
-                if (method.DeclaringType.IsValueType)
+                if (method.DeclaringType.IsReferenceType ?? false)
                 {
                     xSB.Append("ref ");
                 }
-                if (method.DeclaringType.IsPublic)
+                if (method.DeclaringType.GetDefinition().Accessibility == Accessibility.Public)
                 {
                     xSB.Append(Utilities.GetCSharpTypeName(method.DeclaringType));
                 }
@@ -58,11 +58,11 @@ public static string GenerateMethodPlugEntry(MethodDefinition method)
                     xSB.Append(", ");
                 }
                 xAddComma = true;
-                var xParameterTypeDef = xParameter.ParameterType as TypeDefinition;
+                var xParameterTypeDef = xParameter.Type.GetDefinition();
                 if (xParameterTypeDef != null
-                    && xParameterTypeDef.IsPublic)
+                    && xParameterTypeDef.Accessibility == Accessibility.Public)
                 {
-                    xSB.Append(Utilities.GetCSharpTypeName(xParameter.ParameterType));
+                    xSB.Append(Utilities.GetCSharpTypeName(xParameter.Type));
                 }
                 else
                 {
@@ -78,21 +78,37 @@ public static string GenerateMethodPlugEntry(MethodDefinition method)
             return xSB.ToString();
         }
 
-        public static string GenerateFieldAccessPlugEntry(FieldDefinition field)
+        public static string GenerateFieldAccessPlugEntry(IField field)
         {
-            StringBuilder xString = new StringBuilder();
-            xString.Append($"[FieldAccess(Name = \"{field.FieldType.FullName} {field.DeclaringType.FullName}.{field.Name}\")] ref {Utilities.GetCSharpTypeName(field.FieldType)} field{field.Name}");
-            return xString.ToString();
+            var xSB = new StringBuilder();
+            xSB.Append($"[FieldAccess(Name = \"{field.Type.FullName} {field.DeclaringType.FullName}.{field.Name}\")] ref {Utilities.GetCSharpTypeName(field.Type)} field{field.Name}");
+            return xSB.ToString();
+        }
+
+        public static string GeneratePropertyPlugEntry(IProperty property)
+        {
+            var xSB = new StringBuilder();
+            if (property.Getter != null)
+            {
+                xSB.AppendLine(GenerateMethodPlugEntry(property.Getter));
+                xSB.AppendLine();
+            }
+            if (property.Setter != null)
+            {
+                xSB.AppendLine(GenerateMethodPlugEntry(property.Setter));
+                xSB.AppendLine();
+            }
+            return xSB.ToString();
         }
 
-        public static string GetCSharpTypeName(TypeReference reference)
+        private static string GetCSharpTypeName(IType type)
         {
             var xCSharp = Languages.GetLanguage("C#");
 
-            return xCSharp.TypeToString(reference, true);
+            return xCSharp.TypeToString(type, true);
         }
 
-        public static string GetMethodName(MethodDefinition method)
+        private static string GetMethodName(IMethod method)
         {
             if (method.IsConstructor)
             {

diff --git a/...ugAddin.Tests/ILSpyPlugAddin.Tests.csproj → ...ugAddin.Tests/ILSpyPlugAddin.Tests.csproj b/...ugAddin.Tests/ILSpyPlugAddin.Tests.csproj → ...ugAddin.Tests/ILSpyPlugAddin.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net46</TargetFramework>
+        <TargetFramework>net462</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
@@ -13,13 +13,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ILSpyReference Include="ICSharpCode.TreeView.dll" />
-        <ILSpyReference Include="ILSpy.exe" />
-        <ILSpyReference Include="Mono.Cecil.dll" />
+        <ProjectReference Include="..\ILSpyPlugAddin\ILSpyPlugAddin.csproj" />
+        <ProjectReference Include="..\TestAssembly\TestAssembly.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\ILSpyPlugAddIn\ILSpyPlugAddIn.csproj" />
+        <ILSpyReference Include="ICSharpCode.TreeView.dll" />
+        <ILSpyReference Include="ICSharpCode.Decompiler.dll" />
+        <ILSpyReference Include="ILSpy.exe" />
     </ItemGroup>
 
     <ItemGroup>