From 87d99ea7641d354a394c56c4f5e47b09efd57db1 Mon Sep 17 00:00:00 2001
From: Joseph Guenther <joseph@codingcool.ca>
Date: Sat, 11 Mar 2023 15:13:14 -0500
Subject: [PATCH 1/3] Update NRefactory

---
 ICSharpCode.NRefactory.Cecil/CecilLoader.cs     |  3 +--
 .../ICSharpCode.NRefactory.Cecil.csproj         | 17 +++++------------
 ICSharpCode.NRefactory.Cecil/packages.config    |  4 ----
 3 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 ICSharpCode.NRefactory.Cecil/packages.config

diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
index f1d16a2ac..ce68c9655 100644
--- a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+++ b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
@@ -935,8 +935,7 @@ void InitBaseTypes(TypeDefinition typeDefinition, IList<ITypeReference> baseType
 					baseTypes.Add(ReadTypeReference(typeDefinition.BaseType));
 				}
 				if (typeDefinition.HasInterfaces) {
-					foreach (InterfaceImplementation ii in typeDefinition.Interfaces) {
-						var iface = ii.InterfaceType;
+					foreach (TypeReference iface in typeDefinition.Interfaces) {
 						baseTypes.Add(ReadTypeReference(iface));
 					}
 				}
diff --git a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
index 9a5ef9892..0cf9b8a32 100644
--- a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+++ b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
@@ -85,18 +85,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Mono.Cecil">
-      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks">
-      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
@@ -111,6 +99,11 @@
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
+      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
+      <Name>Mono.Cecil</Name>
+      <Private>true</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/ICSharpCode.NRefactory.Cecil/packages.config b/ICSharpCode.NRefactory.Cecil/packages.config
deleted file mode 100644
index 8b1b9ad8d..000000000
--- a/ICSharpCode.NRefactory.Cecil/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Mono.Cecil" version="0.10.0-beta6" targetFramework="net40" />
-</packages>
\ No newline at end of file

From be147304d70b794fd7313fd86390d72bcc9b4b0a Mon Sep 17 00:00:00 2001
From: Joseph Guenther <joseph@codingcool.ca>
Date: Fri, 21 Apr 2023 18:55:26 -0400
Subject: [PATCH 2/3] Update cecil

---
 ICSharpCode.NRefactory.Cecil/CecilLoader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
index ce68c9655..6171b3e34 100644
--- a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+++ b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
@@ -935,7 +935,7 @@ void InitBaseTypes(TypeDefinition typeDefinition, IList<ITypeReference> baseType
 					baseTypes.Add(ReadTypeReference(typeDefinition.BaseType));
 				}
 				if (typeDefinition.HasInterfaces) {
-					foreach (TypeReference iface in typeDefinition.Interfaces) {
+					foreach (TypeReference iface in typeDefinition.Interfaces.Select(x => x.InterfaceType)) {
 						baseTypes.Add(ReadTypeReference(iface));
 					}
 				}

From 7d45cca2892071cc938fd0444af85bb9bcecedc0 Mon Sep 17 00:00:00 2001
From: Joseph Guenther <joseph@codingcool.ca>
Date: Fri, 21 Apr 2023 19:39:59 -0400
Subject: [PATCH 3/3] Update cecil

---
 ICSharpCode.NRefactory.Cecil/CecilLoader.cs         |  2 +-
 .../ICSharpCode.NRefactory.Cecil.csproj             | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
index 6171b3e34..8c7688d3e 100644
--- a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
+++ b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs
@@ -1621,7 +1621,7 @@ void AddConstraints(DefaultUnresolvedTypeParameter tp, GenericParameter g)
 			tp.HasDefaultConstructorConstraint = g.HasDefaultConstructorConstraint;
 			
 			if (g.HasConstraints) {
-				foreach (TypeReference constraint in g.Constraints) {
+				foreach (TypeReference constraint in g.Constraints.Select(x => x.ConstraintType)) {
 					tp.Constraints.Add(ReadTypeReference(constraint));
 				}
 			}
diff --git a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
index 0cf9b8a32..e1a007d5f 100644
--- a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
+++ b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -95,17 +95,16 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
+    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
+      <Project>{d68133bd-1e63-496e-9ede-4fbdbf77b486}</Project>
+      <Name>Mono.Cecil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\cecil\Mono.Cecil.csproj">
-      <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
-      <Name>Mono.Cecil</Name>
-      <Private>true</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file