diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs index f1d16a2ac..8c7688d3e 100644 --- a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs +++ b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs @@ -935,8 +935,7 @@ void InitBaseTypes(TypeDefinition typeDefinition, IList 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.Select(x => x.InterfaceType)) { baseTypes.Add(ReadTypeReference(iface)); } } @@ -1622,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 9a5ef9892..e1a007d5f 100644 --- a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj +++ b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj @@ -1,4 +1,4 @@ - + Debug @@ -85,18 +85,6 @@ - - $(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.dll - - - $(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Mdb.dll - - - $(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Pdb.dll - - - $(SolutionDir)\packages\Mono.Cecil.0.10.0-beta6\lib\net40\Mono.Cecil.Rocks.dll - @@ -107,6 +95,10 @@ + + {d68133bd-1e63-496e-9ede-4fbdbf77b486} + Mono.Cecil + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} ICSharpCode.NRefactory @@ -115,4 +107,4 @@ - + \ No newline at end of file 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 @@ - - - - \ No newline at end of file