diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2017-04-03 15:26:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 15:26:51 +0300 |
| commit | b135aec6a6189c9d1870f6d181ec6812facc03a8 (patch) | |
| tree | 1bb7a682568e7743af30047ea870a504fca702da | |
| parent | cbb7fdc0dbf451cfbedde41238f2cd49ac7b1e06 (diff) | |
| parent | d4d11b330123045195f78199193cfc9f3cd92bcb (diff) | |
Merge pull request #527 from Therzok/cecil-swap
Swap to Cecil from NuGet.
| -rw-r--r-- | ICSharpCode.NRefactory.Cecil/CecilLoader.cs | 7 | ||||
| -rw-r--r-- | ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj | 20 | ||||
| -rw-r--r-- | ICSharpCode.NRefactory.Cecil/packages.config | 4 |
3 files changed, 25 insertions, 6 deletions
diff --git a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs index 4abc463b..f1d16a2a 100644 --- a/ICSharpCode.NRefactory.Cecil/CecilLoader.cs +++ b/ICSharpCode.NRefactory.Cecil/CecilLoader.cs @@ -309,6 +309,10 @@ namespace ICSharpCode.NRefactory.TypeSystem // used to prevent Cecil from loading referenced assemblies sealed class DummyAssemblyResolver : IAssemblyResolver { + public void Dispose () + { + } + public AssemblyDefinition Resolve(AssemblyNameReference name) { return null; @@ -931,7 +935,8 @@ namespace ICSharpCode.NRefactory.TypeSystem baseTypes.Add(ReadTypeReference(typeDefinition.BaseType)); } if (typeDefinition.HasInterfaces) { - foreach (TypeReference iface in typeDefinition.Interfaces) { + foreach (InterfaceImplementation ii in typeDefinition.Interfaces) { + var iface = ii.InterfaceType; baseTypes.Add(ReadTypeReference(iface)); } } diff --git a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj index fcda55e3..cfeca081 100644 --- a/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj +++ b/ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.Cecil.csproj @@ -85,6 +85,18 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> + <Reference Include="Mono.Cecil"> + <HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta4\lib\net40\Mono.Cecil.dll</HintPath> + </Reference> + <Reference Include="Mono.Cecil.Mdb"> + <HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta4\lib\net40\Mono.Cecil.Mdb.dll</HintPath> + </Reference> + <Reference Include="Mono.Cecil.Pdb"> + <HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta4\lib\net40\Mono.Cecil.Pdb.dll</HintPath> + </Reference> + <Reference Include="Mono.Cecil.Rocks"> + <HintPath>..\..\..\packages\Mono.Cecil.0.10.0-beta4\lib\net40\Mono.Cecil.Rocks.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs"> @@ -99,10 +111,8 @@ <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> diff --git a/ICSharpCode.NRefactory.Cecil/packages.config b/ICSharpCode.NRefactory.Cecil/packages.config new file mode 100644 index 00000000..9a09d827 --- /dev/null +++ b/ICSharpCode.NRefactory.Cecil/packages.config @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Mono.Cecil" version="0.10.0-beta4" targetFramework="net40" />
+</packages>
\ No newline at end of file |